| Patrick Williams | 92b42cb | 2022-09-03 06:53:57 -0500 | [diff] [blame^] | 1 | Signed-off-by: Anton Antonov <Anton.Antonov@arm.com> |
| 2 | Upstream-Status: Backport [https://github.com/OP-TEE/optee_os/pull/5474] |
| 3 | |
| 4 | From 0b8a917fa51a366806edc0f04b88cd23b24098c4 Mon Sep 17 00:00:00 2001 |
| 5 | From: Jerome Forissier <jerome.forissier@linaro.org> |
| 6 | Date: Fri, 5 Aug 2022 09:48:03 +0200 |
| 7 | Subject: [PATCH] core: link: add --no-warn-rwx-segments |
| 8 | |
| 9 | binutils ld.bfd generates one RWX LOAD segment by merging several sections |
| 10 | with mixed R/W/X attributes (.text, .rodata, .data). After version 2.38 it |
| 11 | also 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 |
| 13 | that information is not used to set memory permissions. Therefore, silence |
| 14 | the warning. |
| 15 | |
| 16 | Link: [1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=ba951afb99912da01a6e8434126b8fac7aa75107 |
| 17 | Link: https://sourceware.org/bugzilla/show_bug.cgi?id=29448 |
| 18 | Reported-by: Dominique Martinet <dominique.martinet@atmark-techno.com> |
| 19 | Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org> |
| 20 | Acked-by: Jens Wiklander <jens.wiklander@linaro.org> |
| 21 | --- |
| 22 | core/arch/arm/kernel/link.mk | 8 ++++++-- |
| 23 | 1 file changed, 6 insertions(+), 2 deletions(-) |
| 24 | |
| 25 | diff --git a/core/arch/arm/kernel/link.mk b/core/arch/arm/kernel/link.mk |
| 26 | index 7eed333a32..c39d43cbfc 100644 |
| 27 | --- a/core/arch/arm/kernel/link.mk |
| 28 | +++ b/core/arch/arm/kernel/link.mk |
| 29 | @@ -31,6 +31,7 @@ link-ldflags += -T $(link-script-pp) -Map=$(link-out-dir)/tee.map |
| 30 | link-ldflags += --sort-section=alignment |
| 31 | link-ldflags += --fatal-warnings |
| 32 | link-ldflags += --gc-sections |
| 33 | +link-ldflags += $(call ld-option,--no-warn-rwx-segments) |
| 34 | |
| 35 | link-ldadd = $(LDADD) |
| 36 | link-ldadd += $(ldflags-external) |
| 37 | @@ -55,6 +56,7 @@ link-script-cppflags := \ |
| 38 | $(cppflagscore)) |
| 39 | |
| 40 | ldargs-all_objs := -T $(link-script-dummy) --no-check-sections \ |
| 41 | + $(call ld-option,--no-warn-rwx-segments) \ |
| 42 | $(link-objs) $(link-ldadd) $(libgcccore) |
| 43 | cleanfiles += $(link-out-dir)/all_objs.o |
| 44 | $(link-out-dir)/all_objs.o: $(objs) $(libdeps) $(MAKEFILE_LIST) |
| 45 | @@ -67,7 +69,8 @@ $(link-out-dir)/unpaged_entries.txt: $(link-out-dir)/all_objs.o |
| 46 | $(q)$(NMcore) $< | \ |
| 47 | $(AWK) '/ ____keep_pager/ { printf "-u%s ", $$3 }' > $@ |
| 48 | |
| 49 | -unpaged-ldargs = -T $(link-script-dummy) --no-check-sections --gc-sections |
| 50 | +unpaged-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \ |
| 51 | + $(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 | @@ -95,7 +98,8 @@ $(link-out-dir)/init_entries.txt: $(link-out-dir)/all_objs.o |
| 56 | $(q)$(NMcore) $< | \ |
| 57 | $(AWK) '/ ____keep_init/ { printf "-u%s ", $$3 }' > $@ |
| 58 | |
| 59 | -init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections |
| 60 | +init-ldargs := -T $(link-script-dummy) --no-check-sections --gc-sections \ |
| 61 | + $(call ld-option,--no-warn-rwx-segments) |
| 62 | init-ldadd := $(link-objs-init) $(link-out-dir)/version.o $(link-ldadd) \ |
| 63 | $(libgcccore) |
| 64 | cleanfiles += $(link-out-dir)/init.o |