From 437fd90c0250dee670290f9b714253671a990160 Mon Sep 17 00:00:00 2001 From: José Pekkarinen Date: Wed, 18 May 2016 13:18:31 +0300 Subject: These changes are the raw update to qemu-2.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Collission happened in the following patches: migration: do cleanup operation after completion(738df5b9) Bug fix.(1750c932f86) kvmclock: add a new function to update env->tsc.(b52baab2) The code provided by the patches was already in the upstreamed version. Change-Id: I3cc11841a6a76ae20887b2e245710199e1ea7f9a Signed-off-by: José Pekkarinen --- qemu/pc-bios/s390-ccw/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'qemu/pc-bios/s390-ccw/Makefile') diff --git a/qemu/pc-bios/s390-ccw/Makefile b/qemu/pc-bios/s390-ccw/Makefile index 746603a31..4208cb429 100644 --- a/qemu/pc-bios/s390-ccw/Makefile +++ b/qemu/pc-bios/s390-ccw/Makefile @@ -9,8 +9,9 @@ $(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 -CFLAGS += -fPIE -fno-stack-protector -ffreestanding -fno-delete-null-pointer-checks +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 LDFLAGS += -Wl,-pie -nostdlib build-all: s390-ccw.img -- cgit 1.2.3-korg