diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-08-16 10:45:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-08-16 10:45:00 +0100 |
| commit | 2d1c8d5456420654d3474cec229243ba823323f1 (patch) | |
| tree | 9d457e063bcf92526da0fec3c9482084e779e53e | |
| parent | 66940d749197270c310c576af9e6f77478d1ee8f (diff) | |
| parent | c86c03cfd2c298f56e36cd08a054b90c83959cc1 (diff) | |
| download | qemu-2d1c8d5456420654d3474cec229243ba823323f1.tar.gz | |
Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20160816' into staging
Build fix for the ccw bios (bios itself not rebuilt).
# gpg: Signature made Tue 16 Aug 2016 08:00:16 BST
# gpg: using RSA key 0xDECF6B93C6F02FAF
# gpg: Good signature from "Cornelia Huck <huckc@linux.vnet.ibm.com>"
# gpg: aka "Cornelia Huck <cornelia.huck@de.ibm.com>"
# Primary key fingerprint: C3D0 D66D C362 4FF6 A8C0 18CE DECF 6B93 C6F0 2FAF
* remotes/cohuck/tags/s390x-20160816:
pc-bios/s390-ccw.img: Fix build
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -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 |