|
 |
a83cc2 |
From 354026a79551358a5be4ed561e080ff550738e92 Mon Sep 17 00:00:00 2001
|
|
|
a83cc2 |
From: Thomas Huth <thuth@redhat.com>
|
|
|
a83cc2 |
Date: Fri, 23 Apr 2021 17:20:46 +0200
|
|
|
a83cc2 |
Subject: [PATCH 30/39] pc-bios/s390-ccw/netboot: Use "-Wl," prefix to pass
|
|
|
a83cc2 |
parameter to the linker
|
|
|
a83cc2 |
|
|
|
a83cc2 |
RH-Author: Jon Maloy <jmaloy@redhat.com>
|
|
|
a83cc2 |
RH-MergeRequest: 24: v7: Add support for building qemu-kvm with clang and safe-stack
|
|
|
a83cc2 |
RH-Commit: [3/11] 6a22a1705fbeb5fb2eab6c0e149a433286f98e5f (jmaloy/qemu-kvm-centos-jon)
|
|
|
a83cc2 |
RH-Bugzilla: 1939509 1940132
|
|
|
a83cc2 |
RH-Acked-by: Danilo Cesar Lemes de Paula <ddepaula@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
|
a83cc2 |
RH-Acked-by: Cornelia Huck <cohuck@redhat.com>
|
|
|
a83cc2 |
|
|
|
a83cc2 |
We are using the compiler to do the linking of the bios files. GCC still
|
|
|
a83cc2 |
accepts the "-Ttext=..." linker flag directly and is smart enough to
|
|
|
a83cc2 |
pass it to the linker, but in case we are compiling with Clang, we have
|
|
|
a83cc2 |
to use the official way with the "-Wl," prefix instead.
|
|
|
a83cc2 |
|
|
|
a83cc2 |
Message-Id: <20210423153646.593153-1-thuth@redhat.com>
|
|
|
a83cc2 |
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
|
a83cc2 |
(cherry picked from commit b460a220872c28a8da95cbc7e9369d26aa268848)
|
|
|
a83cc2 |
Signed-off-by: Jon Maloy <jmaloy@redhat.com>
|
|
|
a83cc2 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
a83cc2 |
---
|
|
|
a83cc2 |
pc-bios/s390-ccw/netboot.mak | 2 +-
|
|
|
a83cc2 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
a83cc2 |
|
|
|
a83cc2 |
diff --git a/pc-bios/s390-ccw/netboot.mak b/pc-bios/s390-ccw/netboot.mak
|
|
|
a83cc2 |
index 577c023afe..68b4d7edcb 100644
|
|
|
a83cc2 |
--- a/pc-bios/s390-ccw/netboot.mak
|
|
|
a83cc2 |
+++ b/pc-bios/s390-ccw/netboot.mak
|
|
|
a83cc2 |
@@ -6,7 +6,7 @@ NETOBJS := start.o sclp.o cio.o virtio.o virtio-net.o jump2ipl.o netmain.o
|
|
|
a83cc2 |
LIBC_INC := -nostdinc -I$(SLOF_DIR)/lib/libc/include
|
|
|
a83cc2 |
LIBNET_INC := -I$(SLOF_DIR)/lib/libnet
|
|
|
a83cc2 |
|
|
|
a83cc2 |
-NETLDFLAGS := $(LDFLAGS) -Ttext=0x7800000
|
|
|
a83cc2 |
+NETLDFLAGS := $(LDFLAGS) -Wl,-Ttext=0x7800000
|
|
|
a83cc2 |
|
|
|
a83cc2 |
$(NETOBJS): QEMU_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
|
|
|
a83cc2 |
|
|
|
a83cc2 |
--
|
|
|
a83cc2 |
2.27.0
|
|
|
a83cc2 |
|