Author: jim
Date: 2005-08-27 17:19:15 -0600 (Sat, 27 Aug 2005)
New Revision: 1077
Added:
trunk/gcc/gcc-4.0.1-cross_search_paths-1.patch
trunk/gcc/gcc-4.0.1-posix-1.patch
trunk/gcc/gcc-4.0.1-pure64_specs-1.patch
Modified:
trunk/
Log:
[EMAIL PROTECTED]: jim | 2005-08-27 16:16:30 -0700
Added: gcc-4.0.1-cross_search_paths-1.patch gcc-4.0.1-posix-1.patch
gcc-4.0.1-pure64_specs-1.patch
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1142
+ cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1176
Added: trunk/gcc/gcc-4.0.1-cross_search_paths-1.patch
===================================================================
--- trunk/gcc/gcc-4.0.1-cross_search_paths-1.patch 2005-08-27 20:05:20 UTC
(rev 1076)
+++ trunk/gcc/gcc-4.0.1-cross_search_paths-1.patch 2005-08-27 23:19:15 UTC
(rev 1077)
@@ -0,0 +1,48 @@
+Submitted by: Ryan Oliver <[EMAIL PROTECTED]>
+Date: 2005-05-02
+Initial Package Version: 4.0.1
+Origin: Ryan Oliver (issue reported by Erik-Jan Post)
+Upstream Status: N/A
+Description:
+ Removes standard_exec_prefix_2 from library search path when cross-compiling.
+ Removes both standard_exec_prefix_1 and standard_exec_prefix_2 from the gcc
+ executable search path when cross-compiling.
+
+ ie: if cross_compile = 1 in the specs file, do not
+ - do not add /usr/lib/gcc/${TARGET}/${GCC_VER} to the library search path
+ - do not add /usr/lib/gcc/${TARGET}/${GCC_VER} or
+ /usr/libexec/gcc/${TARGET}/${GCC_VER}
+ to the executable search path
+
+ This avoids the possibility of linking in libraries from the host if they
+ exist under those directories.
+
+diff -Naur gcc-4.0.1.orig/gcc/gcc.c gcc-4.0.1/gcc/gcc.c
+--- gcc-4.0.1.orig/gcc/gcc.c 2005-06-06 19:20:29.000000000 +0000
++++ gcc-4.0.1/gcc/gcc.c 2005-08-27 21:16:02.000000000 +0000
+@@ -3797,16 +3797,22 @@
+ PREFIX_PRIORITY_LAST, 2, 0);
+ add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS",
+ PREFIX_PRIORITY_LAST, 2, 0);
+- add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
++ if (*cross_compile == '0')
++ {
++ add_prefix (&exec_prefixes, standard_exec_prefix_1, "BINUTILS",
+ PREFIX_PRIORITY_LAST, 2, 0);
+- add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
++ add_prefix (&exec_prefixes, standard_exec_prefix_2, "BINUTILS",
+ PREFIX_PRIORITY_LAST, 2, 0);
++ }
+ #endif
+
+ add_prefix (&startfile_prefixes, standard_exec_prefix, "BINUTILS",
+ PREFIX_PRIORITY_LAST, 1, 0);
+- add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
++ if (*cross_compile == '0')
++ {
++ add_prefix (&startfile_prefixes, standard_exec_prefix_2, "BINUTILS",
+ PREFIX_PRIORITY_LAST, 1, 0);
++ }
+
+ tooldir_prefix = concat (tooldir_base_prefix, spec_machine,
+ dir_separator_str, NULL);
Added: trunk/gcc/gcc-4.0.1-posix-1.patch
===================================================================
--- trunk/gcc/gcc-4.0.1-posix-1.patch 2005-08-27 20:05:20 UTC (rev 1076)
+++ trunk/gcc/gcc-4.0.1-posix-1.patch 2005-08-27 23:19:15 UTC (rev 1077)
@@ -0,0 +1,191 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2005-08-27
+Initial Package Version: 4.0.1
+Origin: Jim Gifford
+Upstream Status: On Hold
+Description: Makes GCC Posix Compliant
+
+diff -Naur gcc-4.0.1.orig/contrib/test_summary gcc-4.0.1/contrib/test_summary
+--- gcc-4.0.1.orig/contrib/test_summary 2004-08-26 05:51:22.000000000
+0000
++++ gcc-4.0.1/contrib/test_summary 2005-08-27 21:06:51.000000000 +0000
+@@ -106,7 +106,7 @@
+ srcdir = configflags;
+ sub(/\/configure .*/, "", srcdir);
+ printf "LAST_UPDATED: ";
+- system("tail -1 " srcdir "/LAST_UPDATED");
++ system("tail -n 1 " srcdir "/LAST_UPDATED");
+ print "";
+
+ sub(/^[^ ]*\/configure */, " ", configflags);
+diff -Naur gcc-4.0.1.orig/gcc/configure gcc-4.0.1/gcc/configure
+--- gcc-4.0.1.orig/gcc/configure 2005-07-07 20:44:40.000000000 +0000
++++ gcc-4.0.1/gcc/configure 2005-08-27 21:06:51.000000000 +0000
+@@ -13511,7 +13511,7 @@
+ # and we got the correct data, then succeed.
+ if test x$gcc_cv_objdump != x \
+ && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+- | tail -3 > conftest.got \
++ | tail -n 3 > conftest.got \
+ && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
+ || cmp conftest.big conftest.got > /dev/null 2>&1; }
+ then
+diff -Naur gcc-4.0.1.orig/gcc/configure.ac gcc-4.0.1/gcc/configure.ac
+--- gcc-4.0.1.orig/gcc/configure.ac 2005-06-01 08:14:33.000000000 +0000
++++ gcc-4.0.1/gcc/configure.ac 2005-08-27 21:06:51.000000000 +0000
+@@ -2214,7 +2214,7 @@
+ # and we got the correct data, then succeed.
+ if test x$gcc_cv_objdump != x \
+ && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \
+- | tail -3 > conftest.got \
++ | tail -n 3 > conftest.got \
+ && { cmp conftest.lit conftest.got > /dev/null 2>&1 \
+ || cmp conftest.big conftest.got > /dev/null 2>&1; }
+ then
+diff -Naur gcc-4.0.1.orig/libjava/acinclude.m4 gcc-4.0.1/libjava/acinclude.m4
+--- gcc-4.0.1.orig/libjava/acinclude.m4 2004-09-23 01:14:00.000000000
+0000
++++ gcc-4.0.1/libjava/acinclude.m4 2005-08-27 21:06:51.000000000 +0000
+@@ -17,8 +17,8 @@
+ AC_MSG_CHECKING(whether 'ld' is at least 2.13)
+ LD_PROG=`$CC --print-prog-name=ld`
+ LD_VERSION=`$LD_PROG --version`
+-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' '
-f 4`
+-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d '
' -f 4`
++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
+ if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
+ LD_OK="ok"
+ else
+diff -Naur gcc-4.0.1.orig/libjava/configure gcc-4.0.1/libjava/configure
+--- gcc-4.0.1.orig/libjava/configure 2005-07-07 20:44:40.000000000 +0000
++++ gcc-4.0.1/libjava/configure 2005-08-27 21:06:51.000000000 +0000
+@@ -5933,8 +5933,8 @@
+ echo $ECHO_N "checking whether 'ld' is at least 2.13... $ECHO_C" >&6
+ LD_PROG=`$CC --print-prog-name=ld`
+ LD_VERSION=`$LD_PROG --version`
+-LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' '
-f 4`
+-LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2`
++LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 1 | cut -d '
' -f 4`
++LD_VERSION_MINOR=`echo "$LD_VERSION" | head -n 1 | cut -d '.' -f 2`
+ if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then
+ LD_OK="ok"
+ else
+diff -Naur gcc-4.0.1.orig/libstdc++-v3/acinclude.m4
gcc-4.0.1/libstdc++-v3/acinclude.m4
+--- gcc-4.0.1.orig/libstdc++-v3/acinclude.m4 2005-06-23 09:23:59.000000000
+0000
++++ gcc-4.0.1/libstdc++-v3/acinclude.m4 2005-08-27 21:06:51.000000000
+0000
+@@ -241,7 +241,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+ changequote(,)
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+ changequote([,])
+ glibcxx_gnu_ld_version=`echo $ldver | \
+diff -Naur gcc-4.0.1.orig/libstdc++-v3/configure
gcc-4.0.1/libstdc++-v3/configure
+--- gcc-4.0.1.orig/libstdc++-v3/configure 2005-06-23 09:24:00.000000000
+0000
++++ gcc-4.0.1/libstdc++-v3/configure 2005-08-27 21:06:52.000000000 +0000
+@@ -9880,7 +9880,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -55252,7 +55252,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -76923,7 +76923,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -79292,7 +79292,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -81537,7 +81537,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -84550,7 +84550,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -86748,7 +86748,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -88995,7 +88995,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+@@ -91603,7 +91603,7 @@
+ # Start by getting the version number. I think the libtool test already
+ # does some of this, but throws away the result.
+
+- ldver=`$LD --version 2>/dev/null | head -1 | \
++ ldver=`$LD --version 2>/dev/null | head -n 1 | \
+ sed -e 's/GNU ld version \([0-9.][0-9.]*\).*/\1/'`
+
+ glibcxx_gnu_ld_version=`echo $ldver | \
+diff -Naur gcc-4.0.1.orig/ltcf-c.sh gcc-4.0.1/ltcf-c.sh
+--- gcc-4.0.1.orig/ltcf-c.sh 2005-05-14 00:42:34.000000000 +0000
++++ gcc-4.0.1/ltcf-c.sh 2005-08-27 21:07:08.000000000 +0000
+@@ -153,7 +153,7 @@
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is.
+ # If DATA tags from a recent dlltool are present, honour them!
+- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS;
then
+ cp $export_symbols $output_objdir/$soname-def;
+ else
+ echo EXPORTS > $output_objdir/$soname-def;
+diff -Naur gcc-4.0.1.orig/ltcf-gcj.sh gcc-4.0.1/ltcf-gcj.sh
+--- gcc-4.0.1.orig/ltcf-gcj.sh 2005-05-14 00:42:34.000000000 +0000
++++ gcc-4.0.1/ltcf-gcj.sh 2005-08-27 21:07:08.000000000 +0000
+@@ -156,7 +156,7 @@
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is.
+ # If DATA tags from a recent dlltool are present, honour them!
+- archive_expsym_cmds='if test "x`head -1 $export_symbols`" = xEXPORTS; then
++ archive_expsym_cmds='if test "x`head -n 1 $export_symbols`" = xEXPORTS;
then
+ cp $export_symbols $output_objdir/$soname-def;
+ else
+ echo EXPORTS > $output_objdir/$soname-def;
Added: trunk/gcc/gcc-4.0.1-pure64_specs-1.patch
===================================================================
--- trunk/gcc/gcc-4.0.1-pure64_specs-1.patch 2005-08-27 20:05:20 UTC (rev
1076)
+++ trunk/gcc/gcc-4.0.1-pure64_specs-1.patch 2005-08-27 23:19:15 UTC (rev
1077)
@@ -0,0 +1,336 @@
+Submitted By: Robert Connolly <robert at linuxfromscratch dot org> (ashes)
+Date: 2006-01-16
+Initial Package Version: 4.0.0
+Upstream Status: Not Sent - LFS Specfic
+Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
+ the Pure LFS project.
+ More architectures added by Zack Winkles.
+ Further fine tunings by Greg Schafer.
+ Modified for gcc 3.3.2 by Oliver Brakmann.
+Rediffed against gcc 3.4.0 by Zack Winkles.
+ Rediffed against gcc 3.4.3 by Jim Gifford.
+ Rediffed against gcc 4.0.0 by Robert Connolly.
+Description: This patch modifies the location of the dynamic linker for
+ the GCC Pass 2 build in LFS Chapter 5.
+
+diff -Naur gcc-20050116.orig/gcc/config/alpha/linux-elf.h
gcc-20050116/gcc/config/alpha/linux-elf.h
+--- gcc-20050116.orig/gcc/config/alpha/linux-elf.h 2005-01-17
00:45:16.000000000 +0000
++++ gcc-20050116/gcc/config/alpha/linux-elf.h 2005-01-17 00:46:14.560651027
+0000
+@@ -27,7 +27,7 @@
+ #define SUBTARGET_EXTRA_SPECS \
+ { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
+
+-#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define ELF_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+
+ #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
+ %{O*:-O3} %{!O*:-O1} \
+diff -Naur gcc-20050116.orig/gcc/config/arm/linux-elf.h
gcc-20050116/gcc/config/arm/linux-elf.h
+--- gcc-20050116.orig/gcc/config/arm/linux-elf.h 2005-01-17
00:45:16.000000000 +0000
++++ gcc-20050116/gcc/config/arm/linux-elf.h 2005-01-17 00:46:50.538578614
+0000
+@@ -87,7 +87,7 @@
+ %{shared:-shared} \
+ %{symbolic:-Bsymbolic} \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2} \
+ -X \
+ %{mbig-endian:-EB}" \
+ SUBTARGET_EXTRA_LINK_SPEC
+diff -Naur gcc-20050116.orig/gcc/config/frv/linux.h
gcc-20050116/gcc/config/frv/linux.h
+--- gcc-20050116.orig/gcc/config/frv/linux.h 2005-01-17 00:45:16.000000000
+0000
++++ gcc-20050116/gcc/config/frv/linux.h 2005-01-17 01:33:50.600805260
+0000
+@@ -41,7 +41,7 @@
+ %{mfdpic: -m elf32frvfd -z text} %{shared} %{pie} \
+ %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+ %{static}}"
+
+ /* Support for compile-time default CPU. */
+diff -Naur gcc-20050116.orig/gcc/config/i386/gnu.h
gcc-20050116/gcc/config/i386/gnu.h
+--- gcc-20050116.orig/gcc/config/i386/gnu.h 2005-01-17 00:45:16.000000000
+0000
++++ gcc-20050116/gcc/config/i386/gnu.h 2005-01-17 01:34:11.142021939 +0000
+@@ -27,7 +27,7 @@
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so}} \
+ %{static:-static}}"
+
+ #undef STARTFILE_SPEC
+diff -Naur gcc-20050116.orig/gcc/config/i386/linux.h
gcc-20050116/gcc/config/i386/linux.h
+--- gcc-20050116.orig/gcc/config/i386/linux.h 2005-01-17 00:45:16.000000000
+0000
++++ gcc-20050116/gcc/config/i386/linux.h 2005-01-17 00:49:27.412667132
+0000
+@@ -105,7 +105,7 @@
+ /* If ELF is the default format, we should not use /lib/elf. */
+
+ #define LINK_EMULATION "elf_i386"
+-#define DYNAMIC_LINKER "/lib/ld-linux.so.2"
++#define DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
+
+ #undef SUBTARGET_EXTRA_SPECS
+ #define SUBTARGET_EXTRA_SPECS \
+diff -Naur gcc-20050116.orig/gcc/config/i386/linux64.h
gcc-20050116/gcc/config/i386/linux64.h
+--- gcc-20050116.orig/gcc/config/i386/linux64.h 2005-01-17
00:45:16.000000000 +0000
++++ gcc-20050116/gcc/config/i386/linux64.h 2005-01-17 00:50:23.055094690
+0000
+@@ -60,8 +60,8 @@
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+- %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}}
\
++ %{m32:%{!dynamic-linker:-dynamic-linker /tools/lib32/ld-linux.so.2}} \
++ %{!m32:%{!dynamic-linker:-dynamic-linker
/tools/lib/ld-linux-x86-64.so.2}}} \
+ %{static:-static}}"
+
+ #define MULTILIB_DEFAULTS { "m64" }
+diff -Naur gcc-20050116.orig/gcc/config/ia64/linux.h
gcc-20050116/gcc/config/ia64/linux.h
+--- gcc-20050116.orig/gcc/config/ia64/linux.h 2005-01-17 00:45:17.000000000
+0000
++++ gcc-20050116/gcc/config/ia64/linux.h 2005-01-17 00:50:43.146472133
+0000
+@@ -43,7 +43,7 @@
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux-ia64.so.2}} \
+ %{static:-static}}"
+
+
+diff -Naur gcc-20050116.orig/gcc/config/linux.h gcc-20050116/gcc/config/linux.h
+--- gcc-20050116.orig/gcc/config/linux.h 2005-01-17 00:45:16.000000000
+0000
++++ gcc-20050116/gcc/config/linux.h 2005-01-17 00:51:14.101809663 +0000
+@@ -104,3 +104,7 @@
+ #define TARGET_C99_FUNCTIONS 1
+
+ #define TARGET_HAS_F_SETLKW
++
++/* Remove /usr/include from the end of the include search path. */
++#undef STANDARD_INCLUDE_DIR
++#define STANDARD_INCLUDE_DIR 0
+diff -Naur gcc-20050116.orig/gcc/config/m32r/linux.h
gcc-20050116/gcc/config/m32r/linux.h
+--- gcc-20050116.orig/gcc/config/m32r/linux.h 2005-01-17 00:45:17.000000000
+0000
++++ gcc-20050116/gcc/config/m32r/linux.h 2005-01-17 00:51:39.720640870
+0000
+@@ -66,7 +66,7 @@
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+ %{static:-static}}}"
+ #else
+ #define LINK_SPEC "%(link_cpu) -m m32relf_linux %{shared:-shared} \
+@@ -74,7 +74,7 @@
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+ %{static:-static}}}"
+ #endif
+
+diff -Naur gcc-20050116.orig/gcc/config/m68k/linux.h
gcc-20050116/gcc/config/m68k/linux.h
+--- gcc-20050116.orig/gcc/config/m68k/linux.h 2005-01-17 00:45:17.000000000
+0000
++++ gcc-20050116/gcc/config/m68k/linux.h 2005-01-17 00:52:07.633830392
+0000
+@@ -132,7 +132,7 @@
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
++ %{!dynamic-linker*:-dynamic-linker /tools/lib/ld.so.1}} \
+ %{static}}"
+
+ /* For compatibility with linux/a.out */
+diff -Naur gcc-20050116.orig/gcc/config/mips/linux.h
gcc-20050116/gcc/config/mips/linux.h
+--- gcc-20050116.orig/gcc/config/mips/linux.h 2005-01-17 00:45:17.000000000
+0000
++++ gcc-20050116/gcc/config/mips/linux.h 2005-01-17 00:52:28.348034505
+0000
+@@ -115,7 +115,7 @@
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+ %{static:-static}}}"
+
+ #undef SUBTARGET_ASM_SPEC
+diff -Naur gcc-20050116.orig/gcc/config/mips/linux64.h
gcc-20050116/gcc/config/mips/linux64.h
+--- gcc-20050116.orig/gcc/config/mips/linux64.h 2005-01-17
00:45:17.000000000 +0000
++++ gcc-20050116/gcc/config/mips/linux64.h 2005-01-17 00:53:04.645878728
+0000
+@@ -60,9 +60,9 @@
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+ %{!dynamic-linker: \
+- %{mabi=n32: -dynamic-linker /lib32/ld.so.1} \
+- %{mabi=64: -dynamic-linker /lib64/ld.so.1} \
+- %{mabi=32: -dynamic-linker /lib/ld.so.1}}} \
++ %{mabi=n32: -dynamic-linker /tools/lib64/ld.so.1} \
++ %{mabi=64: -dynamic-linker /tools/lib/ld.so.1} \
++ %{mabi=32: -dynamic-linker /tools/lib32/ld.so.1}}} \
+ %{static:-static}}} \
+ %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32} \
+ %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip} \
+diff -Naur gcc-20050116.orig/gcc/config/mn10300/linux.h
gcc-20050116/gcc/config/mn10300/linux.h
+--- gcc-20050116.orig/gcc/config/mn10300/linux.h 2005-01-17
00:45:17.000000000 +0000
++++ gcc-20050116/gcc/config/mn10300/linux.h 2005-01-17 00:53:23.477610026
+0000
+@@ -37,7 +37,7 @@
+ #define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+ %{static:-static}"
+
+ #undef LIB_SPEC
+diff -Naur gcc-20050116.orig/gcc/config/pa/pa-linux.h
gcc-20050116/gcc/config/pa/pa-linux.h
+--- gcc-20050116.orig/gcc/config/pa/pa-linux.h 2005-01-17 00:45:17.000000000
+0000
++++ gcc-20050116/gcc/config/pa/pa-linux.h 2005-01-17 00:53:45.334495141
+0000
+@@ -88,7 +88,7 @@
+ %{!shared: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+ %{static:-static}}"
+
+ /* glibc's profiling functions don't need gcc to allocate counters. */
+diff -Naur gcc-20050116.orig/gcc/config/rs6000/linux64.h
gcc-20050116/gcc/config/rs6000/linux64.h
+--- gcc-20050116.orig/gcc/config/rs6000/linux64.h 2005-01-17
00:45:17.000000000 +0000
++++ gcc-20050116/gcc/config/rs6000/linux64.h 2005-01-17 00:54:28.524412534
+0000
+@@ -351,11 +351,11 @@
+
+ #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
++ %{!dynamic-linker:-dynamic-linker /tools/lib32/ld.so.1}}}"
+
+ #define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib64/ld64.so.1}}}"
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld64.so.1}}}"
+
+ #undef TOC_SECTION_ASM_OP
+ #define TOC_SECTION_ASM_OP \
+diff -Naur gcc-20050116.orig/gcc/config/rs6000/sysv4.h
gcc-20050116/gcc/config/rs6000/sysv4.h
+--- gcc-20050116.orig/gcc/config/rs6000/sysv4.h 2005-01-17
00:45:17.000000000 +0000
++++ gcc-20050116/gcc/config/rs6000/sysv4.h 2005-01-17 01:26:39.126999460
+0000
+@@ -1131,7 +1131,7 @@
+
+ #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
+
+ #if defined(HAVE_LD_EH_FRAME_HDR)
+ # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
+@@ -1162,7 +1162,7 @@
+
+ #define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}}}"
+
+ #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \
+ %{!undef: \
+diff -Naur gcc-20050116.orig/gcc/config/s390/linux.h
gcc-20050116/gcc/config/s390/linux.h
+--- gcc-20050116.orig/gcc/config/s390/linux.h 2005-01-17 00:45:17.000000000
+0000
++++ gcc-20050116/gcc/config/s390/linux.h 2005-01-17 01:26:58.672523211
+0000
+@@ -86,8 +86,8 @@
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+ %{!dynamic-linker: \
+- %{m31:-dynamic-linker /lib/ld.so.1} \
+- %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
++ %{m31:-dynamic-linker /tools/lib/ld.so.1} \
++ %{m64:-dynamic-linker /tools/lib/ld64.so.1}}}}"
+
+
+ #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
+diff -Naur gcc-20050116.orig/gcc/config/sh/linux.h
gcc-20050116/gcc/config/sh/linux.h
+--- gcc-20050116.orig/gcc/config/sh/linux.h 2005-01-17 00:45:18.000000000
+0000
++++ gcc-20050116/gcc/config/sh/linux.h 2005-01-17 01:27:19.588663163 +0000
+@@ -70,7 +70,7 @@
+ "%{shared:-shared} \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+ %{static:-static}"
+
+ #undef LIB_SPEC
+diff -Naur gcc-20050116.orig/gcc/config/sparc/linux.h
gcc-20050116/gcc/config/sparc/linux.h
+--- gcc-20050116.orig/gcc/config/sparc/linux.h 2005-01-17 00:45:18.000000000
+0000
++++ gcc-20050116/gcc/config/sparc/linux.h 2005-01-17 01:30:07.282688639
+0000
+@@ -131,13 +131,13 @@
+ /* If ELF is the default format, we should not use /lib/elf. */
+
+ #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: \
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+ %{static:-static}}}"
+
+ /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
+diff -Naur gcc-20050116.orig/gcc/config/sparc/linux64.h
gcc-20050116/gcc/config/sparc/linux64.h
+--- gcc-20050116.orig/gcc/config/sparc/linux64.h 2005-01-17
00:45:18.000000000 +0000
++++ gcc-20050116/gcc/config/sparc/linux64.h 2005-01-17 01:31:18.242712476
+0000
+@@ -167,21 +167,21 @@
+ { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
+ { "link_arch", LINK_ARCH_SPEC },
+
+-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
+ %{!shared: \
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib32/ld-linux.so.2}} \
+ %{static:-static}}} \
+ "
+
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
+ %{!shared: \
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+ %{static:-static}}} \
+ "
+
+@@ -257,12 +257,12 @@
+ #else /* !SPARC_BI_ARCH */
+
+ #undef LINK_SPEC
+-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_SPEC "-m elf64_sparc -Y P,/tools/lib %{shared:-shared} \
+ %{!shared: \
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.2}} \
+ %{static:-static}}} \
+ %{mlittle-endian:-EL} \
+ %{!mno-relax:%{!r:-relax}} \
+diff -Naur gcc-20050116.orig/gcc/config/xtensa/linux.h
gcc-20050116/gcc/config/xtensa/linux.h
+--- gcc-20050116.orig/gcc/config/xtensa/linux.h 2005-01-17
00:45:18.000000000 +0000
++++ gcc-20050116/gcc/config/xtensa/linux.h 2005-01-17 01:32:08.951429623
+0000
+@@ -50,7 +50,7 @@
+ %{!ibcs: \
+ %{!static: \
+ %{rdynamic:-export-dynamic} \
+- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++ %{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+ %{static:-static}}}"
+
+ #undef LOCAL_LABEL_PREFIX
--
http://linuxfromscratch.org/mailman/listinfo/patches
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
