marvin.weiler/musl-cross-make
1
0
Fork 0
mirror of https://github.com/richfelker/musl-cross-make.git synced 2025-08-14 12:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

update all static pie patches to ensure -static reached the linker

Browse Source 
on some targets, the logic for the compiler option -static seems not
to be processed when -pie is present. rather than playing
whack-a-mole, just ensure LD_PIE_SPEC specs always pass -static to ld
if either -static or -static-pie is present on the compiler driver
command line.

this may produce redundant -static arguments but it doesn't matter.
This commit is contained in:
Rich Felker 2025-07-21 02:21:23 +00:00
parent 2398261280
commit 4be756d35c
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
patches/gcc-10.3.0/0004-static-pie.diff
View File

@ -80,7 +80,7 @@ index e6887590ae2..df6e3965f13 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-11.2.0/0004-static-pie.diff
View File

@ -80,7 +80,7 @@ index 3c81c5798d8..cd96eac5d12 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-11.5.0/0004-static-pie.diff
View File

@ -80,7 +80,7 @@ index 3c81c5798d8..cd96eac5d12 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-12.4.0/0004-static-pie.diff
View File

@ -80,7 +80,7 @@ index 3c81c5798d8..cd96eac5d12 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-13.3.0/0004-static-pie.diff
View File

@ -80,7 +80,7 @@ index 3c81c5798d8..cd96eac5d12 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-14.2.0/0004-static-pie.diff
View File

@ -80,7 +80,7 @@ index 3c81c5798d8..cd96eac5d12 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-14.3.0/0004-static-pie.diff
View File

@ -80,7 +80,7 @@ index 3c81c5798d8..cd96eac5d12 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-15.1.0/0004-static-pie.diff
View File

@ -80,7 +80,7 @@ index 3c81c5798d8..cd96eac5d12 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-6.5.0/0020-static-pie-support.diff
View File

@ -34,7 +34,7 @@ index 0576ea7..0a280e0 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static:--no-dynamic-linker -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static:--no-dynamic-linker -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-7.5.0/0010-static-pie-support.diff
View File

@ -53,7 +53,7 @@ index 91eb0534722..74a390e6005 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static:--no-dynamic-linker -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static:--no-dynamic-linker -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-8.5.0/0012-static-pie.diff
View File

@ -105,7 +105,7 @@ index eb1610ba8b0..87560afb03c 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static-pie:-static} %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static-pie:-static} %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""

2
patches/gcc-9.4.0/0012-static-pie.diff
View File

@ -74,7 +74,7 @@ index d185c01b257..5d3f81c5fc5 100644
#ifdef HAVE_LD_PIE #ifdef HAVE_LD_PIE
#ifndef LD_PIE_SPEC #ifndef LD_PIE_SPEC
-#define LD_PIE_SPEC "-pie" -#define LD_PIE_SPEC "-pie"
+#define LD_PIE_SPEC "-pie %{static-pie:-static} %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}" +#define LD_PIE_SPEC "-pie %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic -static}"
#endif #endif
#else #else
#define LD_PIE_SPEC "" #define LD_PIE_SPEC ""