From 0c80576ea1ef48b9e42587cfe08d878e6a5cae109fd2c1a3029b2c97ff3898e9 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Fri, 8 Mar 2019 18:21:16 +0000 Subject: [PATCH] Accepting request 682912 from home:bfrogers:branches:Virtualization Again address ipxe GCC 9 incompatibilities. Previously included patch to disable unneeded warning got muffed somehow (bsc#1121464) OBS-URL: https://build.opensuse.org/request/show/682912 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=458 --- ...gcc-address-of-packed-member-warning.patch | 25 +++++++------------ qemu-testsuite.changes | 6 +++++ qemu.changes | 6 +++++ 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/ipxe-build-Disable-gcc-address-of-packed-member-warning.patch b/ipxe-build-Disable-gcc-address-of-packed-member-warning.patch index 7a72893f..a0709428 100644 --- a/ipxe-build-Disable-gcc-address-of-packed-member-warning.patch +++ b/ipxe-build-Disable-gcc-address-of-packed-member-warning.patch @@ -11,32 +11,25 @@ default build considers warnings to be errors, needs to be disabled. [BR: BSC#1121464] Signed-off-by: Bruce Rogers ---- - src/Makefile.housekeeping | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/Makefile.housekeeping b/src/Makefile.housekeeping -index f8334921..e7f1ece0 100644 --- a/src/Makefile.housekeeping +++ b/src/Makefile.housekeeping -@@ -646,6 +646,17 @@ $(BIN)/.certificate.der.% : $(BIN)/.cert - CERT_ALL := $(foreach i,$(call seq,1,$(CERT_COUNT)),\ - CERT ( $(i), \"$(word $(i),$(CERT_DERS))\" )) +@@ -179,6 +179,19 @@ WNA_FLAGS := $(shell $(WNA_TEST) && $(EC + WORKAROUND_CFLAGS += $(WNA_FLAGS) + endif -+ +# GCC 9.0 introduces a new warning for using pointers to packed +# structure and union members. ipxe code is replete with this usage, +# partly because the architectures it is designed for handle unaligned +# accesses. Therefore this warning is not very helpful and since the +# default build considers warnings to be errors, needs to be disabled. +# ++ifeq ($(CCTYPE),gcc) +WNAOPM_TEST = $(CC) -Waddress-of-packed-member -x c -c /dev/null -o /dev/null \ + >/dev/null 2>&1 +WNAOPM_FLAGS := $(shell $(WNAOPM_TEST) && $(ECHO) '-Wno-address-of-packed-member') +WORKAROUND_CFLAGS += $(WNAOPM_FLAGS) - endif - - certstore_DEPS += $(CERT_LIST) $(CERT_FILES) $(CERT_PEMS) $(CERT_DERS) --- -2.20.1 - ++endif ++ + # Some versions of gas choke on division operators, treating them as + # comment markers. Specifying --divide will work around this problem, + # but isn't available on older gas versions. diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index 700d6831..9badd22b 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 8 17:49:54 UTC 2019 - Bruce Rogers + +- Again address ipxe GCC 9 incompatibilities. Previously included + patch to disable unneeded warning got muffed somehow (bsc#1121464) + ------------------------------------------------------------------- Fri Feb 22 08:52:45 UTC 2019 - Guillaume GARDET diff --git a/qemu.changes b/qemu.changes index 700d6831..9badd22b 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Mar 8 17:49:54 UTC 2019 - Bruce Rogers + +- Again address ipxe GCC 9 incompatibilities. Previously included + patch to disable unneeded warning got muffed somehow (bsc#1121464) + ------------------------------------------------------------------- Fri Feb 22 08:52:45 UTC 2019 - Guillaume GARDET