blob: 14e84215e04988627bf96f320816be51deffface [file] [log] [blame]
Andrew Geissler82c905d2020-04-13 13:39:40 -05001From b05f0be13aadf0b26a0b39dfe7daf2c47a300338 Mon Sep 17 00:00:00 2001
Brad Bishop6e60e8b2018-02-01 10:27:11 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 2 Mar 2015 01:58:54 +0000
Andrew Geissler82c905d2020-04-13 13:39:40 -05004Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
Brad Bishop6e60e8b2018-02-01 10:27:11 -05005
6This patch will modify the ELF linker scripts so that the crosssdk
7linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries
8will be relocated, at SDK install time, the interpreter path can be easily
9changed by the relocating script.
10
11Upstream-Status: Inappropriate [SDK specific]
12
13Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 ld/genscripts.sh | 3 +++
17 ld/scripttempl/elf.sc | 4 ++--
18 2 files changed, 5 insertions(+), 2 deletions(-)
19
20diff --git a/ld/genscripts.sh b/ld/genscripts.sh
Andrew Geissler82c905d2020-04-13 13:39:40 -050021index 03392d265c..435689ea14 100755
Brad Bishop6e60e8b2018-02-01 10:27:11 -050022--- a/ld/genscripts.sh
23+++ b/ld/genscripts.sh
Andrew Geissler82c905d2020-04-13 13:39:40 -050024@@ -304,6 +304,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
Brad Bishop6e60e8b2018-02-01 10:27:11 -050025 LD_FLAG=r
26 DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
27 DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
28+PARTIAL_LINKING=" "
Andrew Geissler82c905d2020-04-13 13:39:40 -050029 ( echo "/* Script for -r */"
30 source_sh ${CUSTOMIZER_SCRIPT}
31 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
32@@ -312,10 +313,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
Brad Bishop6e60e8b2018-02-01 10:27:11 -050033 LD_FLAG=u
34 DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
35 CONSTRUCTING=" "
36+PARTIAL_LINKING=" "
Andrew Geissler82c905d2020-04-13 13:39:40 -050037 ( echo "/* Script for -Ur */"
38 source_sh ${CUSTOMIZER_SCRIPT}
39 source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
Brad Bishop316dfdd2018-06-25 12:45:53 -040040 ) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu
Brad Bishop6e60e8b2018-02-01 10:27:11 -050041+unset PARTIAL_LINKING
42
Brad Bishop6e60e8b2018-02-01 10:27:11 -050043 DATA_ALIGNMENT=${DATA_ALIGNMENT_}
Brad Bishop316dfdd2018-06-25 12:45:53 -040044 RELOCATING=" "
Brad Bishop6e60e8b2018-02-01 10:27:11 -050045diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
Andrew Geissler82c905d2020-04-13 13:39:40 -050046index 0b8b32a440..ee6b71075d 100644
Brad Bishop6e60e8b2018-02-01 10:27:11 -050047--- a/ld/scripttempl/elf.sc
48+++ b/ld/scripttempl/elf.sc
Andrew Geissler82c905d2020-04-13 13:39:40 -050049@@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
Brad Bishop6e60e8b2018-02-01 10:27:11 -050050 DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
51 fi
52 fi
53-if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then
54- INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }"
55+if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}${PARTIAL_LINKING}"; then
56+ INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp); . = 0x1000; }"
57 fi
58 if test -z "$PLT"; then
59 IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"