From 6c936b4b1a2fb1bdf1f3f91482af7e33e71b5c10 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 27 Jul 2011 10:19:30 +0100 Subject: gcc: Drop part of the 64bithack patch which is no longer used Since we now handle GLIBC_DYNAMIC_LINKER in gcc-configure-common.inc: 's#\(GLIBC_DYNAMIC_LINKER[^ ]*\)\( *"/lib.*\)#\1 SYSTEMLIBS_DIR\2#' we can drop the patch which changes a hardcoded value for this. No PR bump since there is no code change resulting from this, its just a cleanup. There is still a valid question over the remainder of this patch and its interaction with multilib configurations. (From OE-Core rev: 036faf66c3889cd8bf4cd3c9b97c80f008f3c6e2) Signed-off-by: Richard Purdie --- meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch | 13 ------------- meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch | 13 ------------- 2 files changed, 26 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch index 890cc2f24c..05eafe3551 100644 --- a/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch +++ b/meta/recipes-devtools/gcc/gcc-4.5.1/64bithack.patch @@ -20,16 +20,3 @@ Index: gcc-4.5.0/gcc/config/i386/t-linux64 LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib -Index: gcc-4.5.0/gcc/config/i386/linux64.h -=================================================================== ---- gcc-4.5.0.orig/gcc/config/i386/linux64.h 2010-08-10 15:49:06.000000000 +0100 -+++ gcc-4.5.0/gcc/config/i386/linux64.h 2010-08-10 15:49:16.000000000 +0100 -@@ -59,7 +59,7 @@ - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #if TARGET_64BIT_DEFAULT - #define SPEC_32 "m32" diff --git a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch index 84962e6d46..4b846bbf3a 100644 --- a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch +++ b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch @@ -20,16 +20,3 @@ Index: gcc-4.6.0/gcc/config/i386/t-linux64 LIBGCC = stmp-multilib INSTALL_LIBGCC = install-multilib -Index: gcc-4.6.0/gcc/config/i386/linux64.h -=================================================================== ---- gcc-4.6.0.orig/gcc/config/i386/linux64.h -+++ gcc-4.6.0/gcc/config/i386/linux64.h -@@ -63,7 +63,7 @@ see the files COPYING3 and COPYING.RUNTI - done. */ - - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" --#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" -+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" - - #if TARGET_64BIT_DEFAULT - #define SPEC_32 "m32" -- cgit v1.2.3-54-g00ecf