diff -Naur gcc-4.1.2-clean/gcc/config/alpha/linux-elf.h gcc-4.1.2-dirty/gcc/config/alpha/linux-elf.h --- gcc-4.1.2-clean/gcc/config/alpha/linux-elf.h 2007-07-05 18:42:18.341635739 +0900 +++ gcc-4.1.2-dirty/gcc/config/alpha/linux-elf.h 2007-07-05 18:53:25.031628236 +0900 @@ -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 "/build/lib/ld-linux.so.2" #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ %{O*:-O3} %{!O*:-O1} \ diff -Naur gcc-4.1.2-clean/gcc/config/arm/linux-elf.h gcc-4.1.2-dirty/gcc/config/arm/linux-elf.h --- gcc-4.1.2-clean/gcc/config/arm/linux-elf.h 2007-07-05 18:42:23.249915446 +0900 +++ gcc-4.1.2-dirty/gcc/config/arm/linux-elf.h 2007-07-05 18:53:37.672348590 +0900 @@ -59,7 +59,7 @@ %{shared:-shared} \ %{symbolic:-Bsymbolic} \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_TARGET_INTERPRETER "} \ + %{!dynamic-linker:-dynamic-linker /build/lib/ld-linux.so.2} \ -X \ %{mbig-endian:-EB}" \ SUBTARGET_EXTRA_LINK_SPEC diff -Naur gcc-4.1.2-clean/gcc/config/frv/linux.h gcc-4.1.2-dirty/gcc/config/frv/linux.h --- gcc-4.1.2-clean/gcc/config/frv/linux.h 2007-07-05 18:41:54.792293738 +0900 +++ gcc-4.1.2-dirty/gcc/config/frv/linux.h 2007-07-05 18:53:26.131690925 +0900 @@ -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 /build/lib/ld.so.1}} \ %{static}}" /* Support for compile-time default CPU. */ diff -Naur gcc-4.1.2-clean/gcc/config/i386/gnu.h gcc-4.1.2-dirty/gcc/config/i386/gnu.h --- gcc-4.1.2-clean/gcc/config/i386/gnu.h 2007-07-05 18:41:53.484219195 +0900 +++ gcc-4.1.2-dirty/gcc/config/i386/gnu.h 2007-07-05 18:53:30.215923672 +0900 @@ -27,7 +27,7 @@ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld.so}} \ + %{!dynamic-linker:-dynamic-linker /build/lib/ld.so}} \ %{static:-static}}" #undef STARTFILE_SPEC diff -Naur gcc-4.1.2-clean/gcc/config/i386/linux.h gcc-4.1.2-dirty/gcc/config/i386/linux.h --- gcc-4.1.2-clean/gcc/config/i386/linux.h 2007-07-05 18:41:52.280150579 +0900 +++ gcc-4.1.2-dirty/gcc/config/i386/linux.h 2007-07-05 18:53:28.719838415 +0900 @@ -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 "/build/lib/ld-linux.so.2" #undef SUBTARGET_EXTRA_SPECS #define SUBTARGET_EXTRA_SPECS \ diff -Naur gcc-4.1.2-clean/gcc/config/i386/linux64.h gcc-4.1.2-dirty/gcc/config/i386/linux64.h --- gcc-4.1.2-clean/gcc/config/i386/linux64.h 2007-07-05 18:41:52.604169044 +0900 +++ gcc-4.1.2-dirty/gcc/config/i386/linux64.h 2007-07-05 18:53:29.067858248 +0900 @@ -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 /build/lib/ld-linux.so.2}} \ + %{!m32:%{!dynamic-linker:-dynamic-linker /build/lib64/ld-linux-x86-64.so.2}}} \ %{static:-static}}" /* Similar to standard Linux, but adding -ffast-math support. */ diff -Naur gcc-4.1.2-clean/gcc/config/ia64/linux.h gcc-4.1.2-dirty/gcc/config/ia64/linux.h --- gcc-4.1.2-clean/gcc/config/ia64/linux.h 2007-07-05 18:41:51.060081052 +0900 +++ gcc-4.1.2-dirty/gcc/config/ia64/linux.h 2007-07-05 18:53:20.971396857 +0900 @@ -43,7 +43,7 @@ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \ + %{!dynamic-linker:-dynamic-linker /build/lib/ld-linux-ia64.so.2}} \ %{static:-static}}" #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" diff -Naur gcc-4.1.2-clean/gcc/config/linux.h gcc-4.1.2-dirty/gcc/config/linux.h --- gcc-4.1.2-clean/gcc/config/linux.h 2007-07-05 18:39:48.469094989 +0900 +++ gcc-4.1.2-dirty/gcc/config/linux.h 2007-07-05 18:51:22.392639439 +0900 @@ -104,3 +104,7 @@ #define TARGET_C99_FUNCTIONS 1 #define TARGET_POSIX_IO + +/* Remove /usr/include from the end of the include search path. */ +#undef STANDARD_INCLUDE_DIR +#define STANDARD_INCLUDE_DIR 0 \ No newline at end of file diff -Naur gcc-4.1.2-clean/gcc/config/m32r/linux.h gcc-4.1.2-dirty/gcc/config/m32r/linux.h --- gcc-4.1.2-clean/gcc/config/m32r/linux.h 2007-07-05 18:41:47.031851496 +0900 +++ gcc-4.1.2-dirty/gcc/config/m32r/linux.h 2007-07-05 18:53:18.327246175 +0900 @@ -66,7 +66,7 @@ %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \ + %{!dynamic-linker:-dynamic-linker /build/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 /build/lib/ld-linux.so.2}} \ %{static:-static}}}" #endif diff -Naur gcc-4.1.2-clean/gcc/config/m68k/linux.h gcc-4.1.2-dirty/gcc/config/m68k/linux.h --- gcc-4.1.2-clean/gcc/config/m68k/linux.h 2007-07-05 18:41:46.163802029 +0900 +++ gcc-4.1.2-dirty/gcc/config/m68k/linux.h 2007-07-05 18:53:13.498971028 +0900 @@ -128,7 +128,7 @@ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \ + %{!dynamic-linker*:-dynamic-linker /build/lib/ld.so.1}} \ %{static}}" /* For compatibility with linux/a.out */ diff -Naur gcc-4.1.2-clean/gcc/config/mips/linux.h gcc-4.1.2-dirty/gcc/config/mips/linux.h --- gcc-4.1.2-clean/gcc/config/mips/linux.h 2007-07-05 18:41:49.644000354 +0900 +++ gcc-4.1.2-dirty/gcc/config/mips/linux.h 2007-07-05 18:53:22.343475047 +0900 @@ -112,7 +112,7 @@ %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \ + %{!dynamic-linker:-dynamic-linker /build/lib/ld.so.1}} \ %{static:-static}}}" #undef SUBTARGET_ASM_SPEC diff -Naur gcc-4.1.2-clean/gcc/config/mips/linux64.h gcc-4.1.2-dirty/gcc/config/mips/linux64.h --- gcc-4.1.2-clean/gcc/config/mips/linux64.h 2007-07-05 18:41:49.676002177 +0900 +++ gcc-4.1.2-dirty/gcc/config/mips/linux64.h 2007-07-05 18:53:22.383477327 +0900 @@ -47,9 +47,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 /build/lib32/ld.so.1} \ + %{mabi=64: -dynamic-linker /build/lib64/ld.so.1} \ + %{mabi=32: -dynamic-linker /build/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-4.1.2-clean/gcc/config/mn10300/linux.h gcc-4.1.2-dirty/gcc/config/mn10300/linux.h --- gcc-4.1.2-clean/gcc/config/mn10300/linux.h 2007-07-05 18:41:49.003963880 +0900 +++ gcc-4.1.2-dirty/gcc/config/mn10300/linux.h 2007-07-05 18:53:20.147349897 +0900 @@ -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 /build/lib/ld.so.1}} \ %{static:-static}" #undef PROCESSOR_DEFAULT diff -Naur gcc-4.1.2-clean/gcc/config/pa/pa-linux.h gcc-4.1.2-dirty/gcc/config/pa/pa-linux.h --- gcc-4.1.2-clean/gcc/config/pa/pa-linux.h 2007-07-05 18:41:47.975905294 +0900 +++ gcc-4.1.2-dirty/gcc/config/pa/pa-linux.h 2007-07-05 18:53:15.407079765 +0900 @@ -55,7 +55,7 @@ %{!shared: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \ + %{!dynamic-linker:-dynamic-linker /build/lib/ld.so.1}} \ %{static:-static}}" /* glibc's profiling functions don't need gcc to allocate counters. */ diff -Naur gcc-4.1.2-clean/gcc/config/rs6000/linux64.h gcc-4.1.2-dirty/gcc/config/rs6000/linux64.h --- gcc-4.1.2-clean/gcc/config/rs6000/linux64.h 2007-07-05 18:42:19.073677455 +0900 +++ gcc-4.1.2-dirty/gcc/config/rs6000/linux64.h 2007-07-05 18:53:31.708008702 +0900 @@ -339,11 +339,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 /build/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 /build/lib64/ld64.so.1}}}" #undef TOC_SECTION_ASM_OP #define TOC_SECTION_ASM_OP \ diff -Naur gcc-4.1.2-clean/gcc/config/rs6000/sysv4.h gcc-4.1.2-dirty/gcc/config/rs6000/sysv4.h --- gcc-4.1.2-clean/gcc/config/rs6000/sysv4.h 2007-07-05 18:42:18.981672212 +0900 +++ gcc-4.1.2-dirty/gcc/config/rs6000/sysv4.h 2007-07-05 18:53:31.628004142 +0900 @@ -1041,7 +1041,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 /build/lib/ld.so.1}}}" #if defined(HAVE_LD_EH_FRAME_HDR) # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} " @@ -1072,7 +1072,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 /build/lib/ld.so.1}}}" #define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__ \ %{!undef: \ diff -Naur gcc-4.1.2-clean/gcc/config/s390/linux.h gcc-4.1.2-dirty/gcc/config/s390/linux.h --- gcc-4.1.2-clean/gcc/config/s390/linux.h 2007-07-05 18:41:54.172258404 +0900 +++ gcc-4.1.2-dirty/gcc/config/s390/linux.h 2007-07-05 18:53:20.327360155 +0900 @@ -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 /build/lib/ld.so.1} \ + %{m64:-dynamic-linker /build/lib/ld64.so.1}}}}" #define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" diff -Naur gcc-4.1.2-clean/gcc/config/sh/linux.h gcc-4.1.2-dirty/gcc/config/sh/linux.h --- gcc-4.1.2-clean/gcc/config/sh/linux.h 2007-07-05 18:41:57.660457186 +0900 +++ gcc-4.1.2-dirty/gcc/config/sh/linux.h 2007-07-05 18:53:39.236437722 +0900 @@ -60,7 +60,7 @@ "%{shared:-shared} \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \ + %{!dynamic-linker:-dynamic-linker /build/lib/ld-linux.so.2}} \ %{static:-static}" /* Output assembler code to STREAM to call the profiler. */ diff -Naur gcc-4.1.2-clean/gcc/config/sparc/linux.h gcc-4.1.2-dirty/gcc/config/sparc/linux.h --- gcc-4.1.2-clean/gcc/config/sparc/linux.h 2007-07-05 18:41:43.971677106 +0900 +++ gcc-4.1.2-dirty/gcc/config/sparc/linux.h 2007-07-05 18:53:11.042831060 +0900 @@ -126,13 +126,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,/build/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 /build/lib/ld-linux.so.2}} \ %{static:-static}}}" /* The sun bundled assembler doesn't accept -Yd, (and neither does gas). diff -Naur gcc-4.1.2-clean/gcc/config/sparc/linux64.h gcc-4.1.2-dirty/gcc/config/sparc/linux64.h --- gcc-4.1.2-clean/gcc/config/sparc/linux64.h 2007-07-05 18:41:44.031680526 +0900 +++ gcc-4.1.2-dirty/gcc/config/sparc/linux64.h 2007-07-05 18:53:11.102834480 +0900 @@ -162,21 +162,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,/build/lib %{shared:-shared} \ %{!shared: \ %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \ + %{!dynamic-linker:-dynamic-linker /build/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,/build/lib64 %{shared:-shared} \ %{!shared: \ %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \ + %{!dynamic-linker:-dynamic-linker /build/lib64/ld-linux.so.2}} \ %{static:-static}}} \ " @@ -252,12 +252,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,/build/lib64 %{shared:-shared} \ %{!shared: \ %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \ + %{!dynamic-linker:-dynamic-linker /build/lib64/ld-linux.so.2}} \ %{static:-static}}} \ %{mlittle-endian:-EL} \ %{!mno-relax:%{!r:-relax}} \ diff -Naur gcc-4.1.2-clean/gcc/config/xtensa/linux.h gcc-4.1.2-dirty/gcc/config/xtensa/linux.h --- gcc-4.1.2-clean/gcc/config/xtensa/linux.h 2007-07-05 18:41:44.951732957 +0900 +++ gcc-4.1.2-dirty/gcc/config/xtensa/linux.h 2007-07-05 18:53:11.754871637 +0900 @@ -50,7 +50,7 @@ %{!ibcs: \ %{!static: \ %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \ + %{!dynamic-linker:-dynamic-linker /build/lib/ld.so.1}} \ %{static:-static}}}" #undef LOCAL_LABEL_PREFIX