mirror of
https://git.yoctoproject.org/poky
synced 2026-03-10 17:29:40 +01:00
cf872ba730
Drop CVE patches which are already available on binutils-2_33-branch Forward port rest of the patches (From OE-Core rev: 7bcfce05045fb7e10456aa1f5301e70c178f20d7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
60 lines
2.3 KiB
Diff
60 lines
2.3 KiB
Diff
From c9aed4cb3c02715b2ba1fc70949043849f202f46 Mon Sep 17 00:00:00 2001
|
|
From: Khem Raj <raj.khem@gmail.com>
|
|
Date: Sun, 8 Dec 2019 00:31:35 -0800
|
|
Subject: [PATCH] binutils-crosssdk: Generate relocatable SDKs
|
|
|
|
This patch will modify the ELF linker scripts so that the crosssdk
|
|
linker will generate binaries with a 4096 bytes PT_INTERP section. When the binaries
|
|
will be relocated, at SDK install time, the interpreter path can be easily
|
|
changed by the relocating script.
|
|
|
|
Upstream-Status: Inappropriate [SDK specific]
|
|
|
|
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
---
|
|
ld/genscripts.sh | 3 +++
|
|
ld/scripttempl/elf.sc | 4 ++--
|
|
2 files changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/ld/genscripts.sh b/ld/genscripts.sh
|
|
index cb2b081e9e..db2e9fd569 100755
|
|
--- a/ld/genscripts.sh
|
|
+++ b/ld/genscripts.sh
|
|
@@ -325,6 +325,7 @@ DATA_ALIGNMENT_u="${DATA_ALIGNMENT_u-${DATA_ALIGNMENT_r}}"
|
|
LD_FLAG=r
|
|
DATA_ALIGNMENT=${DATA_ALIGNMENT_r}
|
|
DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
|
|
+PARTIAL_LINKING=" "
|
|
( echo "/* Script for ld -r: link without relocation */"
|
|
source_sh ${CUSTOMIZER_SCRIPT}
|
|
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
|
|
@@ -333,10 +334,12 @@ DEFAULT_DATA_ALIGNMENT="ALIGN(${SEGMENT_SIZE})"
|
|
LD_FLAG=u
|
|
DATA_ALIGNMENT=${DATA_ALIGNMENT_u}
|
|
CONSTRUCTING=" "
|
|
+PARTIAL_LINKING=" "
|
|
( echo "/* Script for ld -Ur: link w/out relocation, do create constructors */"
|
|
source_sh ${CUSTOMIZER_SCRIPT}
|
|
source_sh ${srcdir}/scripttempl/${SCRIPT_NAME}.sc
|
|
) | sed -e '/^ *$/d;s/[ ]*$//' > ldscripts/${EMULATION_NAME}.xu
|
|
+unset PARTIAL_LINKING
|
|
|
|
DATA_ALIGNMENT=${DATA_ALIGNMENT_}
|
|
RELOCATING=" "
|
|
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
|
|
index f9f0f7d402..9e469dca86 100644
|
|
--- a/ld/scripttempl/elf.sc
|
|
+++ b/ld/scripttempl/elf.sc
|
|
@@ -140,8 +140,8 @@ if test -z "$DATA_SEGMENT_ALIGN"; then
|
|
DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0}, .);"
|
|
fi
|
|
fi
|
|
-if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then
|
|
- INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }"
|
|
+if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}${PARTIAL_LINKING}"; then
|
|
+ INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp); . = 0x1000; }"
|
|
fi
|
|
if test -z "$PLT"; then
|
|
IPLT=".iplt ${RELOCATING-0} : { *(.iplt) }"
|