yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

Blame SOURCES/kvm-pc-bios-s390-ccw-Makefile-Compile-with-std-gnu99-fwr.patch

f66865
From eda3b6620e779ff89df46a0fb9022016bffd7f44 Mon Sep 17 00:00:00 2001
f66865
From: Thomas Huth <thuth@redhat.com>
f66865
Date: Fri, 9 Oct 2020 10:08:41 -0400
f66865
Subject: [PATCH 05/14] pc-bios/s390-ccw/Makefile: Compile with -std=gnu99,
f66865
 -fwrapv and -fno-common
f66865
f66865
RH-Author: Thomas Huth <thuth@redhat.com>
f66865
Message-id: <20201009100849.264994-2-thuth@redhat.com>
f66865
Patchwork-id: 98595
f66865
O-Subject: [RHEL-8.4.0 qemu-kvm PATCH 1/9] pc-bios/s390-ccw/Makefile: Compile with -std=gnu99, -fwrapv and -fno-common
f66865
Bugzilla: 1846975
f66865
RH-Acked-by: Jens Freimann <jfreimann@redhat.com>
f66865
RH-Acked-by: David Hildenbrand <david@redhat.com>
f66865
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
f66865
f66865
The main QEMU code is compiled with -std=gnu99, -fwrapv and -fno-common.
f66865
We should use the same flags for the s390-ccw bios, too, to avoid that
f66865
we get different behavior with different compiler versions that changed
f66865
their default settings in the course of time (it happened at least with
f66865
-std=... and -fno-common in the past already).
f66865
f66865
While we're at it, also group the other flags here in a little bit nicer
f66865
fashion: Move the two "-m" flags out of the "-f" area and specify them on
f66865
a separate line.
f66865
f66865
Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
f66865
Acked-by: Cornelia Huck <cohuck@redhat.com>
f66865
Acked-by: Janosch Frank <frankja@linux.ibm.com>
f66865
Message-Id: <20200806105349.632-2-thuth@redhat.com>
f66865
Signed-off-by: Thomas Huth <thuth@redhat.com>
f66865
(cherry picked from commit 4f6a1eb886961f1f9da2d553c4b0e5ef69cd3801)
f66865
Conflicts: Simple contextual conflict due to meson reworks in upstream
f66865
Signed-off-by: Thomas Huth <thuth@redhat.com>
f66865
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
f66865
---
f66865
 pc-bios/s390-ccw/Makefile | 7 ++++---
f66865
 1 file changed, 4 insertions(+), 3 deletions(-)
f66865
f66865
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
f66865
index a048b6b077..e776a2a5ec 100644
f66865
--- a/pc-bios/s390-ccw/Makefile
f66865
+++ b/pc-bios/s390-ccw/Makefile
f66865
@@ -13,10 +13,11 @@ OBJECTS = start.o main.o bootmap.o jump2ipl.o sclp.o menu.o \
f66865
 	  virtio.o virtio-scsi.o virtio-blkdev.o libc.o cio.o dasd-ipl.o
f66865
 
f66865
 QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS))
f66865
-QEMU_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -msoft-float
f66865
-QEMU_CFLAGS += -march=z900 -fPIE -fno-strict-aliasing
f66865
-QEMU_CFLAGS += -fno-asynchronous-unwind-tables
f66865
+QEMU_CFLAGS += -ffreestanding -fno-delete-null-pointer-checks -fno-common -fPIE
f66865
+QEMU_CFLAGS += -fwrapv -fno-strict-aliasing -fno-asynchronous-unwind-tables
f66865
 QEMU_CFLAGS += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector)
f66865
+QEMU_CFLAGS += -msoft-float -march=z900
f66865
+QEMU_CFLAGS += -std=gnu99
f66865
 LDFLAGS += -Wl,-pie -nostdlib
f66865
 
f66865
 build-all: s390-ccw.img s390-netboot.img
f66865
-- 
f66865
2.27.0
f66865