commit: 15661f8d706340b424cdc70dfe83e8512607527c
Author: Felix Janda <felix.janda <AT> posteo <DOT> de>
AuthorDate: Sat Dec 6 12:37:33 2014 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 9 14:23:45 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=15661f8d
sys-devel/gcc: fix linker path for mipseb
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
---
sys-devel/gcc/files/gcc-4.8.3-musl-linker-path.patch | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/sys-devel/gcc/files/gcc-4.8.3-musl-linker-path.patch
b/sys-devel/gcc/files/gcc-4.8.3-musl-linker-path.patch
index 0f3d96c..a22fb80 100644
--- a/sys-devel/gcc/files/gcc-4.8.3-musl-linker-path.patch
+++ b/sys-devel/gcc/files/gcc-4.8.3-musl-linker-path.patch
@@ -1,6 +1,6 @@
diff -ur a/gcc-4.8.3/gcc/config/arm/linux-eabi.h
b/gcc-4.8.3/gcc/config/arm/linux-eabi.h
--- a/gcc-4.8.3/gcc/config/arm/linux-eabi.h 2013-01-10 21:38:27.000000000
-0100
-+++ b/gcc-4.8.3/gcc/config/arm/linux-eabi.h 2014-11-03 20:04:06.126283403
-0100
++++ b/gcc-4.8.3/gcc/config/arm/linux-eabi.h 2014-11-26 21:09:34.162787397
-0100
@@ -68,8 +68,8 @@
GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */
@@ -14,7 +14,7 @@ diff -ur a/gcc-4.8.3/gcc/config/arm/linux-eabi.h
b/gcc-4.8.3/gcc/config/arm/linu
#define GLIBC_DYNAMIC_LINKER \
diff -ur a/gcc-4.8.3/gcc/config/i386/linux64.h
b/gcc-4.8.3/gcc/config/i386/linux64.h
--- a/gcc-4.8.3/gcc/config/i386/linux64.h 2013-01-10 21:38:27.000000000
-0100
-+++ b/gcc-4.8.3/gcc/config/i386/linux64.h 2014-11-03 20:04:06.126283403
-0100
++++ b/gcc-4.8.3/gcc/config/i386/linux64.h 2014-11-26 21:09:34.162787397
-0100
@@ -27,6 +27,6 @@
#define GNU_USER_LINK_EMULATION64 "elf_x86_64"
#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
@@ -26,16 +26,21 @@ diff -ur a/gcc-4.8.3/gcc/config/i386/linux64.h
b/gcc-4.8.3/gcc/config/i386/linux
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
diff -ur a/gcc-4.8.3/gcc/config/mips/linux.h
b/gcc-4.8.3/gcc/config/mips/linux.h
--- a/gcc-4.8.3/gcc/config/mips/linux.h 2013-01-10 21:38:27.000000000
-0100
-+++ b/gcc-4.8.3/gcc/config/mips/linux.h 2014-11-03 20:04:06.126283403
-0100
-@@ -17,4 +17,4 @@
++++ b/gcc-4.8.3/gcc/config/mips/linux.h 2014-11-26 21:11:28.772354580
-0100
+@@ -17,4 +17,9 @@
along with GCC; see the file COPYING3. If not see
<http://www.gnu.org/licenses/>. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-+#define GLIBC_DYNAMIC_LINKER "/lib/ld-musl-mipsel.so.1"
++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */
++#define GLIBC_DYNAMIC_LINKER_E "%{EB:;:el}"
++#else
++#define GLIBC_DYNAMIC_LINKER_E "%{EL:el}"
++#endif
++#define GLIBC_DYNAMIC_LINKER "/lib/ld-musl-mips" GLIBC_DYNAMIC_LINKER_E
".so.1"
diff -ur a/gcc-4.8.3/gcc/config/rs6000/linux64.h
b/gcc-4.8.3/gcc/config/rs6000/linux64.h
--- a/gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-04-04 16:10:24.000000000
-0100
-+++ b/gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-11-03 20:06:28.219506993
-0100
++++ b/gcc-4.8.3/gcc/config/rs6000/linux64.h 2014-11-26 21:09:34.164787372
-0100
@@ -366,12 +366,8 @@
#undef LINK_OS_DEFAULT_SPEC
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
@@ -53,7 +58,7 @@ diff -ur a/gcc-4.8.3/gcc/config/rs6000/linux64.h
b/gcc-4.8.3/gcc/config/rs6000/l
#if DEFAULT_LIBC == LIBC_UCLIBC
diff -ur a/gcc-4.8.3/gcc/config/rs6000/sysv4.h
b/gcc-4.8.3/gcc/config/rs6000/sysv4.h
--- a/gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-04-04 15:50:31.000000000
-0100
-+++ b/gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-11-03 20:04:06.128283378
-0100
++++ b/gcc-4.8.3/gcc/config/rs6000/sysv4.h 2014-11-26 21:09:34.164787372
-0100
@@ -761,7 +761,7 @@
#define LINK_START_LINUX_SPEC ""
