blob: 5740461fcc140c99b64856200f29ecf935232d05 [file] [log] [blame]
Andrew Geissler2daf84b2023-03-31 09:57:23 -05001From 188a39b139e0e2ccceb22bcf63559b451f0483e0 Mon Sep 17 00:00:00 2001
Andrew Geissler9347dd42023-03-03 12:38:41 -06002From: Jerome Forissier <jerome.forissier@linaro.org>
3Date: Fri, 5 Aug 2022 09:48:03 +0200
4Subject: [PATCH] core: link: add --no-warn-rwx-segments
5
6Signed-off-by: Anton Antonov <Anton.Antonov@arm.com>
7Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/pull/5474]
8
9binutils ld.bfd generates one RWX LOAD segment by merging several sections
10with mixed R/W/X attributes (.text, .rodata, .data). After version 2.38 it
11also warns by default when that happens [1], which breaks the build due to
12--fatal-warnings. The RWX segment is not a problem for the TEE core, since
13that information is not used to set memory permissions. Therefore, silence
14the warning.
15
16Link: [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107
17Link: https://sourceware.org/bugzilla/show_bug.cgi?id=29448
18Reported-by: Dominique Martinet <dominique.martinet@atmark-techno.com>
19Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
20Acked-by: Jens Wiklander <jens.wiklander@linaro.org>
21
Andrew Geissler2daf84b2023-03-31 09:57:23 -050022---
23 core/arch/arm/kernel/link.mk | 6 ++++--
24 1 file changed, 4 insertions(+), 2 deletions(-)
25
Andrew Geissler517393d2023-01-13 08:55:19 -060026diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk
Andrew Geissler2daf84b2023-03-31 09:57:23 -050027index 0e96e606..3fbcb680 100644
Andrew Geissler517393d2023-01-13 08:55:19 -060028--- a/core/arch/arm/kernel/link.mk
29+++ b/core/arch/arm/kernel/link.mk
30@@ -37,6 +37,7 @@ link-ldflags += --sort-section=alignment
31 link-ldflags += --fatal-warnings
32 link-ldflags += --gc-sections
33 link-ldflags += $(link-ldflags-common)
34+link-ldflags += $(call ld-option,--no-warn-rwx-segments)
35
36 link-ldadd = $(LDADD)
37 link-ldadd += $(ldflags-external)
38@@ -61,6 +62,7 @@ link-script-cppflags := \
39 $(cppflagscore))
40
41 ldargs-all_objs := -T $(link-script-dummy) --no-check-sections \
42+ $(call ld-option,--no-warn-rwx-segments) \
43 $(link-ldflags-common) \
44 $(link-objs) $(link-ldadd) $(libgcccore)
45 cleanfiles += $(link-out-dir)/all_objs.o
46@@ -75,7 +77,7 @@ $(link-out-dir)/unpaged_entries.txt: $(link-out-dir)/all_objs.o
47 $(AWK) '/ ____keep_pager/ { printf "-u%s ", $$3 }' > $@
48
49 unpaged-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \
50- $(link-ldflags-common)
51+ $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments)
52 unpaged-ldadd := $(objs) $(link-ldadd) $(libgcccore)
53 cleanfiles += $(link-out-dir)/unpaged.o
54 $(link-out-dir)/unpaged.o: $(link-out-dir)/unpaged_entries.txt
55@@ -104,7 +106,7 @@ $(link-out-dir)/init_entries.txt: $(link-out-dir)/all_objs.o
56 $(AWK) '/ ____keep_init/ { printf "-u%s ", $$3 }' > $@
57
58 init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \
59- $(link-ldflags-common)
60+ $(link-ldflags-common) $(call ld-option,--no-warn-rwx-segments)
61 init-ldadd := $(link-objs-init) $(link-out-dir)/version.o $(link-ldadd) \
62 $(libgcccore)
63 cleanfiles += $(link-out-dir)/init.o