Hi

(first post to LFS devel mainling list, tell me if it is incoherent)

I saw the development book still use gcc 4.1.2, and the latest gcc is
4.2.1, so I'm beginning an update to this version. Included a patch
file for the gcc pass2 in chapter 5 (I didn't check if platforms were
included or removed). The newest gcc isn't tested yet in an LFS build
(I'm checking all packages versions, but I guess this one could be of
interest for you).

The main difference in build process since the 4.2.x series is that
the bootstrap method is now implicit, thus in gcc pass1 of chapter 5
don't do 'make bootstrap' but only 'make'. For other passes, use
'--disable-bootstrap' with configure.

Comments welcome

-- 
Richard 'riri' GILL
jabber: [EMAIL PROTECTED]
http://riri.houbathecat.info
http://nasgaia.org
« Frimousse en excessivité émousse son expressivité »
diff -Naur gcc-4.2.1.orig/gcc/config/alpha/linux-elf.h gcc-4.2.1/gcc/config/alpha/linux-elf.h
--- gcc-4.2.1.orig/gcc/config/alpha/linux-elf.h	2007-08-22 15:03:45.000000000 +0200
+++ gcc-4.2.1/gcc/config/alpha/linux-elf.h	2007-08-22 15:08:24.000000000 +0200
@@ -28,7 +28,7 @@
 #define SUBTARGET_EXTRA_SPECS \
 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
 
-#define GLIBC_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER	"/tools/lib/ld-linux.so.2"
 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
 #if UCLIBC_DEFAULT
 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
diff -Naur gcc-4.2.1.orig/gcc/config/arm/linux-elf.h gcc-4.2.1/gcc/config/arm/linux-elf.h
--- gcc-4.2.1.orig/gcc/config/arm/linux-elf.h	2007-08-22 15:03:47.000000000 +0200
+++ gcc-4.2.1/gcc/config/arm/linux-elf.h	2007-08-22 15:09:58.000000000 +0200
@@ -51,7 +51,7 @@
 
 #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{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*} %{version:-v} \
    %{b} \
diff -Naur gcc-4.2.1.orig/gcc/config/frv/linux.h gcc-4.2.1/gcc/config/frv/linux.h
--- gcc-4.2.1.orig/gcc/config/frv/linux.h	2007-08-22 15:03:45.000000000 +0200
+++ gcc-4.2.1/gcc/config/frv/linux.h	2007-08-22 15:11:05.000000000 +0200
@@ -36,7 +36,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.2.1.orig/gcc/config/i386/linux64.h gcc-4.2.1/gcc/config/i386/linux64.h
--- gcc-4.2.1.orig/gcc/config/i386/linux64.h	2007-08-22 15:03:46.000000000 +0200
+++ gcc-4.2.1/gcc/config/i386/linux64.h	2007-08-22 15:12:23.000000000 +0200
@@ -49,8 +49,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-x86-64.so.2"
+#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux-x86-64.so.2"
 
 #undef	LINK_SPEC
 #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
diff -Naur gcc-4.2.1.orig/gcc/config/i386/linux.h gcc-4.2.1/gcc/config/i386/linux.h
--- gcc-4.2.1.orig/gcc/config/i386/linux.h	2007-08-22 15:03:45.000000000 +0200
+++ gcc-4.2.1/gcc/config/i386/linux.h	2007-08-22 15:11:28.000000000 +0200
@@ -101,7 +101,7 @@
 
 /* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
 #define LINK_EMULATION "elf_i386"
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
 
 #undef  SUBTARGET_EXTRA_SPECS
 #define SUBTARGET_EXTRA_SPECS \
diff -Naur gcc-4.2.1.orig/gcc/config/ia64/linux.h gcc-4.2.1/gcc/config/ia64/linux.h
--- gcc-4.2.1.orig/gcc/config/ia64/linux.h	2007-08-22 15:03:46.000000000 +0200
+++ gcc-4.2.1/gcc/config/ia64/linux.h	2007-08-22 15:12:45.000000000 +0200
@@ -37,7 +37,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.2.1.orig/gcc/config/linux.h gcc-4.2.1/gcc/config/linux.h
--- gcc-4.2.1.orig/gcc/config/linux.h	2007-08-22 15:03:45.000000000 +0200
+++ gcc-4.2.1/gcc/config/linux.h	2007-08-22 15:14:01.000000000 +0200
@@ -127,3 +127,7 @@
 #define TARGET_C99_FUNCTIONS (OPTION_GLIBC)
 
 #define TARGET_POSIX_IO
+
+/* Remove /usr/include from the end of the include search path.  */
+#undef STANDARD_INCLUDE_DIR
+#define STANDARD_INCLUDE_DIR 0
diff -Naur gcc-4.2.1.orig/gcc/config/m32r/linux.h gcc-4.2.1/gcc/config/m32r/linux.h
--- gcc-4.2.1.orig/gcc/config/m32r/linux.h	2007-08-22 15:03:45.000000000 +0200
+++ gcc-4.2.1/gcc/config/m32r/linux.h	2007-08-22 15:14:28.000000000 +0200
@@ -59,7 +59,7 @@
 
 /* If ELF is the default format, we should not use /lib/elf.  */
 
-#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
 
 #undef	LINK_SPEC
 #if TARGET_LITTLE_ENDIAN
diff -Naur gcc-4.2.1.orig/gcc/config/m68k/linux.h gcc-4.2.1/gcc/config/m68k/linux.h
--- gcc-4.2.1.orig/gcc/config/m68k/linux.h	2007-08-22 15:03:47.000000000 +0200
+++ gcc-4.2.1/gcc/config/m68k/linux.h	2007-08-22 15:15:24.000000000 +0200
@@ -123,7 +123,7 @@
 
 /* If ELF is the default format, we should not use /lib/elf.  */
 
-#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.2.1.orig/gcc/config/mips/linux64.h gcc-4.2.1/gcc/config/mips/linux64.h
--- gcc-4.2.1.orig/gcc/config/mips/linux64.h	2007-08-22 15:03:48.000000000 +0200
+++ gcc-4.2.1/gcc/config/mips/linux64.h	2007-08-22 15:16:06.000000000 +0200
@@ -36,10 +36,10 @@
 %{!shared: %{pthread:-lpthread} \
   %{profile:-lc_p} %{!profile: -lc}}"
 
-#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 LINUX_DYNAMIC_LINKERN32 \
   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
 
diff -Naur gcc-4.2.1.orig/gcc/config/mips/linux.h gcc-4.2.1/gcc/config/mips/linux.h
--- gcc-4.2.1.orig/gcc/config/mips/linux.h	2007-08-22 15:03:48.000000000 +0200
+++ gcc-4.2.1/gcc/config/mips/linux.h	2007-08-22 15:15:37.000000000 +0200
@@ -104,7 +104,7 @@
 #undef MIPS_DEFAULT_GVALUE
 #define MIPS_DEFAULT_GVALUE 0
 
-#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
 
 /* Borrowed from sparc/linux.h */
 #undef LINK_SPEC
diff -Naur gcc-4.2.1.orig/gcc/config/mn10300/linux.h gcc-4.2.1/gcc/config/mn10300/linux.h
--- gcc-4.2.1.orig/gcc/config/mn10300/linux.h	2007-08-22 15:03:46.000000000 +0200
+++ gcc-4.2.1/gcc/config/mn10300/linux.h	2007-08-22 15:16:23.000000000 +0200
@@ -33,7 +33,7 @@
 #undef  ASM_SPEC
 #define ASM_SPEC "%{Wa,*:%*}"
 
-#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.2.1.orig/gcc/config/pa/pa-linux.h gcc-4.2.1/gcc/config/pa/pa-linux.h
--- gcc-4.2.1.orig/gcc/config/pa/pa-linux.h	2007-08-22 15:03:47.000000000 +0200
+++ gcc-4.2.1/gcc/config/pa/pa-linux.h	2007-08-22 15:16:48.000000000 +0200
@@ -45,7 +45,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.2.1.orig/gcc/config/rs6000/linux64.h gcc-4.2.1/gcc/config/rs6000/linux64.h
--- gcc-4.2.1.orig/gcc/config/rs6000/linux64.h	2007-08-22 15:03:47.000000000 +0200
+++ gcc-4.2.1/gcc/config/rs6000/linux64.h	2007-08-22 15:17:26.000000000 +0200
@@ -336,10 +336,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 UCLIBC_DEFAULT
 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
 #else
diff -Naur gcc-4.2.1.orig/gcc/config/rs6000/sysv4.h gcc-4.2.1/gcc/config/rs6000/sysv4.h
--- gcc-4.2.1.orig/gcc/config/rs6000/sysv4.h	2007-08-22 15:03:47.000000000 +0200
+++ gcc-4.2.1/gcc/config/rs6000/sysv4.h	2007-08-22 15:18:41.000000000 +0200
@@ -892,8 +892,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 UCLIBC_DEFAULT
 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
 #else
@@ -935,7 +935,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-4.2.1.orig/gcc/config/s390/linux.h gcc-4.2.1/gcc/config/s390/linux.h
--- gcc-4.2.1.orig/gcc/config/s390/linux.h	2007-08-22 15:03:45.000000000 +0200
+++ gcc-4.2.1/gcc/config/s390/linux.h	2007-08-22 15:19:25.000000000 +0200
@@ -73,8 +73,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/lib/ld.so.1"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
 
 #undef  LINK_SPEC
 #define LINK_SPEC \
diff -Naur gcc-4.2.1.orig/gcc/config/sh/linux.h gcc-4.2.1/gcc/config/sh/linux.h
--- gcc-4.2.1.orig/gcc/config/sh/linux.h	2007-08-22 15:03:46.000000000 +0200
+++ gcc-4.2.1/gcc/config/sh/linux.h	2007-08-22 15:19:44.000000000 +0200
@@ -48,7 +48,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.2.1.orig/gcc/config/sparc/linux64.h gcc-4.2.1/gcc/config/sparc/linux64.h
--- gcc-4.2.1.orig/gcc/config/sparc/linux64.h	2007-08-22 15:03:45.000000000 +0200
+++ gcc-4.2.1/gcc/config/sparc/linux64.h	2007-08-22 15:20:25.000000000 +0200
@@ -144,10 +144,10 @@
 
 /* If ELF is the default format, we should not use /lib/elf.  */
 
-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
-#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-linux.so.2"
+#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
+#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
+#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
 #if UCLIBC_DEFAULT
 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
 #else
diff -Naur gcc-4.2.1.orig/gcc/config/sparc/linux.h gcc-4.2.1/gcc/config/sparc/linux.h
--- gcc-4.2.1.orig/gcc/config/sparc/linux.h	2007-08-22 15:03:45.000000000 +0200
+++ gcc-4.2.1/gcc/config/sparc/linux.h	2007-08-22 15:20:08.000000000 +0200
@@ -121,8 +121,8 @@
 
 /* If ELF is the default format, we should not use /lib/elf.  */
 
-#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 UCLIBC_DEFAULT
 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
 #else
diff -Naur gcc-4.2.1.orig/gcc/config/xtensa/linux.h gcc-4.2.1/gcc/config/xtensa/linux.h
--- gcc-4.2.1.orig/gcc/config/xtensa/linux.h	2007-08-22 15:03:46.000000000 +0200
+++ gcc-4.2.1/gcc/config/xtensa/linux.h	2007-08-22 15:21:07.000000000 +0200
@@ -43,7 +43,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 \
-- 
http://linuxfromscratch.org/mailman/listinfo/lfs-dev
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page

Reply via email to