mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-18 18:56:37 +00:00
generic: backport PPC boot wrapper VDSO executable stack fix
Backport upstream fix for PowerPC that fix VDSO executable stack warning for the boot wrapper. Fix the compilation error: powerpc-openwrt-linux-musl-ld.bin: warning: div64.o: missing .note.GNU-stack section implies executable stack powerpc-openwrt-linux-musl-ld.bin: NOTE: This behaviour is deprecated and will be removed in a future version of the linker powerpc-openwrt-linux-musl-ld.bin: warning: arch/powerpc/boot/simpleImage.ws-ap3825i has a LOAD segment with RWX permissions Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
parent
ed79519b8d
commit
1c058f9b18
@ -0,0 +1,63 @@
|
||||
From 579aee9fc594af94c242068c011b0233563d4bbf Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Date: Mon, 10 Oct 2022 16:57:21 +1100
|
||||
Subject: [PATCH] powerpc: suppress some linker warnings in recent linker
|
||||
versions
|
||||
|
||||
This is a follow on from commit
|
||||
|
||||
0d362be5b142 ("Makefile: link with -z noexecstack --no-warn-rwx-segments")
|
||||
|
||||
for arch/powerpc/boot to address wanrings like:
|
||||
|
||||
ld: warning: opal-calls.o: missing .note.GNU-stack section implies executable stack
|
||||
ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
|
||||
ld: warning: arch/powerpc/boot/zImage.epapr has a LOAD segment with RWX permissions
|
||||
|
||||
This fixes issue https://github.com/linuxppc/issues/issues/417
|
||||
|
||||
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
|
||||
Link: https://lore.kernel.org/r/20221010165721.106267e6@canb.auug.org.au
|
||||
---
|
||||
arch/powerpc/boot/wrapper | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/arch/powerpc/boot/wrapper
|
||||
+++ b/arch/powerpc/boot/wrapper
|
||||
@@ -213,6 +213,11 @@ ld_version()
|
||||
}'
|
||||
}
|
||||
|
||||
+ld_is_lld()
|
||||
+{
|
||||
+ ${CROSS}ld -V 2>&1 | grep -q LLD
|
||||
+}
|
||||
+
|
||||
# Do not include PT_INTERP segment when linking pie. Non-pie linking
|
||||
# just ignores this option.
|
||||
LD_VERSION=$(${CROSS}ld --version | ld_version)
|
||||
@@ -221,6 +226,14 @@ if [ "$LD_VERSION" -ge "$LD_NO_DL_MIN_VE
|
||||
nodl="--no-dynamic-linker"
|
||||
fi
|
||||
|
||||
+# suppress some warnings in recent ld versions
|
||||
+nowarn="-z noexecstack"
|
||||
+if ! ld_is_lld; then
|
||||
+ if [ "$LD_VERSION" -ge "$(echo 2.39 | ld_version)" ]; then
|
||||
+ nowarn="$nowarn --no-warn-rwx-segments"
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
platformo=$object/"$platform".o
|
||||
lds=$object/zImage.lds
|
||||
ext=strip
|
||||
@@ -502,7 +515,7 @@ if [ "$platform" != "miboot" ]; then
|
||||
text_start="-Ttext $link_address"
|
||||
fi
|
||||
#link everything
|
||||
- ${CROSS}ld -m $format -T $lds $text_start $pie $nodl $rodynamic $notext -o "$ofile" $map \
|
||||
+ ${CROSS}ld -m $format -T $lds $text_start $pie $nodl $nowarn $rodynamic $notext -o "$ofile" $map \
|
||||
$platformo $tmp $object/wrapper.a
|
||||
rm $tmp
|
||||
fi
|
||||
@ -0,0 +1,63 @@
|
||||
From 579aee9fc594af94c242068c011b0233563d4bbf Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Date: Mon, 10 Oct 2022 16:57:21 +1100
|
||||
Subject: [PATCH] powerpc: suppress some linker warnings in recent linker
|
||||
versions
|
||||
|
||||
This is a follow on from commit
|
||||
|
||||
0d362be5b142 ("Makefile: link with -z noexecstack --no-warn-rwx-segments")
|
||||
|
||||
for arch/powerpc/boot to address wanrings like:
|
||||
|
||||
ld: warning: opal-calls.o: missing .note.GNU-stack section implies executable stack
|
||||
ld: NOTE: This behaviour is deprecated and will be removed in a future version of the linker
|
||||
ld: warning: arch/powerpc/boot/zImage.epapr has a LOAD segment with RWX permissions
|
||||
|
||||
This fixes issue https://github.com/linuxppc/issues/issues/417
|
||||
|
||||
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
|
||||
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
|
||||
Link: https://lore.kernel.org/r/20221010165721.106267e6@canb.auug.org.au
|
||||
---
|
||||
arch/powerpc/boot/wrapper | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
--- a/arch/powerpc/boot/wrapper
|
||||
+++ b/arch/powerpc/boot/wrapper
|
||||
@@ -215,6 +215,11 @@ ld_version()
|
||||
}'
|
||||
}
|
||||
|
||||
+ld_is_lld()
|
||||
+{
|
||||
+ ${CROSS}ld -V 2>&1 | grep -q LLD
|
||||
+}
|
||||
+
|
||||
# Do not include PT_INTERP segment when linking pie. Non-pie linking
|
||||
# just ignores this option.
|
||||
LD_VERSION=$(${CROSS}ld --version | ld_version)
|
||||
@@ -223,6 +228,14 @@ if [ "$LD_VERSION" -ge "$LD_NO_DL_MIN_VE
|
||||
nodl="--no-dynamic-linker"
|
||||
fi
|
||||
|
||||
+# suppress some warnings in recent ld versions
|
||||
+nowarn="-z noexecstack"
|
||||
+if ! ld_is_lld; then
|
||||
+ if [ "$LD_VERSION" -ge "$(echo 2.39 | ld_version)" ]; then
|
||||
+ nowarn="$nowarn --no-warn-rwx-segments"
|
||||
+ fi
|
||||
+fi
|
||||
+
|
||||
platformo=$object/"$platform".o
|
||||
lds=$object/zImage.lds
|
||||
ext=strip
|
||||
@@ -504,7 +517,7 @@ if [ "$platform" != "miboot" ]; then
|
||||
text_start="-Ttext $link_address"
|
||||
fi
|
||||
#link everything
|
||||
- ${CROSS}ld -m $format -T $lds $text_start $pie $nodl $rodynamic $notext -o "$ofile" $map \
|
||||
+ ${CROSS}ld -m $format -T $lds $text_start $pie $nodl $nowarn $rodynamic $notext -o "$ofile" $map \
|
||||
$platformo $tmp $object/wrapper.a
|
||||
rm $tmp
|
||||
fi
|
||||
Loading…
Reference in New Issue
Block a user