mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build fix for the ccw bios (bios itself not rebuilt).

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXsroAAAoJEN7Pa5PG8C+vlG0P+wbUacBiz1ZqH/cg3iCcjg/p
 9OcN0hQghZdueMAz6d0K5VfVPLxOMgTDHjktq7zoFqaW40buz7n9fZlPxjljIAGW
 c4M2wtuX/ymf8cF+PvR1PWCV5/BuCJ+hcXfRgI08nOdPkDXKzGvMcWkabsztUluW
 mWceFmFa2Zl1CAawJNetAzW+z0u8H9cSTrxgCFIC2rvxBts+ipi26HrKOdzGU2qw
 dHygn04AdLheDJIBm5I0pn8ZYhZ/PaTZTn7yTKeE9/khsOc1MvFk1UZ43O8prBo9
 rappQAPZI4oqPtLoYHVGpDRFvn9drLA4+/Cjma8A/IgSktbSF3sjAsgdk3OqagGE
 u1z6AaRuboFjWthdFpsqloftK+PCS9/m9M5mkI2U4ggXh5pGUHD0e2tL04pG87h0
 9Ik0t6FbRXmLpAqTU9AHRoQUYlul/CcmIq53lbGt9+uh2XNKRLgM/C5gSToJZlGm
 l97AOHweo6p5a0ilJPICXOomhYnoWgIicXoj/0ZsjoShs4U4qn9a5AAT+6PQ1Y6i
 3S0qe25lj3fiTA9YK3/5keJ2C3q/8Dx5PINJ7j7hlC0GZLkCKoKrqHY5x/yqDhwt
 ze7BZEXs6Pt0TMDClzEd9eZknCjtlKhAZVTXcnDDQ6PxF/Hy5f9uUO7aKmvGFqmh
 ELMXsiQPxiewqnj+ej7U
 =/Du+
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2016-08-16 10:45:00 +01:00
commit 2d1c8d5456
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pc-bios/s390-ccw/Makefile
View File

@ -10,8 +10,10 @@ $(call set-vpath, $(SRC_PATH)/pc-bios/s390-ccw)
.PHONY : all clean build-all .PHONY : all clean build-all
OBJECTS = start.o main.o bootmap.o sclp-ascii.o virtio.o virtio-scsi.o OBJECTS = start.o main.o bootmap.o sclp-ascii.o virtio.o virtio-scsi.o
CFLAGS += -fPIE -fno-stack-protector -ffreestanding -march=z900 QEMU_CFLAGS := $(filter -W%, $(QEMU_CFLAGS))
CFLAGS += -fno-delete-null-pointer-checks -msoft-float 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 LDFLAGS += -Wl,-pie -nostdlib
build-all: s390-ccw.img build-all: s390-ccw.img