Merge ~paelzer/ubuntu/+source/qemu:lp-1988710-qemu-7.0-FTBFS-KINETIC into ubuntu/+source/qemu:ubuntu/kinetic-devel

[Christian Ehrhardt ]

[Paride Legovini (paride)]

Looks like this fixed the ftbfs described in LP: #1988710, and formally this MP is all good, but qemu still failed to build in the ppa (amd64):

/<<PKGBUILDDIR>>/roms/opensbi/lib/sbi/sbi_tlb.c: Assembler messages:
/<<PKGBUILDDIR>>/roms/opensbi/lib/sbi/sbi_tlb.c:190: Error: unrecognized opcode `fence.i', extension `zifencei' required
make[3]: *** [Makefile:431: /<<PKGBUILDDIR>>/b/opensbi/lib/sbi/sbi_tlb.o] Error 1

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

Added a fix for that as well, restarted PPA builds

[Paride Legovini (paride)]

LGTM:

- The LTO and array-bounds fixes are the same I proposed in [1], so I'm clearly +1 for those.
- The OPT=-O1 workaround works fine. The only worry I have is that it's likely that when the GCC crash gets fixed we won't realize, and that -O1 will stay there. However given which code that optimization affects I don't think this is a big issue.
- The binutils related fix comes from opensbi upstream. The commit message shows that it has been tested on a Debian-like system (likely Ubuntu as the patch is Tested-by a Canonical person).
- All the PPA builds are good.
- All the MP formal aspects are good.

Thanks!

[1] https://code.launchpad.net/~paride/ubuntu/+source/qemu/+git/qemu/+merge/429375

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: paelzer, paride
Uploaders: paelzer, paride
MP auto-approved

review: Approve

[Christian Ehrhardt  (paelzer)]

Thanks, uploaded

Uploading qemu_7.0+dfsg-7ubuntu2.dsc
Uploading qemu_7.0+dfsg-7ubuntu2.debian.tar.xz
Uploading qemu_7.0+dfsg-7ubuntu2_source.buildinfo
Uploading qemu_7.0+dfsg-7ubuntu2_source.changes

diff --git a/debian/changelog b/debian/changelog
index d6dfb3f..1e55669 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+qemu (1:7.0+dfsg-7ubuntu2) kinetic; urgency=medium
+
+  [ Paride Legovini ]
+  * d/rules: disable LTO on non-amd64 builds (LP: #1921664)
+  * GCC-12 FTBFS (LP: #1988710)
+    - d/p/u/lp1988710-silence-openbios-array-bounds-false-positive.patch.
+      Silence -Warray-bounds false positive (treated as error)
+
+  [ Christian Ehrhardt ]
+  * More on GCC-12 FTBFS (LP 1988710)
+    - d/rules: set -O1 for alpha firmware build
+    - d/p/u/lp1988710-opensbi-Makefile-fix-build-with-binutils-2.38.patch:
+      further FTBFS fixup
+
+ -- Christian Ehrhardt <[e-mail]>  Mon, 19 Sep 2022 08:07:24 +0200
+
 qemu (1:7.0+dfsg-7ubuntu1) kinetic; urgency=medium
 
   * Merge with Debian unstable (LP: #1971315)(LP: #1980896), remaining changes:
diff --git a/debian/patches/series b/debian/patches/series
index dae941e..01844c8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,3 +36,5 @@ ubuntu/lp-1981339-target-s390x-Remove-DISAS_GOTO_TB.patch
 ubuntu/lp-1981339-target-s390x-Remove-DISAS_PC_STALE.patch
 ubuntu/lp-1981339-target-s390x-Remove-DISAS_PC_STALE_NOCHAIN.patch
 ubuntu/lp-1981339-target-s390x-Exit-tb-after-executing-ex_value.patch
+ubuntu/lp1988710-silence-openbios-array-bounds-false-positive.patch
+ubuntu/lp1988710-opensbi-Makefile-fix-build-with-binutils-2.38.patch
diff --git a/debian/patches/ubuntu/lp1988710-opensbi-Makefile-fix-build-with-binutils-2.38.patch b/debian/patches/ubuntu/lp1988710-opensbi-Makefile-fix-build-with-binutils-2.38.patch
new file mode 100644
index 0000000..b7c5253
--- /dev/null
+++ b/debian/patches/ubuntu/lp1988710-opensbi-Makefile-fix-build-with-binutils-2.38.patch
@@ -0,0 +1,62 @@
+From 5d53b55aa77ffeefd4012445dfa6ad3535e1ff2c Mon Sep 17 00:00:00 2001
+From: Aurelien Jarno <[e-mail]>
+Date: Fri, 28 Jan 2022 18:33:46 +0100
+Subject: [PATCH] Makefile: fix build with binutils 2.38
+
+From version 2.38, binutils default to ISA spec version 20191213. This
+means that the csr read/write (csrr*/csrw*) instructions and fence.i
+instruction has separated from the `I` extension, become two standalone
+extensions: Zicsr and Zifencei. As the kernel uses those instruction,
+this causes the following build failure:
+
+ CC        lib/sbi/sbi_tlb.o
+<<BUILDDIR>>/lib/sbi/sbi_tlb.c: Assembler messages:
+<<BUILDDIR>>/lib/sbi/sbi_tlb.c:190: Error: unrecognized opcode `fence.i'
+make: *** [Makefile:431: <<BUILDDIR>>/build/lib/sbi/sbi_tlb.o] Error 1
+
+The fix is to specify those extensions explicitly in -march. However as
+older binutils version do not support this, we first need to detect
+that.
+
+Signed-off-by: Aurelien Jarno <[e-mail]>
+Reviewed-by: Bin Meng <[e-mail]>
+Tested-by: Alexandre Ghiti <[e-mail]>
+Reviewed-by: Anup Patel <[e-mail]>
+
+Origin: https://gitlab.com/qemu-project/opensbi/-/commit/5d53b55aa77ffeefd4012445dfa6ad3535e1ff2c
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1988710
+Last-Update: 2022-09-19
+---
+ roms/opensbi/Makefile | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/roms/opensbi/Makefile b/roms/opensbi/Makefile
+index 062883e..fc1ea13 100644
+--- a/roms/opensbi/Makefile
++++ b/roms/opensbi/Makefile
+@@ -153,6 +153,9 @@ OPENSBI_LD_PIE := $(shell $(CC) $(CLANG_TARGET) $(RELAX_FLAG) $(USE_LD_FLAG) -fP
+ # Check whether the compiler supports -m(no-)save-restore
+ CC_SUPPORT_SAVE_RESTORE := $(shell $(CC) $(CLANG_TARGET) $(RELAX_FLAG) -nostdlib -mno-save-restore -x c /dev/null -o /dev/null 2>&1 | grep "\-save\-restore" >/dev/null && echo n || echo y)
+ 
++# Check whether the assembler and the compiler support the Zicsr and Zifencei extensions
++CC_SUPPORT_ZICSR_ZIFENCEI := $(shell $(CC) $(CLANG_TARGET) $(RELAX_FLAG) -nostdlib -march=rv$(OPENSBI_CC_XLEN)imafd_zicsr_zifencei -x c /dev/null -o /dev/null 2>&1 | grep "zicsr\|zifencei" > /dev/null && echo n || echo y)
++
+ # Build Info:
+ # OPENSBI_BUILD_TIME_STAMP -- the compilation time stamp
+ # OPENSBI_BUILD_COMPILER_VERSION -- the compiler version info
+@@ -223,7 +226,11 @@ ifndef PLATFORM_RISCV_ABI
+ endif
+ ifndef PLATFORM_RISCV_ISA
+   ifneq ($(PLATFORM_RISCV_TOOLCHAIN_DEFAULT), 1)
+-    PLATFORM_RISCV_ISA = rv$(PLATFORM_RISCV_XLEN)imafdc
++    ifeq ($(CC_SUPPORT_ZICSR_ZIFENCEI), y)
++      PLATFORM_RISCV_ISA = rv$(PLATFORM_RISCV_XLEN)imafdc_zicsr_zifencei
++    else
++      PLATFORM_RISCV_ISA = rv$(PLATFORM_RISCV_XLEN)imafdc
++    endif
+   else
+     PLATFORM_RISCV_ISA = $(OPENSBI_CC_ISA)
+   endif
+-- 
+2.37.3
+
diff --git a/debian/patches/ubuntu/lp1988710-silence-openbios-array-bounds-false-positive.patch b/debian/patches/ubuntu/lp1988710-silence-openbios-array-bounds-false-positive.patch
new file mode 100644
index 0000000..b392de8
--- /dev/null
+++ b/debian/patches/ubuntu/lp1988710-silence-openbios-array-bounds-false-positive.patch
@@ -0,0 +1,23 @@
+Description: Silence array-bounds warning false positive in ppc openbios code
+Author: Paride Legovini <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1988710
+Forwarded: no
+Last-Update: 2022-09-05
+
+--- a/roms/openbios/arch/ppc/qemu/init.c
++++ b/roms/openbios/arch/ppc/qemu/init.c
+@@ -396,11 +396,14 @@
+     uint32_t *dsi = (uint32_t *)0x300UL;
+     uint32_t *isi = (uint32_t *)0x400UL;
+
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Warray-bounds"
+     // Patch the first DSI handler instruction to: ba 0x2000
+     *dsi = 0x48002002;
+
+     // Patch the first ISI handler instruction to: ba 0x2200
+     *isi = 0x48002202;
++#pragma GCC diagnostic pop
+
+     // Invalidate the cache lines
+     asm ("icbi 0, %0" : : "r"(dsi));
diff --git a/debian/rules b/debian/rules
index 1608b56..18aab7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,6 +21,13 @@ else
 VENDOR := DEBIAN
 endif
 
+# Disable LTO on non-amd64 builds, see:
+# https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/1921664
+# https://bugzilla.redhat.com/show_bug.cgi?id=1952483
+ifneq ($(DEB_HOST_ARCH),amd64)
+  export DEB_BUILD_MAINT_OPTIONS += optimize=-lto
+endif
+
 # DEB_BUILD_OPTIONS=parallel=N
 MAKEFLAGS += $(subst parallel=,-j,$(filter parallel=%,${DEB_BUILD_OPTIONS}))
 
@@ -550,7 +557,7 @@ sysdata-components += qboot
 build-palcode-clipper: b/qemu-palcode/palcode-clipper
 b/qemu-palcode/palcode-clipper: | b
 	cp -al roms/qemu-palcode b/
-	${MAKE} -C ${CURDIR}/b/qemu-palcode CROSS=${ALPHAEV67_CROSSPFX}
+	${MAKE} -C ${CURDIR}/b/qemu-palcode CROSS=${ALPHAEV67_CROSSPFX} OPT=-O1
 	${ALPHAEV67_CROSSPFX}strip b/qemu-palcode/palcode-clipper
 install-palcode-clipper: b/qemu-palcode/palcode-clipper
 	install -m 0644 $< ${sysdataidir}/palcode-clipper