rpms/gnu-efi
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build error on aarch64

Browse Source 
On aarch64 we wind up with a segment map that (for reasons wildly
unclear) concatenates several segments into one, merging their segment
permissions and thus making RWX segments.

This fixes that.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2023-02-21 14:22:12 -05:00
parent acb278c5bd
commit cafdc47704
2 changed files with 75 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
0048-ld-Don-t-warn-about-RWX-segment-maps.patch Normal file
View File

@ -0,0 +1,74 @@
From 67dcf9b096c12a4801e9ef68c1107e0dcc311b27 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Tue, 21 Feb 2023 14:14:41 -0500
Subject: [PATCH] ld: Don't warn about RWX segment maps
Newer gnu ld complains about RWX segment maps, and since we build with
"--fatal-warnings" we get the following:
ld -nostdlib --warn-common --no-undefined --fatal-warnings \
--build-id=sha1 -shared -Bsymbolic \
-L/builddir/build/BUILD/gnu-efi-3.0.9//apps/../aa64/lib \
-L/builddir/build/BUILD/gnu-efi-3.0.9//apps/../aa64/gnuefi \
/builddir/build/BUILD/gnu-efi-3.0.9//apps/../aa64/gnuefi/crt0-efi-aa64.o \
--defsym=EFI_SUBSYSTEM=0xa t.o -o t.so -lefi -lgnuefi \
/usr/lib/gcc/aarch64-redhat-linux/13/libgcc.a \
-T /builddir/build/BUILD/gnu-efi-3.0.9//apps/../gnuefi/elf_aa64_efi.lds
ld: warning: t.so has a LOAD segment with RWX permissions
Since the final linked binary will be PE, rather than ELF, and won't
even *have* segment maps, this should be safe to just disable.
This patch adds "--no-warn-rwx-segments" to the ld command lines.
Signed-off-by: Peter Jones <pjones@redhat.com>
---
Make.defaults | 2 +-
inc/efi.mk.3.in | 3 ++-
inc/efi.mk.in | 3 ++-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Make.defaults b/Make.defaults
index cc8beec..0510ac1 100755
--- a/Make.defaults
+++ b/Make.defaults
@@ -218,7 +218,7 @@ endif
ASFLAGS += $(ARCH3264)
LDFLAGS += -nostdlib --warn-common --no-undefined --fatal-warnings \
- --build-id=sha1
+ --build-id=sha1 --no-warn-rwx-segments
ifneq ($(ARCH),arm)
export LIBGCC=$(shell $(CC) $(CFLAGS) $(ARCH3264) -print-libgcc-file-name)
diff --git a/inc/efi.mk.3.in b/inc/efi.mk.3.in
index c0bf3f1..f16b18a 100644
--- a/inc/efi.mk.3.in
+++ b/inc/efi.mk.3.in
@@ -83,7 +83,8 @@ Other command line to pass to \fBld\fR
before
object names. Defaults to
\fI-nostdlib --warn-common --no-undefined --fatal-warnings \
---build-id=sha1 -shared -Bsymbolic -L@@PREFIX@@/lib/gnuefi/$(EFI_ARCH) \
+--build-id=sha1 -shared -Bsymbolic --no-warn-rwx-segments \
+ -L@@PREFIX@@/lib/gnuefi/$(EFI_ARCH) \
@@PREFIX@@/lib/gnuefi/$(EFI_ARCH)/crt0.o\fR
.TP
.B \fBEFI_CCLDFLAGS\fR
diff --git a/inc/efi.mk.in b/inc/efi.mk.in
index 3de783a..d5f8544 100644
--- a/inc/efi.mk.in
+++ b/inc/efi.mk.in
@@ -43,7 +43,8 @@ include efi/$(EFI_ARCH).mk
GNUEFI_LIB_PATHS := $(sort @@LIBEFIDIR@@ @@GNUEFIDIR@@)
GNUEFI_LDFLAGS := -nostdlib --warn-common --no-undefined --fatal-warnings \
- --build-id=sha1 -shared -Bsymbolic --exclude-libs ALL \
+ --build-id=sha1 -shared -Bsymbolic --no-warn-rwx-segments \
+ --exclude-libs ALL \
$(foreach x,$(GNUEFI_LIB_PATHS),-L$(x)) @@GNUEFIDIR@@/crt0.o
ifeq ($(origin EFI_CC_INCLUDES),undefined)
--
2.39.2

1
gnu-efi.patches
View File

@ -45,3 +45,4 @@ Patch0044: 0044-Fix-the-arch-subdirs-in-.gitignore.patch
Patch0045: 0045-Use-CFLAGS-with-gcc-print-libgcc-file-name-to-get-th.patch
Patch0046: 0046-CFLAGS-add-Wno-pointer-sign.patch
Patch0047: 0047-Add-gnu-stack-notes.patch
Patch0048: 0048-ld-Don-t-warn-about-RWX-segment-maps.patch