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