[Clfs-dev] GCC 4.7 patches
Martin Ward
macros_the_black at ntlworld.com
Fri Jun 8 02:54:21 PDT 2012
On 08/06/12 10:47, William Harrington wrote:
>
> On Jun 8, 2012, at 02:40 AM, Martin Ward wrote:
>>>
>> Hi William
>>
>> Where would you like them to go?
>>
>> i can send them as attachments but don't know the policy on sending
>> to the list, they are around 20k and 8k respectively plus one for
>> building against cloog-0.17(which i got from arch)
>>
>> Martin
>> _______________________________________________
>> Clfs-dev mailing list
>> Clfs-dev at lists.cross-lfs.org
>> http://lists.cross-lfs.org/listinfo.cgi/clfs-dev-cross-lfs.org
>
> Hi Martin,
>
> An attachment would be fine, unless you have a place on the internet
> to host them.
>
> Sincerely,
>
> William
> _______________________________________________
> Clfs-dev mailing list
> Clfs-dev at lists.cross-lfs.org
> http://lists.cross-lfs.org/listinfo.cgi/clfs-dev-cross-lfs.org
>
Nope, here ya go
Hope they work for you
in cross tools phase i had --disable-target-libiberty
--disable-target-zlib --enable-cloog-backend=isl --disable-libquadmath
--disable-build-with-cxx --disable-build-poststage1-with-cxx
--with-native-system-header-dir=/tools added to configure
and in temp-tools phase --enable-cloog-backend=isl
--disable-build-with-cxx --disable-build-poststage1-with-cxx
--with-native-system-header-dir=/tools
final stage --enable-cloog-backend=isl --disable-build-with-cxx
--disable-build-poststage1-with-cxx
Martin
-------------- next part --------------
diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
--- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000
+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000
@@ -6049,8 +6049,8 @@
LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
if test "${cloog_org}" = yes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
-$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
$as_echo_n "(cached) " >&6
else
@@ -6061,8 +6061,7 @@
main ()
{
#if CLOOG_VERSION_MAJOR != 0 \
- || CLOOG_VERSION_MINOR != 16 \
- || CLOOG_VERSION_REVISION < 1
+ || CLOOG_VERSION_MINOR != 17
choke me
#endif
;
-------------- next part --------------
diff -Naur gcc-4.7.0.orig/gcc/config/i386/linux64.h gcc-4.7.0/gcc/config/i386/linux64.h
--- gcc-4.7.0.orig/gcc/config/i386/linux64.h 2012-03-27 14:35:57.563181477 +0000
+++ gcc-4.7.0/gcc/config/i386/linux64.h 2012-03-27 14:39:28.270532077 +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_LINKER64 "/lib64/ld-linux-x86-64.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
diff -Naur gcc-4.7.0.orig/gcc/config/i386/t-linux64 gcc-4.7.0/gcc/config/i386/t-linux64
--- gcc-4.7.0.orig/gcc/config/i386/t-linux64 2012-03-27 14:35:57.560181516 +0000
+++ gcc-4.7.0/gcc/config/i386/t-linux64 2012-03-27 14:41:21.591105000 +0000
@@ -34,6 +34,6 @@
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
-MULTILIB_OSDIRNAMES = m64=../lib64
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = m64=../lib
+MULTILIB_OSDIRNAMES+= m32=../lib32
MULTILIB_OSDIRNAMES+= mx32=../libx32
diff -Naur gcc-4.7.0.orig/gcc/config/linux.h gcc-4.7.0/gcc/config/linux.h
--- gcc-4.7.0.orig/gcc/config/linux.h 2012-03-27 14:35:57.577181301 +0000
+++ gcc-4.7.0/gcc/config/linux.h 2012-03-27 14:42:50.422992555 +0000
@@ -75,7 +75,7 @@
GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
supporting both 32-bit and 64-bit compilation. */
#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
diff -Naur gcc-4.7.0.orig/gcc/config/mips/linux64.h gcc-4.7.0/gcc/config/mips/linux64.h
--- gcc-4.7.0.orig/gcc/config/mips/linux64.h 2012-03-27 14:35:57.612180861 +0000
+++ gcc-4.7.0/gcc/config/mips/linux64.h 2012-03-27 14:44:57.479392441 +0000
@@ -23,10 +23,10 @@
#define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
#define GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
diff -Naur gcc-4.7.0.orig/gcc/config/mips/t-linux64 gcc-4.7.0/gcc/config/mips/t-linux64
--- gcc-4.7.0.orig/gcc/config/mips/t-linux64 2012-03-27 14:35:57.609180900 +0000
+++ gcc-4.7.0/gcc/config/mips/t-linux64 2012-03-27 14:46:01.206595470 +0000
@@ -18,4 +18,4 @@
MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
MULTILIB_DIRNAMES = n32 32 64
-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
diff -Naur gcc-4.7.0.orig/gcc/config/rs6000/linux64.h gcc-4.7.0/gcc/config/rs6000/linux64.h
--- gcc-4.7.0.orig/gcc/config/rs6000/linux64.h 2012-03-27 14:35:57.575181327 +0000
+++ gcc-4.7.0/gcc/config/rs6000/linux64.h 2012-03-27 14:47:38.519376980 +0000
@@ -358,9 +358,9 @@
#undef LINK_OS_DEFAULT_SPEC
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
#if DEFAULT_LIBC == LIBC_UCLIBC
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
diff -Naur gcc-4.7.0.orig/gcc/config/rs6000/t-linux64 gcc-4.7.0/gcc/config/rs6000/t-linux64
--- gcc-4.7.0.orig/gcc/config/rs6000/t-linux64 2012-03-27 14:35:57.570181389 +0000
+++ gcc-4.7.0/gcc/config/rs6000/t-linux64 2012-03-27 14:48:35.406656623 +0000
@@ -31,5 +31,5 @@
MULTILIB_EXTRA_OPTS = fPIC mstrict-align
MULTILIB_EXCEPTIONS = m64/msoft-float
MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
+MULTILIB_OSDIRNAMES = ../lib ../lib32 nof
MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
diff -Naur gcc-4.7.0.orig/gcc/config/s390/linux.h gcc-4.7.0/gcc/config/s390/linux.h
--- gcc-4.7.0.orig/gcc/config/s390/linux.h 2012-03-27 14:35:57.616180812 +0000
+++ gcc-4.7.0/gcc/config/s390/linux.h 2012-03-27 14:49:24.287041508 +0000
@@ -61,7 +61,7 @@
#define MULTILIB_DEFAULTS { "m31" }
#endif
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
#undef LINK_SPEC
diff -Naur gcc-4.7.0.orig/gcc/config/s390/t-linux64 gcc-4.7.0/gcc/config/s390/t-linux64
--- gcc-4.7.0.orig/gcc/config/s390/t-linux64 2012-03-27 14:35:57.617180799 +0000
+++ gcc-4.7.0/gcc/config/s390/t-linux64 2012-03-27 14:50:01.463571380 +0000
@@ -7,4 +7,4 @@
MULTILIB_OPTIONS = m64/m31
MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = ../lib ../lib32
diff -Naur gcc-4.7.0.orig/gcc/config/sparc/linux.h gcc-4.7.0/gcc/config/sparc/linux.h
--- gcc-4.7.0.orig/gcc/config/sparc/linux.h 2012-03-27 14:35:57.578181288 +0000
+++ gcc-4.7.0/gcc/config/sparc/linux.h 2012-03-27 14:51:28.783476140 +0000
@@ -87,7 +87,7 @@
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
#undef LINK_SPEC
-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+#define LINK_SPEC "-m elf32_sparc -Y P,/lib32 %{shared:-shared} \
%{!mno-relax:%{!r:-relax}} \
%{!shared: \
%{!static: \
diff -Naur gcc-4.7.0.orig/gcc/config/sparc/linux64.h gcc-4.7.0/gcc/config/sparc/linux64.h
--- gcc-4.7.0.orig/gcc/config/sparc/linux64.h 2012-03-27 14:35:57.580181264 +0000
+++ gcc-4.7.0/gcc/config/sparc/linux64.h 2012-03-27 14:54:05.631500803 +0000
@@ -93,8 +93,8 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
#ifdef SPARC_BI_ARCH
@@ -105,7 +105,7 @@
{ "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
{ "link_arch", LINK_ARCH_SPEC },
-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/lib32 %{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
@@ -113,7 +113,7 @@
%{static:-static}} \
"
-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
@@ -202,7 +202,7 @@
#else /* !SPARC_BI_ARCH */
#undef LINK_SPEC
-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
+#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
diff -Naur gcc-4.7.0.orig/gcc/config/sparc/t-linux64 gcc-4.7.0/gcc/config/sparc/t-linux64
--- gcc-4.7.0.orig/gcc/config/sparc/t-linux64 2012-03-27 14:35:57.578181288 +0000
+++ gcc-4.7.0/gcc/config/sparc/t-linux64 2012-03-27 14:55:57.807090792 +0000
@@ -26,4 +26,4 @@
MULTILIB_OPTIONS = m64/m32
MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = ../lib ../lib64
-------------- next part --------------
diff -Naur gcc-4.7.0.orig/gcc/config/alpha/linux-elf.h gcc-4.7.0/gcc/config/alpha/linux-elf.h
--- gcc-4.7.0.orig/gcc/config/alpha/linux-elf.h 2012-03-26 17:38:52.598128363 +0100
+++ gcc-4.7.0/gcc/config/alpha/linux-elf.h 2012-03-26 17:43:32.104377922 +0100
@@ -24,8 +24,8 @@
#define EXTRA_SPECS \
{ "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
#if DEFAULT_LIBC == LIBC_UCLIBC
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
#elif DEFAULT_LIBC == LIBC_GLIBC
diff -Naur gcc-4.7.0.orig/gcc/config/arm/linux-eabi.h gcc-4.7.0/gcc/config/arm/linux-eabi.h
--- gcc-4.7.0.orig/gcc/config/arm/linux-eabi.h 2012-03-26 17:38:52.584129024 +0100
+++ gcc-4.7.0/gcc/config/arm/linux-eabi.h 2012-03-26 17:44:32.656385301 +0100
@@ -62,7 +62,7 @@
/* Use ld-linux.so.3 so that it will be possible to run "classic"
GNU/Linux binaries on an EABI system. */
#undef GLIBC_DYNAMIC_LINKER
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
/* At this point, bpabi.h will have clobbered LINK_SPEC. We want to
use the GNU/Linux version, not the generic BPABI version. */
diff -Naur gcc-4.7.0.orig/gcc/config/arm/linux-elf.h gcc-4.7.0/gcc/config/arm/linux-elf.h
--- gcc-4.7.0.orig/gcc/config/arm/linux-elf.h 2012-03-26 17:38:52.583128269 +0100
+++ gcc-4.7.0/gcc/config/arm/linux-elf.h 2012-03-26 17:45:40.432393774 +0100
@@ -59,7 +59,7 @@
#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
#define LINUX_TARGET_LINK_SPEC "%{h*} \
%{static:-Bstatic} \
diff -Naur gcc-4.7.0.orig/gcc/config/bfin/linux.h gcc-4.7.0/gcc/config/bfin/linux.h
--- gcc-4.7.0.orig/gcc/config/bfin/linux.h 2012-03-26 17:38:52.622128417 +0100
+++ gcc-4.7.0/gcc/config/bfin/linux.h 2012-03-26 17:46:30.760399987 +0100
@@ -45,7 +45,7 @@
%{shared:-G -Bdynamic} \
%{!shared: %{!static: \
%{rdynamic:-export-dynamic} \
- -dynamic-linker /lib/ld-uClibc.so.0} \
+ -dynamic-linker /tools/lib/ld-uClibc.so.0} \
%{static}} -init __init -fini __fini"
#undef TARGET_SUPPORTS_SYNC_CALLS
diff -Naur gcc-4.7.0.orig/gcc/config/cris/linux.h gcc-4.7.0/gcc/config/cris/linux.h
--- gcc-4.7.0.orig/gcc/config/cris/linux.h 2012-03-26 17:38:52.615128992 +0100
+++ gcc-4.7.0/gcc/config/cris/linux.h 2012-03-26 17:47:28.448407890 +0100
@@ -103,7 +103,7 @@
#undef CRIS_DEFAULT_CPU_VERSION
#define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef CRIS_LINK_SUBTARGET_SPEC
#define CRIS_LINK_SUBTARGET_SPEC \
diff -Naur gcc-4.7.0.orig/gcc/config/freebsd-spec.h gcc-4.7.0/gcc/config/freebsd-spec.h
--- gcc-4.7.0.orig/gcc/config/freebsd-spec.h 2012-03-26 17:38:52.619128593 +0100
+++ gcc-4.7.0/gcc/config/freebsd-spec.h 2012-03-26 17:48:37.312416723 +0100
@@ -131,7 +131,7 @@
#if FBSD_MAJOR < 6
#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
#else
-#define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
+#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
#endif
/* NOTE: The freebsd-spec.h header is included also for various
diff -Naur gcc-4.7.0.orig/gcc/config/frv/linux.h gcc-4.7.0/gcc/config/frv/linux.h
--- gcc-4.7.0.orig/gcc/config/frv/linux.h 2012-03-26 17:38:52.486128294 +0100
+++ gcc-4.7.0/gcc/config/frv/linux.h 2012-03-26 17:49:15.336421730 +0100
@@ -35,7 +35,7 @@
#define ENDFILE_SPEC \
"%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC "\
diff -Naur gcc-4.7.0.orig/gcc/config/i386/gnu.h gcc-4.7.0/gcc/config/i386/gnu.h
--- gcc-4.7.0.orig/gcc/config/i386/gnu.h 2012-03-26 17:38:52.419128002 +0100
+++ gcc-4.7.0/gcc/config/i386/gnu.h 2012-03-26 17:50:05.152427746 +0100
@@ -23,7 +23,7 @@
#define GNU_USER_LINK_EMULATION "elf_i386"
#undef GNU_USER_DYNAMIC_LINKER
-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so"
#undef STARTFILE_SPEC
#if defined HAVE_LD_PIE
diff -Naur gcc-4.7.0.orig/gcc/config/i386/linux.h gcc-4.7.0/gcc/config/i386/linux.h
--- gcc-4.7.0.orig/gcc/config/i386/linux.h 2012-03-26 17:38:52.418127735 +0100
+++ gcc-4.7.0/gcc/config/i386/linux.h 2012-03-26 17:50:43.816432877 +0100
@@ -21,4 +21,4 @@
<http://www.gnu.org/licenses/>. */
#define GNU_USER_LINK_EMULATION "elf_i386"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
diff -Naur gcc-4.7.0.orig/gcc/config/i386/linux64.h gcc-4.7.0/gcc/config/i386/linux64.h
--- gcc-4.7.0.orig/gcc/config/i386/linux64.h 2012-03-26 17:38:52.422128314 +0100
+++ gcc-4.7.0/gcc/config/i386/linux64.h 2012-03-26 17:52:35.256446761 +0100
@@ -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_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
+#define GLIBC_DYNAMIC_LINKERX32 "/tools/libx32/ld-linux-x32.so.2"
diff -Naur gcc-4.7.0.orig/gcc/config/i386/t-linux64 gcc-4.7.0/gcc/config/i386/t-linux64
--- gcc-4.7.0.orig/gcc/config/i386/t-linux64 2012-03-26 17:38:52.419128002 +0100
+++ gcc-4.7.0/gcc/config/i386/t-linux64 2012-03-26 17:56:30.592476689 +0100
@@ -34,6 +34,6 @@
comma=,
MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
-MULTILIB_OSDIRNAMES = m64=../lib64
-MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = m64=../lib
+MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)
MULTILIB_OSDIRNAMES+= mx32=../libx32
diff -Naur gcc-4.7.0.orig/gcc/config/ia64/linux.h gcc-4.7.0/gcc/config/ia64/linux.h
--- gcc-4.7.0.orig/gcc/config/ia64/linux.h 2012-03-26 17:38:52.497128298 +0100
+++ gcc-4.7.0/gcc/config/ia64/linux.h 2012-03-26 17:57:21.488483373 +0100
@@ -56,7 +56,7 @@
/* Define this for shared library support because it isn't in the main
linux.h file. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
#undef LINK_SPEC
#define LINK_SPEC "\
diff -Naur gcc-4.7.0.orig/gcc/config/knetbsd-gnu.h gcc-4.7.0/gcc/config/knetbsd-gnu.h
--- gcc-4.7.0.orig/gcc/config/knetbsd-gnu.h 2012-03-26 17:38:52.487128072 +0100
+++ gcc-4.7.0/gcc/config/knetbsd-gnu.h 2012-03-26 17:59:37.856500469 +0100
@@ -33,4 +33,4 @@
#undef GNU_USER_DYNAMIC_LINKER
-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
diff -Naur gcc-4.7.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.7.0/gcc/config/kopensolaris-gnu.h
--- gcc-4.7.0.orig/gcc/config/kopensolaris-gnu.h 2012-03-26 17:38:52.414128622 +0100
+++ gcc-4.7.0/gcc/config/kopensolaris-gnu.h 2012-03-26 18:00:25.384506195 +0100
@@ -32,4 +32,4 @@
while (0)
#undef GNU_USER_DYNAMIC_LINKER
-#define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"
diff -Naur gcc-4.7.0.orig/gcc/config/linux.h gcc-4.7.0/gcc/config/linux.h
--- gcc-4.7.0.orig/gcc/config/linux.h 2012-03-26 17:38:52.487128072 +0100
+++ gcc-4.7.0/gcc/config/linux.h 2012-03-26 18:02:22.672521220 +0100
@@ -74,10 +74,10 @@
GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
supporting both 32-bit and 64-bit compilation. */
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
#define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
#define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"
diff -Naur gcc-4.7.0.orig/gcc/config/lm32/uclinux-elf.h gcc-4.7.0/gcc/config/lm32/uclinux-elf.h
--- gcc-4.7.0.orig/gcc/config/lm32/uclinux-elf.h 2012-03-26 17:38:52.492127941 +0100
+++ gcc-4.7.0/gcc/config/lm32/uclinux-elf.h 2012-03-26 18:03:00.544526250 +0100
@@ -68,7 +68,7 @@
%{shared:-shared} \
%{symbolic:-Bsymbolic} \
%{rdynamic:-export-dynamic} \
- -dynamic-linker /lib/ld-linux.so.2"
+ -dynamic-linker /tools/lib/ld-linux.so.2"
#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
diff -Naur gcc-4.7.0.orig/gcc/config/m68k/linux.h gcc-4.7.0/gcc/config/m68k/linux.h
--- gcc-4.7.0.orig/gcc/config/m68k/linux.h 2012-03-26 17:38:52.592127738 +0100
+++ gcc-4.7.0/gcc/config/m68k/linux.h 2012-03-26 18:03:37.848530812 +0100
@@ -72,7 +72,7 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC "-m m68kelf %{shared} \
diff -Naur gcc-4.7.0.orig/gcc/config/microblaze/linux.h gcc-4.7.0/gcc/config/microblaze/linux.h
--- gcc-4.7.0.orig/gcc/config/microblaze/linux.h 2012-03-26 17:38:52.594127784 +0100
+++ gcc-4.7.0/gcc/config/microblaze/linux.h 2012-03-26 18:04:02.224533907 +0100
@@ -20,7 +20,7 @@
<http://www.gnu.org/licenses/>. */
-#define DYNAMIC_LINKER "/lib/ld.so.1"
+#define DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef SUBTARGET_EXTRA_SPECS
#define SUBTARGET_EXTRA_SPECS \
{ "dynamic_linker", DYNAMIC_LINKER }
diff -Naur gcc-4.7.0.orig/gcc/config/mips/linux.h gcc-4.7.0/gcc/config/mips/linux.h
--- gcc-4.7.0.orig/gcc/config/mips/linux.h 2012-03-26 17:38:52.588128626 +0100
+++ gcc-4.7.0/gcc/config/mips/linux.h 2012-03-26 18:04:32.712537688 +0100
@@ -18,4 +18,4 @@
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 "/tools/lib/ld.so.1"
diff -Naur gcc-4.7.0.orig/gcc/config/mips/linux64.h gcc-4.7.0/gcc/config/mips/linux64.h
--- gcc-4.7.0.orig/gcc/config/mips/linux64.h 2012-03-26 17:38:52.590128182 +0100
+++ gcc-4.7.0/gcc/config/mips/linux64.h 2012-03-26 18:05:30.984545443 +0100
@@ -23,10 +23,10 @@
#define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
+#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
+#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
#define GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
diff -Naur gcc-4.7.0.orig/gcc/config/mips/t-linux64 gcc-4.7.0/gcc/config/mips/t-linux64
--- gcc-4.7.0.orig/gcc/config/mips/t-linux64 2012-03-26 17:38:52.588128626 +0100
+++ gcc-4.7.0/gcc/config/mips/t-linux64 2012-03-26 18:06:44.352554718 +0100
@@ -18,4 +18,4 @@
MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
MULTILIB_DIRNAMES = n32 32 64
-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
diff -Naur gcc-4.7.0.orig/gcc/config/mn10300/linux.h gcc-4.7.0/gcc/config/mn10300/linux.h
--- gcc-4.7.0.orig/gcc/config/mn10300/linux.h 2012-03-26 17:38:52.621128639 +0100
+++ gcc-4.7.0/gcc/config/mn10300/linux.h 2012-03-26 18:07:12.928557812 +0100
@@ -33,7 +33,7 @@
#undef ASM_SPEC
#define ASM_SPEC ""
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
diff -Naur gcc-4.7.0.orig/gcc/config/pa/pa-linux.h gcc-4.7.0/gcc/config/pa/pa-linux.h
--- gcc-4.7.0.orig/gcc/config/pa/pa-linux.h 2012-03-26 17:38:52.624128951 +0100
+++ gcc-4.7.0/gcc/config/pa/pa-linux.h 2012-03-26 18:07:50.720563012 +0100
@@ -39,7 +39,7 @@
/* Define this for shared library support because it isn't in the main
linux.h file. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC "\
diff -Naur gcc-4.7.0.orig/gcc/config/rs6000/linux64.h gcc-4.7.0/gcc/config/rs6000/linux64.h
--- gcc-4.7.0.orig/gcc/config/rs6000/linux64.h 2012-03-26 17:38:52.485128027 +0100
+++ gcc-4.7.0/gcc/config/rs6000/linux64.h 2012-03-26 18:09:41.370878488 +0100
@@ -358,10 +358,10 @@
#undef LINK_OS_DEFAULT_SPEC
#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
-#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1"
+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
#if DEFAULT_LIBC == LIBC_UCLIBC
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
#elif DEFAULT_LIBC == LIBC_GLIBC
diff -Naur gcc-4.7.0.orig/gcc/config/rs6000/sysv4.h gcc-4.7.0/gcc/config/rs6000/sysv4.h
--- gcc-4.7.0.orig/gcc/config/rs6000/sysv4.h 2012-03-26 17:38:52.484126782 +0100
+++ gcc-4.7.0/gcc/config/rs6000/sysv4.h 2012-03-26 18:14:39.256614798 +0100
@@ -803,8 +803,8 @@
#define LINK_START_LINUX_SPEC ""
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
+#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
#if DEFAULT_LIBC == LIBC_UCLIBC
#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
#elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
diff -Naur gcc-4.7.0.orig/gcc/config/rs6000/t-linux64 gcc-4.7.0/gcc/config/rs6000/t-linux64
--- gcc-4.7.0.orig/gcc/config/rs6000/t-linux64 2012-03-26 17:38:52.454129526 +0100
+++ gcc-4.7.0/gcc/config/rs6000/t-linux64 2012-03-26 18:16:08.600626189 +0100
@@ -31,5 +31,5 @@
MULTILIB_EXTRA_OPTS = fPIC mstrict-align
MULTILIB_EXCEPTIONS = m64/msoft-float
MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
+MULTILIB_OSDIRNAMES = ../lib ../lib32 nof
MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
diff -Naur gcc-4.7.0.orig/gcc/config/s390/linux.h gcc-4.7.0/gcc/config/s390/linux.h
--- gcc-4.7.0.orig/gcc/config/s390/linux.h 2012-03-26 17:38:52.595128540 +0100
+++ gcc-4.7.0/gcc/config/s390/linux.h 2012-03-26 18:17:28.400636456 +0100
@@ -61,8 +61,8 @@
#define MULTILIB_DEFAULTS { "m31" }
#endif
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
-#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
#undef LINK_SPEC
#define LINK_SPEC \
diff -Naur gcc-4.7.0.orig/gcc/config/s390/t-linux64 gcc-4.7.0/gcc/config/s390/t-linux64
--- gcc-4.7.0.orig/gcc/config/s390/t-linux64 2012-03-26 17:38:52.595128540 +0100
+++ gcc-4.7.0/gcc/config/s390/t-linux64 2012-03-26 18:18:14.736642429 +0100
@@ -7,4 +7,4 @@
MULTILIB_OPTIONS = m64/m31
MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = ../lib ../lib32
diff -Naur gcc-4.7.0.orig/gcc/config/sh/linux.h gcc-4.7.0/gcc/config/sh/linux.h
--- gcc-4.7.0.orig/gcc/config/sh/linux.h 2012-03-26 17:38:52.411332177 +0100
+++ gcc-4.7.0/gcc/config/sh/linux.h 2012-03-26 18:18:54.928647000 +0100
@@ -45,7 +45,7 @@
#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
#undef SUBTARGET_LINK_EMUL_SUFFIX
#define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
diff -Naur gcc-4.7.0.orig/gcc/config/sparc/linux.h gcc-4.7.0/gcc/config/sparc/linux.h
--- gcc-4.7.0.orig/gcc/config/sparc/linux.h 2012-03-26 17:38:52.488127850 +0100
+++ gcc-4.7.0/gcc/config/sparc/linux.h 2012-03-26 18:20:10.464656323 +0100
@@ -84,10 +84,10 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
#undef LINK_SPEC
-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
+#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
%{!mno-relax:%{!r:-relax}} \
%{!shared: \
%{!static: \
diff -Naur gcc-4.7.0.orig/gcc/config/sparc/linux64.h gcc-4.7.0/gcc/config/sparc/linux64.h
--- gcc-4.7.0.orig/gcc/config/sparc/linux64.h 2012-03-26 17:38:52.490128873 +0100
+++ gcc-4.7.0/gcc/config/sparc/linux64.h 2012-03-26 18:23:42.480683780 +0100
@@ -93,8 +93,8 @@
When the -shared link option is used a final link is not being
done. */
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
#ifdef SPARC_BI_ARCH
@@ -105,7 +105,7 @@
{ "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
{ "link_arch", LINK_ARCH_SPEC },
-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib32 %{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
@@ -113,7 +113,7 @@
%{static:-static}} \
"
-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
@@ -202,7 +202,7 @@
#else /* !SPARC_BI_ARCH */
#undef LINK_SPEC
-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
+#define LINK_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
diff -Naur gcc-4.7.0.orig/gcc/config/sparc/t-linux64 gcc-4.7.0/gcc/config/sparc/t-linux64
--- gcc-4.7.0.orig/gcc/config/sparc/t-linux64 2012-03-26 17:38:52.489128117 +0100
+++ gcc-4.7.0/gcc/config/sparc/t-linux64 2012-03-26 18:24:23.536688593 +0100
@@ -26,4 +26,4 @@
MULTILIB_OPTIONS = m64/m32
MULTILIB_DIRNAMES = 64 32
-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
+MULTILIB_OSDIRNAMES = ../lib ../lib32
diff -Naur gcc-4.7.0.orig/gcc/config/vax/linux.h gcc-4.7.0/gcc/config/vax/linux.h
--- gcc-4.7.0.orig/gcc/config/vax/linux.h 2012-03-26 17:38:52.584129024 +0100
+++ gcc-4.7.0/gcc/config/vax/linux.h 2012-03-26 18:25:00.216693873 +0100
@@ -41,7 +41,7 @@
%{!shared: \
%{!static: \
%{rdynamic:-export-dynamic} \
- -dynamic-linker /lib/ld.so.1} \
+ -dynamic-linker /tools/lib/ld.so.1} \
%{static:-static}}"
#undef WCHAR_TYPE
diff -Naur gcc-4.7.0.orig/gcc/config/xtensa/linux.h gcc-4.7.0/gcc/config/xtensa/linux.h
--- gcc-4.7.0.orig/gcc/config/xtensa/linux.h 2012-03-26 17:38:52.619128593 +0100
+++ gcc-4.7.0/gcc/config/xtensa/linux.h 2012-03-26 18:25:45.608876261 +0100
@@ -45,7 +45,7 @@
%{mlongcalls:--longcalls} \
%{mno-longcalls:--no-longcalls}"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
#undef LINK_SPEC
#define LINK_SPEC \
More information about the Clfs-dev
mailing list