[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/12] pc-bios/s390-ccw: Remove duplicated LDFLAGS
From: |
Thomas Huth |
Subject: |
[PULL 12/12] pc-bios/s390-ccw: Remove duplicated LDFLAGS |
Date: |
Tue, 2 Jul 2024 12:33:10 +0200 |
The -Wl,-pie and -nostdlib flags are added to LDFLAGS twice. Merge
the two lines to get rid of the duplicates.
Message-ID: <20240621082422.136217-2-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/Makefile | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index acfcd1e71a..6207911b53 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -40,7 +40,7 @@ EXTRA_CFLAGS += -ffreestanding
-fno-delete-null-pointer-checks -fno-common -fPIE
EXTRA_CFLAGS += -fwrapv -fno-strict-aliasing -fno-asynchronous-unwind-tables
EXTRA_CFLAGS += -msoft-float
EXTRA_CFLAGS += -std=gnu99
-LDFLAGS += -Wl,-pie -nostdlib
+LDFLAGS += -Wl,-pie -nostdlib -z noexecstack
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 \
@@ -55,8 +55,6 @@ config-cc.mak: Makefile
$(call cc-option,-march=z900,-march=z10)) 3> config-cc.mak
-include config-cc.mak
-LDFLAGS += -Wl,-pie -nostdlib -z noexecstack
-
build-all: s390-ccw.img s390-netboot.img
s390-ccw.elf: $(OBJECTS)
--
2.45.2
- Re: [PULL 02/12] tests/qtest/migration-test: enable on s390x with TCG, (continued)
- [PULL 04/12] tests/qtest: Free unused QMP response, Thomas Huth, 2024/07/02
- [PULL 03/12] tests/qtest: Use qtest_add_data_func_full(), Thomas Huth, 2024/07/02
- [PULL 05/12] tests/qtest: Free old machine variable name, Thomas Huth, 2024/07/02
- [PULL 06/12] tests/qtest: Free paths, Thomas Huth, 2024/07/02
- [PULL 07/12] tests/qtest: Free GThread, Thomas Huth, 2024/07/02
- [PULL 08/12] docs: add precision about capstone for execlog plugin, Thomas Huth, 2024/07/02
- [PULL 09/12] hw/s390x: Attach default virtio-net devices to the /machine/virtual-css-bridge, Thomas Huth, 2024/07/02
- [PULL 11/12] .travis.yml: Install python3-tomli in all build jobs, Thomas Huth, 2024/07/02
- [PULL 10/12] tests/avocado: add hotplug_blk test, Thomas Huth, 2024/07/02
- [PULL 12/12] pc-bios/s390-ccw: Remove duplicated LDFLAGS,
Thomas Huth <=
- Re: [PULL 00/12] qtest, s390x, avocado and doc patches, Richard Henderson, 2024/07/03