r627 - trunk/gcc

jim at linuxfromscratch.org jim at linuxfromscratch.org
Tue Sep 7 07:07:46 PDT 2004


Author: jim
Date: 2004-09-07 08:07:44 -0600 (Tue, 07 Sep 2004)
New Revision: 627

Added:
   trunk/gcc/gcc-3.4.2-linkonce-1.patch
   trunk/gcc/gcc-3.4.2-no_fixincludes-1.patch
   trunk/gcc/gcc-3.4.2-posix-1.patch
   trunk/gcc/gcc-3.4.2-specs-1.patch
Log:
Added: GCC 3.4.2 patches -- updated to current patch format and rediffed

Added: trunk/gcc/gcc-3.4.2-linkonce-1.patch
===================================================================
--- trunk/gcc/gcc-3.4.2-linkonce-1.patch	2004-09-03 05:20:14 UTC (rev 626)
+++ trunk/gcc/gcc-3.4.2-linkonce-1.patch	2004-09-07 14:07:44 UTC (rev 627)
@@ -0,0 +1,354 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2004-09-06
+Initial Package Version: 3.4.2
+Origin: GCC - CVS
+Upstream Status: Applied
+Description: Fixes linkone/comdat issue
+ 
+diff -Naur gcc-3.4.2.orig/gcc/config/alpha/alpha.c gcc-3.4.2/gcc/config/alpha/alpha.c
+--- gcc-3.4.2.orig/gcc/config/alpha/alpha.c	2004-08-26 09:05:27.000000000 +0000
++++ gcc-3.4.2/gcc/config/alpha/alpha.c	2004-09-07 13:50:21.552205000 +0000
+@@ -10185,6 +10185,8 @@
+ # define TARGET_SECTION_TYPE_FLAGS unicosmk_section_type_flags
+ # undef TARGET_ASM_UNIQUE_SECTION
+ # define TARGET_ASM_UNIQUE_SECTION unicosmk_unique_section
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ # undef TARGET_ASM_GLOBALIZE_LABEL
+ # define TARGET_ASM_GLOBALIZE_LABEL hook_void_FILEptr_constcharptr
+ #endif
+diff -Naur gcc-3.4.2.orig/gcc/config/arm/pe.h gcc-3.4.2/gcc/config/arm/pe.h
+--- gcc-3.4.2.orig/gcc/config/arm/pe.h	2004-02-24 14:25:22.000000000 +0000
++++ gcc-3.4.2/gcc/config/arm/pe.h	2004-09-07 13:50:21.557204240 +0000
+@@ -97,6 +97,7 @@
+ #define MULTIPLE_SYMBOL_SPACES
+ 
+ #define TARGET_ASM_UNIQUE_SECTION arm_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ 
+ #define SUPPORTS_ONE_ONLY 1
+ 
+diff -Naur gcc-3.4.2.orig/gcc/config/avr/avr.c gcc-3.4.2/gcc/config/avr/avr.c
+--- gcc-3.4.2.orig/gcc/config/avr/avr.c	2004-03-13 06:38:12.000000000 +0000
++++ gcc-3.4.2/gcc/config/avr/avr.c	2004-09-07 13:50:21.634192536 +0000
+@@ -232,6 +232,8 @@
+ #define TARGET_ATTRIBUTE_TABLE avr_attribute_table
+ #undef TARGET_ASM_UNIQUE_SECTION
+ #define TARGET_ASM_UNIQUE_SECTION avr_unique_section
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #undef TARGET_INSERT_ATTRIBUTES
+ #define TARGET_INSERT_ATTRIBUTES avr_insert_attributes
+ #undef TARGET_SECTION_TYPE_FLAGS
+diff -Naur gcc-3.4.2.orig/gcc/config/darwin.h gcc-3.4.2/gcc/config/darwin.h
+--- gcc-3.4.2.orig/gcc/config/darwin.h	2004-08-23 18:02:48.000000000 +0000
++++ gcc-3.4.2/gcc/config/darwin.h	2004-09-07 13:50:21.646190712 +0000
+@@ -689,6 +689,9 @@
+ #undef	TARGET_ASM_SELECT_RTX_SECTION
+ #define TARGET_ASM_SELECT_RTX_SECTION machopic_select_rtx_section
+ 
++#undef  TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
++
+ #define ASM_DECLARE_UNRESOLVED_REFERENCE(FILE,NAME)			\
+     do {								\
+ 	 if (FILE) {							\
+diff -Naur gcc-3.4.2.orig/gcc/config/i386/cygming.h gcc-3.4.2/gcc/config/i386/cygming.h
+--- gcc-3.4.2.orig/gcc/config/i386/cygming.h	2004-06-08 06:30:13.000000000 +0000
++++ gcc-3.4.2/gcc/config/i386/cygming.h	2004-09-07 13:50:21.650190104 +0000
+@@ -255,6 +255,7 @@
+ 
+ extern void i386_pe_unique_section (TREE, int);
+ #define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ 
+ #define SUPPORTS_ONE_ONLY 1
+ 
+diff -Naur gcc-3.4.2.orig/gcc/config/i386/i386-interix.h gcc-3.4.2/gcc/config/i386/i386-interix.h
+--- gcc-3.4.2.orig/gcc/config/i386/i386-interix.h	2004-01-31 06:18:20.000000000 +0000
++++ gcc-3.4.2/gcc/config/i386/i386-interix.h	2004-09-07 13:50:21.654189496 +0000
+@@ -344,6 +344,7 @@
+ 
+ extern void i386_pe_unique_section (tree, int);
+ #define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ 
+ #define SUPPORTS_ONE_ONLY 1
+ #endif /* 0 */
+diff -Naur gcc-3.4.2.orig/gcc/config/ip2k/ip2k.c gcc-3.4.2/gcc/config/ip2k/ip2k.c
+--- gcc-3.4.2.orig/gcc/config/ip2k/ip2k.c	2004-01-31 06:18:25.000000000 +0000
++++ gcc-3.4.2/gcc/config/ip2k/ip2k.c	2004-09-07 13:50:21.708181288 +0000
+@@ -98,6 +98,9 @@
+ #undef TARGET_ASM_UNIQUE_SECTION
+ #define TARGET_ASM_UNIQUE_SECTION unique_section
+ 
++#undef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
++
+ #undef TARGET_ATTRIBUTE_TABLE
+ #define TARGET_ATTRIBUTE_TABLE ip2k_attribute_table
+ 
+diff -Naur gcc-3.4.2.orig/gcc/config/mcore/mcore.c gcc-3.4.2/gcc/config/mcore/mcore.c
+--- gcc-3.4.2.orig/gcc/config/mcore/mcore.c	2004-01-31 06:18:29.000000000 +0000
++++ gcc-3.4.2/gcc/config/mcore/mcore.c	2004-09-07 13:50:21.738176728 +0000
+@@ -165,6 +165,8 @@
+ #define TARGET_ATTRIBUTE_TABLE 		mcore_attribute_table
+ #undef  TARGET_ASM_UNIQUE_SECTION
+ #define TARGET_ASM_UNIQUE_SECTION 	mcore_unique_section
++#undef  TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #undef  TARGET_ENCODE_SECTION_INFO
+ #define TARGET_ENCODE_SECTION_INFO 	mcore_encode_section_info
+ #undef  TARGET_STRIP_NAME_ENCODING
+diff -Naur gcc-3.4.2.orig/gcc/config/rs6000/xcoff.h gcc-3.4.2/gcc/config/rs6000/xcoff.h
+--- gcc-3.4.2.orig/gcc/config/rs6000/xcoff.h	2004-01-31 06:18:34.000000000 +0000
++++ gcc-3.4.2/gcc/config/rs6000/xcoff.h	2004-09-07 13:50:21.743175968 +0000
+@@ -172,6 +172,7 @@
+ #define TARGET_ASM_SELECT_SECTION  rs6000_xcoff_select_section
+ #define TARGET_ASM_SELECT_RTX_SECTION  rs6000_xcoff_select_rtx_section
+ #define TARGET_ASM_UNIQUE_SECTION  rs6000_xcoff_unique_section
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section
+ #define TARGET_STRIP_NAME_ENCODING  rs6000_xcoff_strip_name_encoding
+ #define TARGET_SECTION_TYPE_FLAGS  rs6000_xcoff_section_type_flags
+ 
+diff -Naur gcc-3.4.2.orig/gcc/doc/tm.texi gcc-3.4.2/gcc/doc/tm.texi
+--- gcc-3.4.2.orig/gcc/doc/tm.texi	2004-08-23 18:03:01.000000000 +0000
++++ gcc-3.4.2/gcc/doc/tm.texi	2004-09-07 13:50:21.884154536 +0000
+@@ -5974,6 +5974,15 @@
+ Whatever the actual target object format, this is often good enough.
+ @end deftypefn
+ 
++ at deftypefn {Target Hook} void TARGET_ASM_FUNCTION_RODATA_SECTION (tree @var{decl})
++Switches to a readonly data section associated with
++ at samp{DECL_SECTION_NAME (@var{decl})}.
++The default version of this function switches to @code{.gnu.linkonce.r.name}
++section if function's section is @code{.gnu.linkonce.t.name}, to
++ at code{.rodata.name} if function is in @code{.text.name} section
++and otherwise switches to the normal readonly data section.
++ at end deftypefn
++
+ @deftypefn {Target Hook} void TARGET_ASM_SELECT_RTX_SECTION (enum machine_mode @var{mode}, rtx @var{x}, unsigned HOST_WIDE_INT @var{align})
+ Switches to the appropriate section for output of constant pool entry
+ @var{x} in @var{mode}.  You can assume that @var{x} is some kind of
+diff -Naur gcc-3.4.2.orig/gcc/final.c gcc-3.4.2/gcc/final.c
+--- gcc-3.4.2.orig/gcc/final.c	2004-01-18 22:39:57.000000000 +0000
++++ gcc-3.4.2/gcc/final.c	2004-09-07 13:50:21.933147088 +0000
+@@ -1881,7 +1881,7 @@
+ 		{
+ 		  int log_align;
+ 
+-		  readonly_data_section ();
++		  targetm.asm_out.function_rodata_section (current_function_decl);
+ 
+ #ifdef ADDR_VEC_ALIGN
+ 		  log_align = ADDR_VEC_ALIGN (NEXT_INSN (insn));
+diff -Naur gcc-3.4.2.orig/gcc/output.h gcc-3.4.2/gcc/output.h
+--- gcc-3.4.2.orig/gcc/output.h	2004-01-18 22:39:57.000000000 +0000
++++ gcc-3.4.2/gcc/output.h	2004-09-07 13:50:21.939146176 +0000
+@@ -500,6 +500,8 @@
+ 					  unsigned HOST_WIDE_INT, int);
+ extern void default_unique_section (tree, int);
+ extern void default_unique_section_1 (tree, int, int);
++extern void default_function_rodata_section (tree);
++extern void default_no_function_rodata_section (tree);
+ extern void default_select_rtx_section (enum machine_mode, rtx,
+ 					unsigned HOST_WIDE_INT);
+ extern void default_elf_select_rtx_section (enum machine_mode, rtx,
+diff -Naur gcc-3.4.2.orig/gcc/target-def.h gcc-3.4.2/gcc/target-def.h
+--- gcc-3.4.2.orig/gcc/target-def.h	2004-08-23 18:02:40.000000000 +0000
++++ gcc-3.4.2/gcc/target-def.h	2004-09-07 13:50:21.943145568 +0000
+@@ -78,6 +78,10 @@
+ #define TARGET_ASM_UNIQUE_SECTION default_unique_section
+ #endif
+ 
++#ifndef TARGET_ASM_FUNCTION_RODATA_SECTION
++#define TARGET_ASM_FUNCTION_RODATA_SECTION default_function_rodata_section
++#endif
++
+ #ifndef TARGET_ASM_SELECT_RTX_SECTION
+ #define TARGET_ASM_SELECT_RTX_SECTION default_select_rtx_section
+ #endif
+@@ -201,6 +205,7 @@
+ 			TARGET_ASM_SELECT_SECTION,		\
+ 			TARGET_ASM_SELECT_RTX_SECTION,		\
+ 			TARGET_ASM_UNIQUE_SECTION,		\
++			TARGET_ASM_FUNCTION_RODATA_SECTION,	\
+ 			TARGET_ASM_CONSTRUCTOR,			\
+ 			TARGET_ASM_DESTRUCTOR,                  \
+                         TARGET_ASM_OUTPUT_MI_THUNK,             \
+diff -Naur gcc-3.4.2.orig/gcc/target.h gcc-3.4.2/gcc/target.h
+--- gcc-3.4.2.orig/gcc/target.h	2004-08-23 18:02:41.000000000 +0000
++++ gcc-3.4.2/gcc/target.h	2004-09-07 13:50:21.948144808 +0000
+@@ -118,6 +118,10 @@
+        for SELECT_SECTION.  */
+     void (* unique_section) (tree, int);
+ 
++    /* Tell assembler to switch to the readonly data section associated
++       with function DECL.  */
++    void (* function_rodata_section) (tree); 
++
+     /* Output a constructor for a symbol with a given priority.  */
+     void (* constructor) (rtx, int);
+ 
+diff -Naur gcc-3.4.2.orig/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc gcc-3.4.2/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc
+--- gcc-3.4.2.orig/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc	1970-01-01 00:00:00.000000000 +0000
++++ gcc-3.4.2/gcc/testsuite/g++.old-deja/g++.other/comdat4-aux.cc	2004-09-07 13:50:21.950144504 +0000
+@@ -0,0 +1,40 @@
++extern void
++bar (int x);
++
++inline void
++foo (int i)
++{
++  switch (i)
++    {
++    case 3:
++    case 5:
++    case 6:
++    case 9:
++    case 15:
++      bar (1);
++      break;
++    case 2:
++    case 4:
++    case 7:
++    case 10:
++    case 11:
++    case 12:
++      bar (2);
++      break;
++    case 0:
++    case 1:
++    case 8:
++    case 13:
++    case 16:
++      bar (3);
++      break;
++    case 14:
++      bar (4);
++      break;
++    default:
++      bar (5);
++      break;
++    }
++}
++
++void *fooaddr2 = (void *) foo;
+diff -Naur gcc-3.4.2.orig/gcc/testsuite/g++.old-deja/g++.other/comdat4.C gcc-3.4.2/gcc/testsuite/g++.old-deja/g++.other/comdat4.C
+--- gcc-3.4.2.orig/gcc/testsuite/g++.old-deja/g++.other/comdat4.C	1970-01-01 00:00:00.000000000 +0000
++++ gcc-3.4.2/gcc/testsuite/g++.old-deja/g++.other/comdat4.C	2004-09-07 13:50:21.952144200 +0000
+@@ -0,0 +1,57 @@
++// PR c++/16276
++// { dg-do link }
++// { dg-additional-sources " comdat4-aux.cc" }
++// { dg-options "-O2" }
++
++extern void
++bar (int x);
++
++inline void
++foo (int i)
++{
++  switch (i)
++    {
++    case 3:
++    case 5:
++    case 6:
++    case 9:
++    case 15:
++      bar (1);
++      break;
++    case 2:
++    case 4:
++    case 7:
++    case 10:
++    case 11:
++    case 12:
++      bar (2);
++      break;
++    case 0:
++    case 1:
++    case 8:
++    case 13:
++    case 16:
++      bar (3);
++      break;
++    case 14:
++      bar (4);
++      break;
++    default:
++      bar (5);
++      break;
++    }
++}
++
++void *fooaddr = (void *) foo;
++
++void
++bar (int x)
++{
++  __asm __volatile ("" : : "r" (x));
++}
++
++int
++main (void)
++{
++  return 0;
++}
+diff -Naur gcc-3.4.2.orig/gcc/varasm.c gcc-3.4.2/gcc/varasm.c
+--- gcc-3.4.2.orig/gcc/varasm.c	2004-04-14 21:14:08.000000000 +0000
++++ gcc-3.4.2/gcc/varasm.c	2004-09-07 13:50:21.989138576 +0000
+@@ -535,6 +535,53 @@
+     text_section ();
+ }
+ 
++/* Switch to read-only data section associated with function DECL.  */
++
++void
++default_function_rodata_section (tree decl)
++{
++  if (decl != NULL_TREE && DECL_SECTION_NAME (decl))
++    {
++      const char *name = TREE_STRING_POINTER (DECL_SECTION_NAME (decl));
++
++      /* For .gnu.linkonce.t.foo we want to use .gnu.linkonce.r.foo.  */
++      if (DECL_ONE_ONLY (decl) && strncmp (name, ".gnu.linkonce.t.", 16) == 0)
++	{
++	  size_t len = strlen (name) + 1;
++	  char *rname = alloca (len);
++
++	  memcpy (rname, name, len);
++	  rname[14] = 'r';
++	  named_section_flags (rname, SECTION_LINKONCE);
++	  return;
++	}
++      /* For .text.foo we want to use .rodata.foo.  */
++      else if (flag_function_sections && flag_data_sections
++	       && strncmp (name, ".text.", 6) == 0)
++	{
++	  size_t len = strlen (name) + 1;
++	  char *rname = alloca (len + 2);
++
++	  memcpy (rname, ".rodata", 7);
++	  memcpy (rname + 7, name + 5, len - 5);
++	  named_section_flags (rname, 0);
++	  return;
++	}
++    }
++
++  readonly_data_section ();
++}
++
++/* Switch to read-only data section associated with function DECL
++   for targets where that section should be always the single
++   readonly data section.  */
++
++void
++default_no_function_rodata_section (tree decl ATTRIBUTE_UNUSED)
++{
++  readonly_data_section ();
++}
++
+ /* Switch to section for variable DECL.  RELOC is the same as the
+    argument to SELECT_SECTION.  */
+ 

Added: trunk/gcc/gcc-3.4.2-no_fixincludes-1.patch
===================================================================
--- trunk/gcc/gcc-3.4.2-no_fixincludes-1.patch	2004-09-03 05:20:14 UTC (rev 626)
+++ trunk/gcc/gcc-3.4.2-no_fixincludes-1.patch	2004-09-07 14:07:44 UTC (rev 627)
@@ -0,0 +1,29 @@
+Submitted By: LFS PATCH
+Date: 2004-09-06
+Initial Package Version: 3.4.2
+Upstream Status: Not Sent - LFS Specfic
+Origin: Originally developed for GCC 3.2 by Greg Schafer and Zack Winkles
+Description: Prevent fixincludes script from running.
+
+diff -Naur gcc-3.4.2.orig/gcc/Makefile.in gcc-3.4.2/gcc/Makefile.in
+--- gcc-3.4.2.orig/gcc/Makefile.in	2004-06-17 21:56:58.000000000 +0000
++++ gcc-3.4.2/gcc/Makefile.in	2004-09-07 13:41:31.982711800 +0000
+@@ -2478,10 +2478,6 @@
+ 	rm -f include/limits.h
+ 	cp xlimits.h include/limits.h
+ 	chmod a+r include/limits.h
+-# Install the README
+-	rm -f include/README
+-	cp $(srcdir)/README-fixinc include/README
+-	chmod a+r include/README
+ 	$(STAMP) $@
+ 
+ # fixinc.sh depends on this, not on specs directly.
+@@ -2527,7 +2523,6 @@
+ 	(TARGET_MACHINE='$(target)'; srcdir=`cd $(srcdir); ${PWD_COMMAND}`; \
+ 	SHELL='$(SHELL)' ;\
+ 	export TARGET_MACHINE srcdir SHELL ; \
+-	$(SHELL) ./fixinc.sh `${PWD_COMMAND}`/include $(SYSTEM_HEADER_DIR) $(OTHER_FIXINCLUDES_DIRS); \
+ 	rm -f include/syslimits.h; \
+ 	if [ -f include/limits.h ]; then \
+ 	  mv include/limits.h include/syslimits.h; \

Added: trunk/gcc/gcc-3.4.2-posix-1.patch
===================================================================
--- trunk/gcc/gcc-3.4.2-posix-1.patch	2004-09-03 05:20:14 UTC (rev 626)
+++ trunk/gcc/gcc-3.4.2-posix-1.patch	2004-09-07 14:07:44 UTC (rev 627)
@@ -0,0 +1,233 @@
+Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
+Date: 2004-09-06
+Initial Package Version: 3.4.2
+Origin: Jim Gifford
+Upstream Status: Not Accepted - Alternative to be made
+Description: Fixes all POSIX issues
+ 
+diff -Naur gcc-3.4.2.orig/contrib/test_summary gcc-3.4.2/contrib/test_summary
+--- gcc-3.4.2.orig/contrib/test_summary	2004-08-26 05:49:13.000000000 +0000
++++ gcc-3.4.2/contrib/test_summary	2004-09-07 13:55:31.927020856 +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-3.4.2.orig/gcc/configure gcc-3.4.2/gcc/configure
+--- gcc-3.4.2.orig/gcc/configure	2004-07-13 06:58:29.000000000 +0000
++++ gcc-3.4.2/gcc/configure	2004-09-07 13:55:32.022006416 +0000
+@@ -10127,7 +10127,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-3.4.2.orig/gcc/configure.ac gcc-3.4.2/gcc/configure.ac
+--- gcc-3.4.2.orig/gcc/configure.ac	2004-07-13 06:58:29.000000000 +0000
++++ gcc-3.4.2/gcc/configure.ac	2004-09-07 13:55:32.050002160 +0000
+@@ -2018,7 +2018,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-3.4.2.orig/libjava/acinclude.m4 gcc-3.4.2/libjava/acinclude.m4
+--- gcc-3.4.2.orig/libjava/acinclude.m4	2003-12-31 08:58:29.000000000 +0000
++++ gcc-3.4.2/libjava/acinclude.m4	2004-09-07 13:55:32.056001248 +0000
+@@ -250,8 +250,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-3.4.2.orig/libjava/aclocal.m4 gcc-3.4.2/libjava/aclocal.m4
+--- gcc-3.4.2.orig/libjava/aclocal.m4	2004-09-06 23:31:35.000000000 +0000
++++ gcc-3.4.2/libjava/aclocal.m4	2004-09-07 13:55:32.082997144 +0000
+@@ -262,8 +262,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-3.4.2.orig/libjava/configure gcc-3.4.2/libjava/configure
+--- gcc-3.4.2.orig/libjava/configure	2004-09-06 23:31:35.000000000 +0000
++++ gcc-3.4.2/libjava/configure	2004-09-07 13:55:32.162984984 +0000
+@@ -3015,8 +3015,8 @@
+ echo "configure:3016: checking whether 'ld' is at least 2.13" >&5
+ 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-3.4.2.orig/libstdc++-v3/acinclude.m4 gcc-3.4.2/libstdc++-v3/acinclude.m4
+--- gcc-3.4.2.orig/libstdc++-v3/acinclude.m4	2004-07-15 17:42:45.000000000 +0000
++++ gcc-3.4.2/libstdc++-v3/acinclude.m4	2004-09-07 13:55:33.453788752 +0000
+@@ -273,7 +273,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-3.4.2.orig/libstdc++-v3/aclocal.m4 gcc-3.4.2/libstdc++-v3/aclocal.m4
+--- gcc-3.4.2.orig/libstdc++-v3/aclocal.m4	2004-08-13 20:44:03.000000000 +0000
++++ gcc-3.4.2/libstdc++-v3/aclocal.m4	2004-09-07 13:55:33.487783584 +0000
+@@ -286,7 +286,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-3.4.2.orig/libstdc++-v3/configure gcc-3.4.2/libstdc++-v3/configure
+--- gcc-3.4.2.orig/libstdc++-v3/configure	2004-08-13 20:44:04.000000000 +0000
++++ gcc-3.4.2/libstdc++-v3/configure	2004-09-07 13:56:22.282365680 +0000
+@@ -7700,7 +7700,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 | \
+@@ -46876,7 +46876,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 | \
+@@ -65536,7 +65536,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 | \
+@@ -67674,7 +67674,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 | \
+@@ -69688,7 +69688,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 | \
+@@ -72414,7 +72414,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 | \
+@@ -74381,7 +74381,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 | \
+@@ -76247,7 +76247,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 | \
+@@ -79926,7 +79926,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-3.4.2.orig/libstdc++-v3/scripts/check_survey.in gcc-3.4.2/libstdc++-v3/scripts/check_survey.in
+--- gcc-3.4.2.orig/libstdc++-v3/scripts/check_survey.in	2003-07-05 06:00:05.000000000 +0000
++++ gcc-3.4.2/libstdc++-v3/scripts/check_survey.in	2004-09-07 13:55:32.171983616 +0000
+@@ -182,9 +182,9 @@
+     function size_command()
+     {
+       case $1 in
+-        TEXT)  TEXT=$(size -B $EXENAME | tail -1 | awk '{print $1}')  ;;
+-        DATA)  DATA=$(size -B $EXENAME | tail -1 | awk '{print $2}')  ;;
+-        SIZE)  SIZE=$(size -B $EXENAME | tail -1 | awk '{print $4}')  ;;
++        TEXT)  TEXT=$(size -B $EXENAME | tail -n 1 | awk '{print $1}')  ;;
++        DATA)  DATA=$(size -B $EXENAME | tail -n 1 | awk '{print $2}')  ;;
++        SIZE)  SIZE=$(size -B $EXENAME | tail -n 1 | awk '{print $4}')  ;;
+       esac
+     }
+   else
+diff -Naur gcc-3.4.2.orig/ltcf-c.sh gcc-3.4.2/ltcf-c.sh
+--- gcc-3.4.2.orig/ltcf-c.sh	2003-11-19 05:29:32.000000000 +0000
++++ gcc-3.4.2/ltcf-c.sh	2004-09-07 13:55:33.503781152 +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-3.4.2.orig/ltcf-gcj.sh gcc-3.4.2/ltcf-gcj.sh
+--- gcc-3.4.2.orig/ltcf-gcj.sh	2003-11-19 05:29:32.000000000 +0000
++++ gcc-3.4.2/ltcf-gcj.sh	2004-09-07 13:55:33.496782216 +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-3.4.2-specs-1.patch
===================================================================
--- trunk/gcc/gcc-3.4.2-specs-1.patch	2004-09-03 05:20:14 UTC (rev 626)
+++ trunk/gcc/gcc-3.4.2-specs-1.patch	2004-09-07 14:07:44 UTC (rev 627)
@@ -0,0 +1,339 @@
+Submitted By: LFS Patch
+Date: 2004-09-06
+Initial Package Version: 3.4.2
+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.
+Description: This patch modifies the location of the dynamic linker for
+	the GCC Pass 2 build in LFS Chapter 5.
+
+diff -Naur gcc-3.4.2.orig/gcc/config/alpha/linux-elf.h gcc-3.4.2/gcc/config/alpha/linux-elf.h
+--- gcc-3.4.2.orig/gcc/config/alpha/linux-elf.h	2003-09-27 04:48:12.000000000 +0000
++++ gcc-3.4.2/gcc/config/alpha/linux-elf.h	2004-09-07 14:01:17.372505160 +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-3.4.2.orig/gcc/config/arm/linux-elf.h gcc-3.4.2/gcc/config/arm/linux-elf.h
+--- gcc-3.4.2.orig/gcc/config/arm/linux-elf.h	2004-01-31 06:18:11.000000000 +0000
++++ gcc-3.4.2/gcc/config/arm/linux-elf.h	2004-09-07 14:01:17.375504704 +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-3.4.2.orig/gcc/config/i386/kfreebsdgnu.h gcc-3.4.2/gcc/config/i386/kfreebsdgnu.h
+--- gcc-3.4.2.orig/gcc/config/i386/kfreebsdgnu.h	2003-10-21 09:52:47.000000000 +0000
++++ gcc-3.4.2/gcc/config/i386/kfreebsdgnu.h	2004-09-07 14:01:17.376504552 +0000
+@@ -31,5 +31,5 @@
+     %{!ibcs: \
+       %{!static: \
+ 	%{rdynamic:-export-dynamic} \
+-	%{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
++	%{!dynamic-linker:-dynamic-linker /tools/lib/ld.so.1}} \
+ 	%{static:-static}}}"
+diff -Naur gcc-3.4.2.orig/gcc/config/i386/linux.h gcc-3.4.2/gcc/config/i386/linux.h
+--- gcc-3.4.2.orig/gcc/config/i386/linux.h	2003-11-29 03:08:10.000000000 +0000
++++ gcc-3.4.2/gcc/config/i386/linux.h	2004-09-07 14:01:17.379504096 +0000
+@@ -115,7 +115,7 @@
+     %{!ibcs: \
+       %{!static: \
+ 	%{rdynamic:-export-dynamic} \
+-	%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
++	%{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.1}} \
+ 	%{static:-static}}}"
+ #else
+ #define LINK_SPEC "-m elf_i386 %{shared:-shared} \
+@@ -123,7 +123,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-3.4.2.orig/gcc/config/i386/linux64.h gcc-3.4.2/gcc/config/i386/linux64.h
+--- gcc-3.4.2.orig/gcc/config/i386/linux64.h	2003-11-29 03:08:10.000000000 +0000
++++ gcc-3.4.2/gcc/config/i386/linux64.h	2004-09-07 14:01:17.381503792 +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/lib/ld-linux.so.2}} \
++      %{!m32:%{!dynamic-linker:-dynamic-linker /tools/lib64/ld-linux-x86-64.so.2}}} \
+     %{static:-static}}"
+ 
+ #define MULTILIB_DEFAULTS { "m64" }
+diff -Naur gcc-3.4.2.orig/gcc/config/ia64/linux.h gcc-3.4.2/gcc/config/ia64/linux.h
+--- gcc-3.4.2.orig/gcc/config/ia64/linux.h	2004-02-07 07:56:17.000000000 +0000
++++ gcc-3.4.2/gcc/config/ia64/linux.h	2004-09-07 14:01:17.383503488 +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-3.4.2.orig/gcc/config/linux.h gcc-3.4.2/gcc/config/linux.h
+--- gcc-3.4.2.orig/gcc/config/linux.h	2003-11-29 03:08:10.000000000 +0000
++++ gcc-3.4.2/gcc/config/linux.h	2004-09-07 14:01:17.389502576 +0000
+@@ -124,3 +124,7 @@
+ #endif
+ 
+ #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-3.4.2.orig/gcc/config/m32r/linux.h gcc-3.4.2/gcc/config/m32r/linux.h
+--- gcc-3.4.2.orig/gcc/config/m32r/linux.h	2003-12-31 10:33:02.000000000 +0000
++++ gcc-3.4.2/gcc/config/m32r/linux.h	2004-09-07 14:01:17.391502272 +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-3.4.2.orig/gcc/config/m68k/linux.h gcc-3.4.2/gcc/config/m68k/linux.h
+--- gcc-3.4.2.orig/gcc/config/m68k/linux.h	2003-11-29 03:08:11.000000000 +0000
++++ gcc-3.4.2/gcc/config/m68k/linux.h	2004-09-07 14:01:17.394501816 +0000
+@@ -136,7 +136,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-3.4.2.orig/gcc/config/mips/linux.h gcc-3.4.2/gcc/config/mips/linux.h
+--- gcc-3.4.2.orig/gcc/config/mips/linux.h	2004-06-16 01:42:24.000000000 +0000
++++ gcc-3.4.2/gcc/config/mips/linux.h	2004-09-07 14:01:17.396501512 +0000
+@@ -116,7 +116,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-3.4.2.orig/gcc/config/mips/linux64.h gcc-3.4.2/gcc/config/mips/linux64.h
+--- gcc-3.4.2.orig/gcc/config/mips/linux64.h	2004-06-16 01:42:25.000000000 +0000
++++ gcc-3.4.2/gcc/config/mips/linux64.h	2004-09-07 14:01:17.398501208 +0000
+@@ -65,9 +65,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/lib32/ld.so.1} \
++	  %{mabi=64: -dynamic-linker /tools/lib64/ld.so.1} \
++	  %{mabi=32: -dynamic-linker /tools/lib/ld.so.1}}} \
+       %{static:-static}}} \
+ %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32} \
+ %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip} \
+diff -Naur gcc-3.4.2.orig/gcc/config/mn10300/linux.h gcc-3.4.2/gcc/config/mn10300/linux.h
+--- gcc-3.4.2.orig/gcc/config/mn10300/linux.h	2003-11-29 03:08:11.000000000 +0000
++++ gcc-3.4.2/gcc/config/mn10300/linux.h	2004-09-07 14:01:17.400500904 +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-3.4.2.orig/gcc/config/pa/pa-linux.h gcc-3.4.2/gcc/config/pa/pa-linux.h
+--- gcc-3.4.2.orig/gcc/config/pa/pa-linux.h	2003-11-29 03:08:11.000000000 +0000
++++ gcc-3.4.2/gcc/config/pa/pa-linux.h	2004-09-07 14:01:17.402500600 +0000
+@@ -83,7 +83,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-3.4.2.orig/gcc/config/rs6000/linux64.h gcc-3.4.2/gcc/config/rs6000/linux64.h
+--- gcc-3.4.2.orig/gcc/config/rs6000/linux64.h	2004-06-13 05:45:24.000000000 +0000
++++ gcc-3.4.2/gcc/config/rs6000/linux64.h	2004-09-07 14:01:17.410499384 +0000
+@@ -341,11 +341,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/lib/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/lib64/ld64.so.1}}}"
+ 
+ #undef  TOC_SECTION_ASM_OP
+ #define TOC_SECTION_ASM_OP \
+diff -Naur gcc-3.4.2.orig/gcc/config/rs6000/sysv4.h gcc-3.4.2/gcc/config/rs6000/sysv4.h
+--- gcc-3.4.2.orig/gcc/config/rs6000/sysv4.h	2004-06-10 06:39:50.000000000 +0000
++++ gcc-3.4.2/gcc/config/rs6000/sysv4.h	2004-09-07 14:01:17.419498016 +0000
+@@ -1122,7 +1122,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} "
+@@ -1153,7 +1153,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-3.4.2.orig/gcc/config/s390/linux.h gcc-3.4.2/gcc/config/s390/linux.h
+--- gcc-3.4.2.orig/gcc/config/s390/linux.h	2003-11-29 03:08:12.000000000 +0000
++++ gcc-3.4.2/gcc/config/s390/linux.h	2004-09-07 14:01:17.422497560 +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-3.4.2.orig/gcc/config/sh/linux.h gcc-3.4.2/gcc/config/sh/linux.h
+--- gcc-3.4.2.orig/gcc/config/sh/linux.h	2004-01-12 02:29:13.000000000 +0000
++++ gcc-3.4.2/gcc/config/sh/linux.h	2004-09-07 14:01:17.424497256 +0000
+@@ -77,7 +77,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-3.4.2.orig/gcc/config/sparc/linux.h gcc-3.4.2/gcc/config/sparc/linux.h
+--- gcc-3.4.2.orig/gcc/config/sparc/linux.h	2004-06-06 03:55:17.000000000 +0000
++++ gcc-3.4.2/gcc/config/sparc/linux.h	2004-09-07 14:01:17.427496800 +0000
+@@ -154,21 +154,21 @@
+ 
+ #undef  LINK_SPEC
+ #ifdef USE_GNULIBC_1
+-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
++#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib/ld-linux.so.1}} \
+         %{static:-static}}}"
+ #else
+-#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}}}"
+ #endif
+ 
+diff -Naur gcc-3.4.2.orig/gcc/config/sparc/linux64.h gcc-3.4.2/gcc/config/sparc/linux64.h
+--- gcc-3.4.2.orig/gcc/config/sparc/linux64.h	2004-06-06 03:55:17.000000000 +0000
++++ gcc-3.4.2/gcc/config/sparc/linux64.h	2004-09-07 14:01:17.435495584 +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/lib %{shared:-shared} \
+   %{!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}}} \
+ "
+ 
+-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
++#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/tools/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib64/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/lib64 %{shared:-shared} \
+   %{!shared: \
+     %{!ibcs: \
+       %{!static: \
+         %{rdynamic:-export-dynamic} \
+-        %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
++        %{!dynamic-linker:-dynamic-linker /tools/lib64/ld-linux.so.2}} \
+         %{static:-static}}} \
+ %{mlittle-endian:-EL} \
+ %{!mno-relax:%{!r:-relax}} \
+diff -Naur gcc-3.4.2.orig/gcc/config/xtensa/linux.h gcc-3.4.2/gcc/config/xtensa/linux.h
+--- gcc-3.4.2.orig/gcc/config/xtensa/linux.h	2003-11-29 03:08:13.000000000 +0000
++++ gcc-3.4.2/gcc/config/xtensa/linux.h	2004-09-07 14:01:17.437495280 +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




More information about the patches mailing list