[gentoo-commits] proj/hardened-dev:musl commit in: sys-devel/gcc/, sys-devel/gcc/files/

["Anthony G. Basile" <blueness@gentoo.org>]

commit:     8cf1cbefbebd9cccdb1259228465ee33dd93b436
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 27 13:17:17 2014 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Feb 27 13:17:17 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-dev.git;a=commit;h=8cf1cbef

sys-devel/gcc: point to libc.so for linker for arm

Package-Manager: portage-2.2.7
Manifest-Sign-Key: 0xF52D4BBA

---
 .../gcc/files/gcc-4.7.3-musl-linker-path.patch     | 23 ++++++++++++++++++----
 sys-devel/gcc/gcc-4.7.3-r99.ebuild                 |  9 ++-------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/sys-devel/gcc/files/gcc-4.7.3-musl-linker-path.patch b/sys-devel/gcc/files/gcc-4.7.3-musl-linker-path.patch
index 9128e44..d9d0df6 100644
--- a/sys-devel/gcc/files/gcc-4.7.3-musl-linker-path.patch
+++ b/sys-devel/gcc/files/gcc-4.7.3-musl-linker-path.patch
@@ -1,11 +1,26 @@
-diff -Nuar gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h
+diff -Naur gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h gcc-4.7.3/gcc/config/arm/linux-eabi.h
+--- gcc-4.7.3.orig/gcc/config/arm/linux-eabi.h	2014-02-26 11:35:12.955061913 +0000
++++ gcc-4.7.3/gcc/config/arm/linux-eabi.h	2014-02-26 11:40:46.800062073 +0000
+@@ -69,8 +69,8 @@
+    GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
+ 
+ #undef  GLIBC_DYNAMIC_LINKER
+-#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
+-#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
++#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/usr/lib/libc.so"
++#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/usr/lib/libc.so"
+ #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
+ 
+ #define GLIBC_DYNAMIC_LINKER \
+diff -Naur gcc-4.7.3.orig/gcc/config/i386/linux64.h gcc-4.7.3/gcc/config/i386/linux64.h
 --- gcc-4.7.3.orig/gcc/config/i386/linux64.h	2011-07-07 15:38:34.000000000 +0000
-+++ gcc-4.7.3/gcc/config/i386/linux64.h	2014-01-25 17:11:52.126098018 +0000
-@@ -29,5 +29,5 @@
++++ gcc-4.7.3/gcc/config/i386/linux64.h	2014-02-26 11:40:00.240062051 +0000
+@@ -28,6 +28,6 @@
+ #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
  #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
  
 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/usr/lib/libc.so"
 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
++#define GLIBC_DYNAMIC_LINKER32 "/usr/lib/libc.so"
 +#define GLIBC_DYNAMIC_LINKER64 "/usr/lib/libc.so"
  #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"

diff --git a/sys-devel/gcc/gcc-4.7.3-r99.ebuild b/sys-devel/gcc/gcc-4.7.3-r99.ebuild
index eb2a1a7..c4e8690 100644
--- a/sys-devel/gcc/gcc-4.7.3-r99.ebuild
+++ b/sys-devel/gcc/gcc-4.7.3-r99.ebuild
@@ -44,6 +44,8 @@ src_prepare() {
 		EPATCH_EXCLUDE+=" 10_all_default-fortify-source.patch"
 	fi
 
+	toolchain_src_prepare
+
 	if use elibc_musl; then
 		cd "${S}"
 		sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
@@ -55,13 +57,6 @@ src_prepare() {
 		epatch "${FILESDIR}"/${P}-musl-linker-path.patch
 	fi
 
-	# drop the x32 stuff once 4.7 goes stable
-	if [[ ${CTARGET} != x86_64* ]] || ! has x32 $(get_all_abis TARGET) ; then
-		EPATCH_EXCLUDE+=" 90_all_gcc-4.7-x32.patch"
-	fi
-
-	toolchain_src_prepare
-
 	use vanilla && return 0
 
 	[[ ${CHOST} == ${CTARGET} ]] && epatch "${FILESDIR}"/gcc-spec-env.patch