64 lines
2.4 KiB
Diff
64 lines
2.4 KiB
Diff
|
From 499df84ffe62c783d35d5e67cd0d0c35ba6bd44c Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marc Hartmayer <mhartmay@linux.ibm.com>
|
||
|
|
Date: Tue, 1 Oct 2024 17:36:18 +0200
|
||
|
|
Subject: [PATCH 23/27] pc-bios/s390-ccw: Introduce `EXTRA_LDFLAGS`
|
||
|
|
MIME-Version: 1.0
|
||
|
|
Content-Type: text/plain; charset=UTF-8
|
||
|
|
Content-Transfer-Encoding: 8bit
|
||
|
|
|
||
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
||
|
|
RH-MergeRequest: 277: Full boot order support for s390x [CentOS 9]
|
||
|
|
RH-Jira: RHEL-11424
|
||
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
||
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
RH-Commit: [23/23] e27a9f3997924573bbacc1a7cf48004b2daeaaaa (thuth/qemu-kvm-cs9)
|
||
|
|
|
||
|
|
Some packaging tools want to override `LDFLAGS` when building QEMU, this will
|
||
|
|
result in a build error as most likely no `-nostdlib` flag is passed. Introduce
|
||
|
|
`EXTRA_LDFLAGS` so that the packager can override `LDFLAGS` without breaking the
|
||
|
|
build.
|
||
|
|
|
||
|
|
Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
|
||
|
|
Message-ID: <20241001153618.17791-4-mhartmay@linux.ibm.com>
|
||
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
[thuth: Drop the hunk to netbook.mak which is not necessary anymore]
|
||
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
||
|
|
(cherry picked from commit 694d79ffce996c0993cebccc07c2ab6fc281e7d0)
|
||
|
|
---
|
||
|
|
pc-bios/s390-ccw/Makefile | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
|
||
|
|
index 38254e22df..dc69dd484f 100644
|
||
|
|
--- a/pc-bios/s390-ccw/Makefile
|
||
|
|
+++ b/pc-bios/s390-ccw/Makefile
|
||
|
|
@@ -4,6 +4,7 @@ all: build-all
|
||
|
|
|
||
|
|
include config-host.mak
|
||
|
|
CFLAGS = -O2 -g -I $(SRC_PATH)/../../include/hw/s390x/ipl
|
||
|
|
+LDFLAGS ?=
|
||
|
|
MAKEFLAGS += -rR
|
||
|
|
|
||
|
|
GIT_SUBMODULES = roms/SLOF
|
||
|
|
@@ -46,7 +47,7 @@ EXTRA_CFLAGS += -fwrapv -fno-strict-aliasing -fno-asynchronous-unwind-tables
|
||
|
|
EXTRA_CFLAGS += -msoft-float
|
||
|
|
EXTRA_CFLAGS += -std=gnu99
|
||
|
|
EXTRA_CFLAGS += $(LIBC_INC) $(LIBNET_INC)
|
||
|
|
-LDFLAGS += -Wl,-pie -nostdlib -z noexecstack -z text
|
||
|
|
+EXTRA_LDFLAGS += -Wl,-pie -nostdlib -z noexecstack -z text
|
||
|
|
|
||
|
|
cc-test = $(CC) -Werror $1 -c -o /dev/null -xc /dev/null >/dev/null 2>/dev/null
|
||
|
|
cc-option = if $(call cc-test, $1); then \
|
||
|
|
@@ -111,7 +112,7 @@ libnet.a: $(LIBNETOBJS)
|
||
|
|
build-all: s390-ccw.img
|
||
|
|
|
||
|
|
s390-ccw.elf: $(OBJECTS) libnet.a libc.a
|
||
|
|
- $(call quiet-command,$(CC) $(LDFLAGS) -o $@ $^,Linking)
|
||
|
|
+ $(call quiet-command,$(CC) $(EXTRA_LDFLAGS) $(LDFLAGS) -o $@ $^,Linking)
|
||
|
|
|
||
|
|
s390-ccw.img: s390-ccw.elf
|
||
|
|
$(call quiet-command,$(STRIP) --strip-unneeded $< -o $@,Stripping $< into)
|
||
|
|
--
|
||
|
|
2.39.3
|
||
|
|
|