yann@339: diff -durN gcc-3.4.6.orig/boehm-gc/configure gcc-3.4.6/boehm-gc/configure
yann@339: --- gcc-3.4.6.orig/boehm-gc/configure	2006-03-06 04:55:49.000000000 +0100
yann@339: +++ gcc-3.4.6/boehm-gc/configure	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -1947,6 +1947,11 @@
yann@339:    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
yann@339:    ;;
yann@339:  
yann@339: +linux-uclibc*)
yann@339: +  lt_cv_deplibs_check_method=pass_all
yann@339: +  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
yann@339: +  ;;
yann@339: +
yann@339:  netbsd*)
yann@339:    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
yann@339:      lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'
yann@339: diff -durN gcc-3.4.6.orig/boehm-gc/ltconfig gcc-3.4.6/boehm-gc/ltconfig
yann@339: --- gcc-3.4.6.orig/boehm-gc/ltconfig	2002-11-20 16:59:07.000000000 +0100
yann@339: +++ gcc-3.4.6/boehm-gc/ltconfig	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -1981,6 +1981,23 @@
yann@339:    fi
yann@339:    ;;
yann@339:  
yann@339: +linux-uclibc*)
yann@339: +  version_type=linux
yann@339: +  need_lib_prefix=no
yann@339: +  need_version=no
yann@339: +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
yann@339: +  soname_spec='${libname}${release}.so$major'
yann@339: +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
yann@339: +  shlibpath_var=LD_LIBRARY_PATH
yann@339: +  shlibpath_overrides_runpath=no
yann@339: +  deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
yann@339: +  file_magic_cmd=/usr/bin/file
yann@339: +  file_magic_test_file=`echo /lib/libuClibc-*.so`
yann@339: +
yann@339: +  # Assume using the uClibc dynamic linker.
yann@339: +  dynamic_linker="uClibc ld.so"
yann@339: +  ;;
yann@339: +
yann@339:  netbsd*)
yann@339:    version_type=sunos
yann@339:    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/alpha/linux-elf.h gcc-3.4.6/gcc/config/alpha/linux-elf.h
yann@339: --- gcc-3.4.6.orig/gcc/config/alpha/linux-elf.h	2003-09-27 06:48:30.000000000 +0200
yann@339: +++ gcc-3.4.6/gcc/config/alpha/linux-elf.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -27,7 +27,11 @@
yann@339:  #define SUBTARGET_EXTRA_SPECS \
yann@339:  { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
yann@339:  
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER	"/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339:  #define ELF_DYNAMIC_LINKER	"/lib/ld-linux.so.2"
yann@339: +#endif
yann@339:  
yann@339:  #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}		\
yann@339:    %{O*:-O3} %{!O*:-O1}						\
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/arm/linux-elf.h gcc-3.4.6/gcc/config/arm/linux-elf.h
yann@339: --- gcc-3.4.6.orig/gcc/config/arm/linux-elf.h	2004-01-31 07:18:40.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/arm/linux-elf.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -80,6 +80,11 @@
yann@339:  #define ENDFILE_SPEC \
yann@339:    "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"
yann@339:  
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
yann@339: +#endif
yann@339:  #undef  LINK_SPEC
yann@339:  #define LINK_SPEC "%{h*} %{version:-v} \
yann@339:     %{b} %{Wl,*:%*} \
yann@339: @@ -87,7 +92,7 @@
yann@339:     %{shared:-shared} \
yann@339:     %{symbolic:-Bsymbolic} \
yann@339:     %{rdynamic:-export-dynamic} \
yann@339: -   %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2} \
yann@339: +   %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "} \
yann@339:     -X \
yann@339:     %{mbig-endian:-EB}" \
yann@339:     SUBTARGET_EXTRA_LINK_SPEC
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/cris/linux.h gcc-3.4.6/gcc/config/cris/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/cris/linux.h	2003-11-29 04:08:13.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/cris/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -79,6 +79,25 @@
yann@339:  #undef CRIS_DEFAULT_CPU_VERSION
yann@339:  #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
yann@339:  
yann@339: +#ifdef USE_UCLIBC
yann@339: +
yann@339: +#undef CRIS_SUBTARGET_VERSION
yann@339: +#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
yann@339: +
yann@339: +#undef CRIS_LINK_SUBTARGET_SPEC
yann@339: +#define CRIS_LINK_SUBTARGET_SPEC \
yann@339: + "-mcrislinux\
yann@339: +  -rpath-link include/asm/../..%s\
yann@339: +  %{shared} %{static}\
yann@339: +  %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
yann@339: +  %{!shared: \
yann@339: +    %{!static: \
yann@339: +      %{rdynamic:-export-dynamic} \
yann@339: +      %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
yann@339: +  %{!r:%{O2|O3: --gc-sections}}"
yann@339: +
yann@339: +#else  /* USE_UCLIBC */
yann@339: +
yann@339:  #undef CRIS_SUBTARGET_VERSION
yann@339:  #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
yann@339:  
yann@339: @@ -93,6 +112,8 @@
yann@339:    %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
yann@339:    %{!r:%{O2|O3: --gc-sections}}"
yann@339:  
yann@339: +#endif  /* USE_UCLIBC */
yann@339: +
yann@339:  
yann@339:  /* Node: Run-time Target */
yann@339:  
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/i386/linux64.h gcc-3.4.6/gcc/config/i386/linux64.h
yann@339: --- gcc-3.4.6.orig/gcc/config/i386/linux64.h	2003-11-29 04:08:13.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/i386/linux64.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -54,14 +54,21 @@
yann@339:     When the -shared link option is used a final link is not being
yann@339:     done.  */
yann@339:  
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF32_DYNAMIC_LINKER "/lib/ld-linux.so.2"
yann@339: +#define ELF64_DYNAMIC_LINKER "/lib64/ld-linux-x86-64.so.2"
yann@339: +#endif
yann@339:  #undef	LINK_SPEC
yann@339:  #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
yann@339:    %{shared:-shared} \
yann@339:    %{!shared: \
yann@339:      %{!static: \
yann@339:        %{rdynamic:-export-dynamic} \
yann@339: -      %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
yann@339: -      %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
yann@339: +      %{m32:%{!dynamic-linker:-dynamic-linker " ELF32_DYNAMIC_LINKER "}} \
yann@339: +      %{!m32:%{!dynamic-linker:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}} \
yann@339:      %{static:-static}}"
yann@339:  
yann@339:  #define MULTILIB_DEFAULTS { "m64" }
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/i386/linux.h gcc-3.4.6/gcc/config/i386/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/i386/linux.h	2003-11-29 04:08:13.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/i386/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -110,22 +110,21 @@
yann@339:  
yann@339:  #undef	LINK_SPEC
yann@339:  #ifdef USE_GNULIBC_1
yann@339: -#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
yann@339: -  %{!shared: \
yann@339: -    %{!ibcs: \
yann@339: -      %{!static: \
yann@339: -	%{rdynamic:-export-dynamic} \
yann@339: -	%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
yann@339: -	%{static:-static}}}"
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.1"
yann@339:  #else
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
yann@339: +#endif
yann@339: +#endif
yann@339:  #define LINK_SPEC "-m elf_i386 %{shared:-shared} \
yann@339:    %{!shared: \
yann@339:      %{!ibcs: \
yann@339:        %{!static: \
yann@339:  	%{rdynamic:-export-dynamic} \
yann@339: -	%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
yann@339: +	%{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
yann@339:  	%{static:-static}}}"
yann@339: -#endif
yann@339:  
yann@339:  /* A C statement (sans semicolon) to output to the stdio stream
yann@339:     FILE the assembler definition of uninitialized global DECL named
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/ia64/linux.h gcc-3.4.6/gcc/config/ia64/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/ia64/linux.h	2004-02-07 08:56:17.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/ia64/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -37,13 +37,18 @@
yann@339:  /* Define this for shared library support because it isn't in the main
yann@339:     linux.h file.  */
yann@339:  
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER	"/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
yann@339: +#endif
yann@339:  #undef LINK_SPEC
yann@339:  #define LINK_SPEC "\
yann@339:    %{shared:-shared} \
yann@339:    %{!shared: \
yann@339:      %{!static: \
yann@339:        %{rdynamic:-export-dynamic} \
yann@339: -      %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
yann@339: +      %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
yann@339:        %{static:-static}}"
yann@339:  
yann@339:  
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/m68k/linux.h gcc-3.4.6/gcc/config/m68k/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/m68k/linux.h	2003-11-29 04:08:13.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/m68k/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -131,12 +131,17 @@
yann@339:  
yann@339:  /* If ELF is the default format, we should not use /lib/elf.  */
yann@339:  
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
yann@339: +#endif
yann@339:  #undef	LINK_SPEC
yann@339:  #define LINK_SPEC "-m m68kelf %{shared} \
yann@339:    %{!shared: \
yann@339:      %{!static: \
yann@339:        %{rdynamic:-export-dynamic} \
yann@339: -      %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
yann@339: +      %{!dynamic-linker*:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
yann@339:      %{static}}"
yann@339:  
yann@339:  /* For compatibility with linux/a.out */
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/mips/linux.h gcc-3.4.6/gcc/config/mips/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/mips/linux.h	2004-06-16 03:42:25.000000000 +0200
yann@339: +++ gcc-3.4.6/gcc/config/mips/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -109,6 +109,11 @@
yann@339:  
yann@339:  /* Borrowed from sparc/linux.h */
yann@339:  #undef LINK_SPEC
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
yann@339: +#endif
yann@339:  #define LINK_SPEC \
yann@339:   "%(endian_spec) \
yann@339:    %{shared:-shared} \
yann@339: @@ -116,7 +121,7 @@
yann@339:      %{!ibcs: \
yann@339:        %{!static: \
yann@339:          %{rdynamic:-export-dynamic} \
yann@339: -        %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
yann@339: +        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
yann@339:          %{static:-static}}}"
yann@339:  
yann@339:  #undef SUBTARGET_ASM_SPEC
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/pa/pa-linux.h gcc-3.4.6/gcc/config/pa/pa-linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/pa/pa-linux.h	2003-11-29 04:08:13.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/pa/pa-linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -77,13 +77,18 @@
yann@339:  /* Define this for shared library support because it isn't in the main
yann@339:     linux.h file.  */
yann@339:  
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
yann@339: +#endif
yann@339:  #undef LINK_SPEC
yann@339:  #define LINK_SPEC "\
yann@339:    %{shared:-shared} \
yann@339:    %{!shared: \
yann@339:      %{!static: \
yann@339:        %{rdynamic:-export-dynamic} \
yann@339: -      %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
yann@339: +      %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
yann@339:        %{static:-static}}"
yann@339:  
yann@339:  /* glibc's profiling functions don't need gcc to allocate counters.  */
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/rs6000/linux.h gcc-3.4.6/gcc/config/rs6000/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/rs6000/linux.h	2005-03-17 11:41:18.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/rs6000/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -69,7 +69,11 @@
yann@339:  #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
yann@339:  
yann@339:  #undef	LINK_OS_DEFAULT_SPEC
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
yann@339: +#else
yann@339:  #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
yann@339: +#endif
yann@339:  
yann@339:  #define LINK_GCC_C_SEQUENCE_SPEC \
yann@339:    "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/rs6000/sysv4.h gcc-3.4.6/gcc/config/rs6000/sysv4.h
yann@339: --- gcc-3.4.6.orig/gcc/config/rs6000/sysv4.h	2005-10-30 00:35:37.000000000 +0200
yann@339: +++ gcc-3.4.6/gcc/config/rs6000/sysv4.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -949,6 +949,7 @@
yann@339:    mcall-linux  : %(link_os_linux)       ; \
yann@339:    mcall-gnu    : %(link_os_gnu)         ; \
yann@339:    mcall-netbsd : %(link_os_netbsd)      ; \
yann@339: +  mcall-linux-uclibc : %(link_os_linux_uclibc); \
yann@339:    mcall-openbsd: %(link_os_openbsd)     ; \
yann@339:                 : %(link_os_default)     }"
yann@339:  
yann@339: @@ -1127,6 +1128,10 @@
yann@339:    %{rdynamic:-export-dynamic} \
yann@339:    %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
yann@339:  
yann@339: +#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
yann@339: +  %{rdynamic:-export-dynamic} \
yann@339: +  %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
yann@339: +
yann@339:  #if defined(HAVE_LD_EH_FRAME_HDR)
yann@339:  # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
yann@339:  #endif
yann@339: @@ -1293,6 +1298,7 @@
yann@339:    { "link_os_sim",		LINK_OS_SIM_SPEC },			\
yann@339:    { "link_os_freebsd",		LINK_OS_FREEBSD_SPEC },			\
yann@339:    { "link_os_linux",		LINK_OS_LINUX_SPEC },			\
yann@339: +  { "link_os_linux_uclibc",	LINK_OS_LINUX_UCLIBC_SPEC },		\
yann@339:    { "link_os_gnu",		LINK_OS_GNU_SPEC },			\
yann@339:    { "link_os_netbsd",		LINK_OS_NETBSD_SPEC },			\
yann@339:    { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/s390/linux.h gcc-3.4.6/gcc/config/s390/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/s390/linux.h	2003-11-29 04:08:13.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/s390/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -77,6 +77,13 @@
yann@339:  #define MULTILIB_DEFAULTS { "m31" }
yann@339:  #endif
yann@339:  
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF31_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF31_DYNAMIC_LINKER "/lib/ld.so.1"
yann@339: +#define ELF64_DYNAMIC_LINKER "/lib/ld64.so.1"
yann@339: +#endif
yann@339:  #undef  LINK_SPEC
yann@339:  #define LINK_SPEC \
yann@339:    "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
yann@339: @@ -86,8 +93,8 @@
yann@339:        %{!static: \
yann@339:  	%{rdynamic:-export-dynamic} \
yann@339:  	%{!dynamic-linker: \
yann@339: -          %{m31:-dynamic-linker /lib/ld.so.1} \
yann@339: -          %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
yann@339: +          %{m31:-dynamic-linker " ELF31_DYNAMIC_LINKER "} \
yann@339: +          %{m64:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}}}"
yann@339:  
yann@339:  
yann@339:  #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/sh/linux.h gcc-3.4.6/gcc/config/sh/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/sh/linux.h	2004-01-12 03:29:13.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/sh/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -73,11 +73,16 @@
yann@339:  #undef SUBTARGET_LINK_EMUL_SUFFIX
yann@339:  #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
yann@339:  #undef SUBTARGET_LINK_SPEC
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
yann@339: +#endif
yann@339:  #define SUBTARGET_LINK_SPEC \
yann@339:    "%{shared:-shared} \
yann@339:     %{!static: \
yann@339:       %{rdynamic:-export-dynamic} \
yann@339: -     %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
yann@339: +     %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
yann@339:     %{static:-static}"
yann@339:  
yann@339:  #undef LIB_SPEC
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/sparc/linux64.h gcc-3.4.6/gcc/config/sparc/linux64.h
yann@339: --- gcc-3.4.6.orig/gcc/config/sparc/linux64.h	2004-06-06 05:55:17.000000000 +0200
yann@339: +++ gcc-3.4.6/gcc/config/sparc/linux64.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -167,12 +167,17 @@
yann@339:    { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },	  \
yann@339:    { "link_arch",	 LINK_ARCH_SPEC },
yann@339:      
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER	"/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER  "/lib/ld-linux.so.2"
yann@339: +#endif
yann@339:  #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
yann@339:    %{!shared: \
yann@339:      %{!ibcs: \
yann@339:        %{!static: \
yann@339:          %{rdynamic:-export-dynamic} \
yann@339: -        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
yann@339: +        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
yann@339:          %{static:-static}}} \
yann@339:  "
yann@339:  
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/sparc/linux.h gcc-3.4.6/gcc/config/sparc/linux.h
yann@339: --- gcc-3.4.6.orig/gcc/config/sparc/linux.h	2004-06-06 05:55:17.000000000 +0200
yann@339: +++ gcc-3.4.6/gcc/config/sparc/linux.h	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -162,13 +162,18 @@
yann@339:          %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.1}} \
yann@339:          %{static:-static}}}"
yann@339:  #else
yann@339: +#ifdef USE_UCLIBC
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
yann@339: +#else
yann@339: +#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
yann@339: +#endif
yann@339:  #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
yann@339:    %{!mno-relax:%{!r:-relax}} \
yann@339:    %{!shared: \
yann@339:      %{!ibcs: \
yann@339:        %{!static: \
yann@339:          %{rdynamic:-export-dynamic} \
yann@339: -        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
yann@339: +        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
yann@339:          %{static:-static}}}"
yann@339:  #endif
yann@339:  
yann@339: diff -durN gcc-3.4.6.orig/gcc/config/t-linux-uclibc gcc-3.4.6/gcc/config/t-linux-uclibc
yann@339: --- gcc-3.4.6.orig/gcc/config/t-linux-uclibc	1970-01-01 01:00:00.000000000 +0100
yann@339: +++ gcc-3.4.6/gcc/config/t-linux-uclibc	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -0,0 +1,5 @@
yann@339: +# Remove glibc specific files added in t-linux
yann@339: +SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
yann@339: +
yann@339: +# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
yann@339: +LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
yann@339: diff -durN gcc-3.4.6.orig/gcc/config.gcc gcc-3.4.6/gcc/config.gcc
yann@339: --- gcc-3.4.6.orig/gcc/config.gcc	2005-07-19 23:08:48.000000000 +0200
yann@339: +++ gcc-3.4.6/gcc/config.gcc	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -2322,6 +2322,12 @@
yann@339:  	;;
yann@339:  esac
yann@339:  
yann@339: +# Rather than hook into each target, just do it after all the linux
yann@339: +# targets have been processed
yann@339: +case ${target} in
yann@339: +*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
yann@339: +esac
yann@339: +
yann@339:  # Support for --with-cpu and related options (and a few unrelated options,
yann@339:  # too).
yann@339:  case ${with_cpu} in
yann@339: diff -durN gcc-3.4.6.orig/libtool.m4 gcc-3.4.6/libtool.m4
yann@339: --- gcc-3.4.6.orig/libtool.m4	2004-05-18 11:09:14.000000000 +0200
yann@339: +++ gcc-3.4.6/libtool.m4	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -689,6 +689,11 @@
yann@339:    lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
yann@339:    ;;
yann@339:  
yann@339: +linux-uclibc*)
yann@339: +  lt_cv_deplibs_check_method=pass_all
yann@339: +  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
yann@339: +  ;;
yann@339: +
yann@339:  netbsd*)
yann@339:    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
yann@339:      [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']
yann@339: diff -durN gcc-3.4.6.orig/ltconfig gcc-3.4.6/ltconfig
yann@339: --- gcc-3.4.6.orig/ltconfig	2004-03-05 22:05:41.000000000 +0100
yann@339: +++ gcc-3.4.6/ltconfig	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -602,6 +602,7 @@
yann@339:  
yann@339:  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
yann@339:  case $host_os in
yann@339: +linux-uclibc*) ;;
yann@339:  linux-gnu*) ;;
yann@339:  linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
yann@339:  esac
yann@339: @@ -1262,6 +1263,24 @@
yann@339:    dynamic_linker='GNU/Linux ld.so'
yann@339:    ;;
yann@339:  
yann@339: +linux-uclibc*)
yann@339: +  version_type=linux
yann@339: +  need_lib_prefix=no
yann@339: +  need_version=no
yann@339: +  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
yann@339: +  soname_spec='${libname}${release}.so$major'
yann@339: +  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
yann@339: +  shlibpath_var=LD_LIBRARY_PATH
yann@339: +  shlibpath_overrides_runpath=no
yann@339: +  # This implies no fast_install, which is unacceptable.
yann@339: +  # Some rework will be needed to allow for fast_install
yann@339: +  # before this can be enabled.
yann@339: +  # Note: copied from linux-gnu, and may not be appropriate.
yann@339: +  hardcode_into_libs=yes
yann@339: +  # Assume using the uClibc dynamic linker.
yann@339: +  dynamic_linker="uClibc ld.so"
yann@339: +  ;;
yann@339: +
yann@339:  netbsd*)
yann@339:    need_lib_prefix=no
yann@339:    need_version=no
yann@339: diff -durN gcc-3.4.6.orig/null gcc-3.4.6/null
yann@339: --- gcc-3.4.6.orig/null	1970-01-01 01:00:00.000000000 +0100
yann@339: +++ gcc-3.4.6/null	2007-08-15 22:49:47.000000000 +0200
yann@339: @@ -0,0 +1 @@
yann@339: +~/dev