Commit 2d1c8d54 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 66940d74 c86c03cf

pc-bios/s390-ccw/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -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