updated specs patch

Zack Winkles winkie at linuxfromscratch.org
Sat May 10 21:21:41 PDT 2003


Gerard Beekmans (gerard at linuxfromscratch.org) wrote:
<snip>

Attached is an even newer patch, with a few new archs that have shown
up. I'm pretty sure this is all that can be done, because I did a
manually search of the entire gcc/config/ area for any occurrances of
/lib (fun fun). I diff'd it against specs-3, and nothing is missing.
I hope this works for everybody.

-------------- next part --------------
diff -Naur gcc-3.2.3.orig/gcc/config/alpha/linux-elf.h gcc-3.2.3/gcc/config/alpha/linux-elf.h
--- gcc-3.2.3.orig/gcc/config/alpha/linux-elf.h	2001-07-21 05:42:19.000000000 -0400
+++ gcc-3.2.3/gcc/config/alpha/linux-elf.h	2003-05-10 23:54:40.194274400 -0400
@@ -31,9 +31,9 @@
 #define SUB_CPP_PREDEFINES	"-D__ELF__"
 
 #ifdef USE_GNULIBC_1
-#define ELF_DYNAMIC_LINKER	"/lib/ld.so.1"
+#define ELF_DYNAMIC_LINKER	"/stage1/lib/ld.so.1"
 #else
-#define ELF_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
+#define ELF_DYNAMIC_LINKER	"/stage1/lib/ld-linux.so.2"
 #endif
 
 #ifndef USE_GNULIBC_1
diff -Naur gcc-3.2.3.orig/gcc/config/arm/linux-elf.h gcc-3.2.3/gcc/config/arm/linux-elf.h
--- gcc-3.2.3.orig/gcc/config/arm/linux-elf.h	2002-04-15 16:27:24.000000000 -0400
+++ gcc-3.2.3/gcc/config/arm/linux-elf.h	2003-05-10 23:55:28.722896928 -0400
@@ -84,7 +84,7 @@
    %{shared:-shared} \
    %{symbolic:-Bsymbolic} \
    %{rdynamic:-export-dynamic} \
-   %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
+   %{!dynamic-linker:-dynamic-linker /stage1/lib/ld-linux.so.2} \
    -X \
    %{mbig-endian:-EB}" \
    SUBTARGET_EXTRA_LINK_SPEC
diff -Naur gcc-3.2.3.orig/gcc/config/i386/linux.h gcc-3.2.3/gcc/config/i386/linux.h
--- gcc-3.2.3.orig/gcc/config/i386/linux.h	2003-03-06 15:19:22.000000000 -0500
+++ gcc-3.2.3/gcc/config/i386/linux.h	2003-05-10 23:58:50.360243392 -0400
@@ -138,7 +138,7 @@
     %{!ibcs: \
       %{!static: \
 	%{rdynamic:-export-dynamic} \
-	%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+	%{!dynamic-linker:-dynamic-linker /stage1/lib/ld-linux.so.2}} \
 	%{static:-static}}}"
 #endif
 
diff -Naur gcc-3.2.3.orig/gcc/config/i386/linux64.h gcc-3.2.3/gcc/config/i386/linux64.h
--- gcc-3.2.3.orig/gcc/config/i386/linux64.h	2003-03-14 07:18:24.000000000 -0500
+++ gcc-3.2.3/gcc/config/i386/linux64.h	2003-05-11 00:02:33.405335384 -0400
@@ -51,8 +51,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 /stage1/lib/ld-linux.so.2}} \
+      %{!m32:%{!dynamic-linker:-dynamic-linker /stage1/lib64/ld-linux-x86-64.so.2}}} \
     %{static:-static}}"
 
 #undef  STARTFILE_SPEC
diff -Naur gcc-3.2.3.orig/gcc/config/ia64/linux.h gcc-3.2.3/gcc/config/ia64/linux.h
--- gcc-3.2.3.orig/gcc/config/ia64/linux.h	2002-05-23 17:24:38.000000000 -0400
+++ gcc-3.2.3/gcc/config/ia64/linux.h	2003-05-11 00:04:49.542639368 -0400
@@ -38,7 +38,7 @@
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
+      %{!dynamic-linker:-dynamic-linker /stage1/lib/ld-linux-ia64.so.2}} \
       %{static:-static}}"
 
 
diff -Naur gcc-3.2.3.orig/gcc/config/m68k/linux.h gcc-3.2.3/gcc/config/m68k/linux.h
--- gcc-3.2.3.orig/gcc/config/m68k/linux.h	2003-01-30 11:57:24.000000000 -0500
+++ gcc-3.2.3/gcc/config/m68k/linux.h	2003-05-11 00:08:14.420493200 -0400
@@ -164,14 +164,14 @@
   %{!shared:%{!symbolic: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker*:-dynamic-linker /lib/elf/ld-linux.so.1} \
-      %{!rpath*:-rpath /lib/elf/}} %{static}}}"
+      %{!dynamic-linker*:-dynamic-linker /stage1/lib/elf/ld-linux.so.1} \
+      %{!rpath*:-rpath /stage1/lib/elf/}} %{static}}}"
 #else
 #define LINK_SPEC "-m m68kelf %{shared} %{symbolic:-shared -Bsymbolic} \
   %{!shared:%{!symbolic: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker*:-dynamic-linker /lib/ld-linux.so.1}} \
+      %{!dynamic-linker*:-dynamic-linker /stage1/lib/ld-linux.so.1}} \
     %{static}}}"
 #endif
 #else
@@ -179,7 +179,7 @@
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
+      %{!dynamic-linker*:-dynamic-linker /stage1/lib/ld.so.1}} \
     %{static}}"
 #endif
 
diff -Naur gcc-3.2.3.orig/gcc/config/mips/linux.h gcc-3.2.3/gcc/config/mips/linux.h
--- gcc-3.2.3.orig/gcc/config/mips/linux.h	2002-04-15 16:27:33.000000000 -0400
+++ gcc-3.2.3/gcc/config/mips/linux.h	2003-05-11 00:18:07.723297464 -0400
@@ -211,7 +211,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
+        %{!dynamic-linker:-dynamic-linker /stage1/lib/ld.so.1}} \
         %{static:-static}}}"
 
 
diff -Naur gcc-3.2.3.orig/gcc/config/pa/pa-linux.h gcc-3.2.3/gcc/config/pa/pa-linux.h
--- gcc-3.2.3.orig/gcc/config/pa/pa-linux.h	2003-01-19 14:07:34.000000000 -0500
+++ gcc-3.2.3/gcc/config/pa/pa-linux.h	2003-05-11 00:09:47.296373920 -0400
@@ -49,7 +49,7 @@
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
+      %{!dynamic-linker:-dynamic-linker /stage1/lib/ld.so.1}} \
       %{static:-static}}"
 
 /* Sibcalls are ok.  */
diff -Naur gcc-3.2.3.orig/gcc/config/rs6000/linux64.h gcc-3.2.3/gcc/config/rs6000/linux64.h
--- gcc-3.2.3.orig/gcc/config/rs6000/linux64.h	2002-09-13 20:26:39.000000000 -0400
+++ gcc-3.2.3/gcc/config/rs6000/linux64.h	2003-05-11 00:11:00.241284608 -0400
@@ -148,7 +148,7 @@
 #ifndef CROSS_COMPILE
 #define LINK_OS_LINUX_SPEC "-m elf64ppc %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
-  %{!dynamic-linker:-dynamic-linker /lib64/ld.so.1}}}"
+  %{!dynamic-linker:-dynamic-linker /stage1/lib64/ld.so.1}}}"
 #else
 #define LINK_OS_LINUX_SPEC "-m elf64ppc %{!shared: %{!static: \
   %{rdynamic:-export-dynamic} \
diff -Naur gcc-3.2.3.orig/gcc/config/rs6000/sysv4.h gcc-3.2.3/gcc/config/rs6000/sysv4.h
--- gcc-3.2.3.orig/gcc/config/rs6000/sysv4.h	2003-01-30 09:03:42.000000000 -0500
+++ gcc-3.2.3/gcc/config/rs6000/sysv4.h	2003-05-11 00:12:19.379253808 -0400
@@ -1248,7 +1248,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 /stage1/lib/ld.so.1}}}"
 
 #if !defined(USE_GNULIBC_1) && defined(HAVE_LD_EH_FRAME_HDR)
 # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
@@ -1288,7 +1288,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 /stage1/lib/ld.so.1}}}"
 
 #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__	\
 %{!undef:					                \
diff -Naur gcc-3.2.3.orig/gcc/config/s390/linux.h gcc-3.2.3/gcc/config/s390/linux.h
--- gcc-3.2.3.orig/gcc/config/s390/linux.h	2002-04-26 15:21:18.000000000 -0400
+++ gcc-3.2.3/gcc/config/s390/linux.h	2003-05-11 00:13:18.527261944 -0400
@@ -101,7 +101,7 @@
       %{static:-static} \
       %{!static: \
 	%{rdynamic:-export-dynamic} \
-	%{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
+	%{!dynamic-linker:-dynamic-linker /stage1/lib/ld.so.1}}}"
 
 #define LINK_ARCH64_SPEC \
   "-m elf64_s390 \
@@ -110,7 +110,7 @@
       %{static:-static} \
       %{!static: \
 	%{rdynamic:-export-dynamic} \
-	%{!dynamic-linker:-dynamic-linker /lib/ld64.so.1}}}"
+	%{!dynamic-linker:-dynamic-linker /stage1/lib/ld64.so.1}}}"
 
 #ifdef DEFAULT_TARGET_64BIT
 #undef  LINK_SPEC
diff -Naur gcc-3.2.3.orig/gcc/config/sh/linux.h gcc-3.2.3/gcc/config/sh/linux.h
--- gcc-3.2.3.orig/gcc/config/sh/linux.h	2002-04-15 16:27:42.000000000 -0400
+++ gcc-3.2.3/gcc/config/sh/linux.h	2003-05-11 00:13:51.833198672 -0400
@@ -76,7 +76,7 @@
    %{shared:-shared} \
    %{!static: \
      %{rdynamic:-export-dynamic} \
-     %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
+     %{!dynamic-linker:-dynamic-linker /stage1/lib/ld-linux.so.2} \
      %{!rpath:-rpath /lib}} \
    %{static:-static}"
 
diff -Naur gcc-3.2.3.orig/gcc/config/sparc/linux.h gcc-3.2.3/gcc/config/sparc/linux.h
--- gcc-3.2.3.orig/gcc/config/sparc/linux.h	2002-04-29 00:09:49.000000000 -0400
+++ gcc-3.2.3/gcc/config/sparc/linux.h	2003-05-11 00:14:45.117098288 -0400
@@ -158,7 +158,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/elf/ld-linux.so.1} \
+        %{!dynamic-linker:-dynamic-linker /stage1/lib/elf/ld-linux.so.1} \
         %{!rpath:-rpath /lib/elf/}} %{static:-static}}}"
 #else
 #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
@@ -166,7 +166,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
+        %{!dynamic-linker:-dynamic-linker /stage1/lib/ld-linux.so.1}} \
         %{static:-static}}}"
 #endif
 #else
@@ -176,7 +176,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+        %{!dynamic-linker:-dynamic-linker /stage1/lib/ld-linux.so.2}} \
         %{static:-static}}}"
 #endif
 
diff -Naur gcc-3.2.3.orig/gcc/config/sparc/linux64.h gcc-3.2.3/gcc/config/sparc/linux64.h
--- gcc-3.2.3.orig/gcc/config/sparc/linux64.h	2002-10-05 17:32:10.000000000 -0400
+++ gcc-3.2.3/gcc/config/sparc/linux64.h	2003-05-11 00:15:29.147404664 -0400
@@ -160,7 +160,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+        %{!dynamic-linker:-dynamic-linker /stage1/lib/ld-linux.so.2}} \
         %{static:-static}}} \
 "
 
@@ -169,7 +169,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
+        %{!dynamic-linker:-dynamic-linker /stage1/lib64/ld-linux.so.2}} \
         %{static:-static}}} \
 "
 
@@ -229,7 +229,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
+        %{!dynamic-linker:-dynamic-linker /stage1/lib64/ld-linux.so.2}} \
         %{static:-static}}} \
 %{mlittle-endian:-EL} \
 %{!mno-relax:%{!r:-relax}} \
diff -Naur gcc-3.2.3.orig/gcc/config/xtensa/linux.h gcc-3.2.3/gcc/config/xtensa/linux.h
--- gcc-3.2.3.orig/gcc/config/xtensa/linux.h	2002-04-15 16:27:46.000000000 -0400
+++ gcc-3.2.3/gcc/config/xtensa/linux.h	2003-05-11 00:16:15.534352776 -0400
@@ -46,7 +46,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
+        %{!dynamic-linker:-dynamic-linker /stage1/lib/ld.so.1}} \
       %{static:-static}}}"
 
 #undef CPP_PREDEFINES


More information about the lfs-dev mailing list