diff options
| author | Christian Borntraeger | 2016-08-15 12:20:49 +0200 |
|---|---|---|
| committer | Cornelia Huck | 2016-08-16 08:52:02 +0200 |
| commit | c86c03cfd2c298f56e36cd08a054b90c83959cc1 (patch) | |
| tree | d3bc56e16670cf41b2c0da4b819bb0ec0359d178 /pc-bios/s390-ccw/Makefile | |
| parent | Merge remote-tracking branch 'remotes/sstabellini/tags/xen-20160812-tag-2' in... (diff) | |
| download | qemu-c86c03cfd2c298f56e36cd08a054b90c83959cc1.tar.gz qemu-c86c03cfd2c298f56e36cd08a054b90c83959cc1.tar.xz qemu-c86c03cfd2c298f56e36cd08a054b90c83959cc1.zip | |
pc-bios/s390-ccw.img: Fix build
Since
commit a9c87304b76d ("build-sys: fix building with make CFLAGS=.. argument")
pc-bios/s390-ccw.img build might fail with
--- snip ---
main.o: In function `virtio_setup':
qemu/pc-bios/s390-ccw/main.c:117: undefined reference to `__stack_chk_fail'
--- snip ---
Changing the CFLAGS to QEMU_CFLAGS does the trick. We also need to
add -fno-strict-aliasing as this was filtered out.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Message-Id: <1471258997-5811-1-git-send-email-borntraeger@de.ibm.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Diffstat (limited to 'pc-bios/s390-ccw/Makefile')
| -rw-r--r-- | pc-bios/s390-ccw/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile index 4208cb4295..0ab25388a4 100644 --- a/pc-bios/s390-ccw/Makefile +++ b/pc-bios/s390-ccw/Makefile @@ -10,8 +10,10 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw) .PHONY : all clean build-all OBJECTS = start.o main.o bootmap.o sclp-ascii.o virtio.o virtio-scsi.o -CFLAGS += -fPIE -fno-stack-protector -ffreestanding -march=z900 -CFLAGS += -fno-delete-null-pointer-checks -msoft-float +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 += $(call cc-option, $(QEMU_CFLAGS), -fno-stack-protector) LDFLAGS += -Wl,-pie -nostdlib build-all: s390-ccw.img |