New patches for GCC-4.1.0 for locale and configuration.

diff -urN gcc-4.1.0/boehm-gc/configure gcc-4.1.0-patched/boehm-gc/configure

--- gcc-4.1.0/boehm-gc/configure	2005-04-13 19:31:24.000000000 -0500

+++ gcc-4.1.0-patched/boehm-gc/configure	2005-04-25 20:47:19.919723167 -0500

diff -urN gcc-4.0.0-dist/boehm-gc/configure gcc-4.0.0/boehm-gc/configure

--- gcc-4.0.0-dist/boehm-gc/configure	2005-04-21 02:04:10.000000000 -0500

+++ gcc-4.0.0/boehm-gc/configure	2005-04-30 13:22:27.495094224 -0500

@@ -4320,6 +4320,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'

diff -urN gcc-4.1.0/gcc/config/arm/linux-elf.h gcc-4.1.0-patched/gcc/config/arm/linux-elf.h

--- gcc-4.1.0/gcc/config/arm/linux-elf.h	2005-03-02 10:27:42.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/arm/linux-elf.h	2005-04-25 20:45:31.795953620 -0500

diff -urN gcc-4.0.0-dist/configure gcc-4.0.0/configure

--- gcc-4.0.0-dist/configure	2005-04-21 02:04:10.000000000 -0500

+++ gcc-4.0.0/configure	2005-04-30 12:27:56.000000000 -0500

@@ -1136,7 +1136,7 @@

     ;;

 "")

     case "${target}" in

-    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)

+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)

         # Enable libmudflap by default in GNU and friends.

 	;;

     *-*-freebsd*)

diff -urN gcc-4.0.0-dist/configure.in gcc-4.0.0/configure.in

--- gcc-4.0.0-dist/configure.in	2005-04-20 21:45:11.000000000 -0500

+++ gcc-4.0.0/configure.in	2005-04-30 12:22:09.000000000 -0500

@@ -345,7 +345,7 @@

     ;;

 "")

     case "${target}" in

-    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu)

+    *-*-linux*-gnu | *-*-gnu* | *-*-k*bsd*-gnu | *-*-linux-uclibc*)

         # Enable libmudflap by default in GNU and friends.

 	;;

     *-*-freebsd*)

diff -urN gcc-4.0.0-dist/contrib/regression/objs-gcc.sh gcc-4.0.0/contrib/regression/objs-gcc.sh

--- gcc-4.0.0-dist/contrib/regression/objs-gcc.sh	2002-10-11 15:23:21.000000000 -0500

+++ gcc-4.0.0/contrib/regression/objs-gcc.sh	2005-04-30 12:29:58.000000000 -0500

@@ -105,6 +105,10 @@

  then

   make all-gdb all-dejagnu all-ld || exit 1

   make install-gdb install-dejagnu install-ld || exit 1

+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ]

+ then

+  make all-gdb all-dejagnu all-ld || exit 1

+  make install-gdb install-dejagnu install-ld || exit 1

 elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then

   make bootstrap || exit 1

   make install || exit 1

diff -urN gcc-4.0.0-dist/gcc/config/arm/linux-elf.h gcc-4.0.0/gcc/config/arm/linux-elf.h

--- gcc-4.0.0-dist/gcc/config/arm/linux-elf.h	2005-03-04 10:14:01.000000000 -0600

+++ gcc-4.0.0/gcc/config/arm/linux-elf.h	2005-04-28 20:30:00.000000000 -0500

@@ -82,6 +82,18 @@

   "%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s"

 #define TARGET_OS_CPP_BUILTINS()		\

   do						\

diff -urN gcc-4.1.0/gcc/config/cris/linux.h gcc-4.1.0-patched/gcc/config/cris/linux.h

--- gcc-4.1.0/gcc/config/cris/linux.h	2005-04-23 23:01:27.000000000 -0500

+++ gcc-4.1.0-patched/gcc/config/cris/linux.h	2005-04-25 20:45:31.796953451 -0500

@@ -73,6 +73,25 @@

diff -urN gcc-4.0.0-dist/gcc/config/cris/linux.h gcc-4.0.0/gcc/config/cris/linux.h

--- gcc-4.0.0-dist/gcc/config/cris/linux.h	2003-11-28 21:08:09.000000000 -0600

+++ gcc-4.0.0/gcc/config/cris/linux.h	2005-04-28 20:30:00.000000000 -0500

@@ -79,6 +79,25 @@

 #undef CRIS_DEFAULT_CPU_VERSION

 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG

 #undef CRIS_SUBTARGET_VERSION

 #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"

@@ -87,6 +106,8 @@

@@ -93,6 +112,8 @@

   %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\

   %{!r:%{O2|O3: --gc-sections}}"

 /* Node: Run-time Target */

diff -urN gcc-4.1.0/gcc/config/cris/t-linux-uclibc gcc-4.1.0-patched/gcc/config/cris/t-linux-uclibc

--- gcc-4.1.0/gcc/config/cris/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/cris/t-linux-uclibc	2005-04-25 20:45:31.797953283 -0500

diff -urN gcc-4.0.0-dist/gcc/config/cris/t-linux-uclibc gcc-4.0.0/gcc/config/cris/t-linux-uclibc

--- gcc-4.0.0-dist/gcc/config/cris/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600

+++ gcc-4.0.0/gcc/config/cris/t-linux-uclibc	2005-04-28 20:30:00.000000000 -0500

@@ -0,0 +1,3 @@

+T_CFLAGS = -DUSE_UCLIBC

+TARGET_LIBGCC2_CFLAGS += -fPIC

+CRTSTUFF_T_CFLAGS_S = $(TARGET_LIBGCC2_CFLAGS)

diff -urN gcc-4.1.0/gcc/config/i386/linux.h gcc-4.1.0-patched/gcc/config/i386/linux.h

--- gcc-4.1.0/gcc/config/i386/linux.h	2004-11-27 10:45:14.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/i386/linux.h	2005-04-25 21:21:05.828409973 -0500

@@ -104,8 +104,13 @@

 /* If ELF is the default format, we should not use /lib/elf.  */

diff -urN gcc-4.0.0-dist/gcc/config/i386/linux.h gcc-4.0.0/gcc/config/i386/linux.h

--- gcc-4.0.0-dist/gcc/config/i386/linux.h	2004-11-27 10:45:14.000000000 -0600

+++ gcc-4.0.0/gcc/config/i386/linux.h	2005-04-28 20:30:00.000000000 -0500

@@ -107,6 +107,11 @@

 #define LINK_EMULATION "elf_i386"

 #define DYNAMIC_LINKER "/lib/ld-linux.so.2"

+#if defined USE_UCLIBC

+#define LINK_EMULATION "elf_i386"

+#undef DYNAMIC_LINKER

+#define DYNAMIC_LINKER "/lib/ld-uClibc.so.0"

+#else

 #define LINK_EMULATION "elf_i386"

 #define DYNAMIC_LINKER "/lib/ld-linux.so.2"

+#endif

+

 #undef  SUBTARGET_EXTRA_SPECS

 #define SUBTARGET_EXTRA_SPECS \

@@ -144,6 +149,7 @@

     }									\

   } while (0)

 #endif

+#endif

 /* Handle special EH pointer encodings.  Absolute, pc-relative, and

    indirect are handled automatically.  */

diff -urN gcc-4.1.0/gcc/config/mips/linux.h gcc-4.1.0-patched/gcc/config/mips/linux.h

--- gcc-4.1.0/gcc/config/mips/linux.h	2005-01-25 20:04:46.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/mips/linux.h	2005-04-25 20:45:31.809951259 -0500

   { "link_emulation", LINK_EMULATION },\

diff -urN gcc-4.0.0-dist/gcc/config/mips/linux.h gcc-4.0.0/gcc/config/mips/linux.h

--- gcc-4.0.0-dist/gcc/config/mips/linux.h	2005-01-25 20:04:46.000000000 -0600

+++ gcc-4.0.0/gcc/config/mips/linux.h	2005-04-28 20:30:00.000000000 -0500

@@ -108,6 +108,17 @@

 /* Borrowed from sparc/linux.h */

 #undef SUBTARGET_ASM_SPEC

 #define SUBTARGET_ASM_SPEC "%{mabi=64: -64} %{!mno-abicalls:-KPIC}"

diff -urN gcc-4.1.0/gcc/config/rs6000/linux.h gcc-4.1.0-patched/gcc/config/rs6000/linux.h

--- gcc-4.1.0/gcc/config/rs6000/linux.h	2004-12-01 20:21:28.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/rs6000/linux.h	2005-04-25 20:45:31.810951091 -0500

diff -urN gcc-4.0.0-dist/gcc/config/rs6000/linux.h gcc-4.0.0/gcc/config/rs6000/linux.h

--- gcc-4.0.0-dist/gcc/config/rs6000/linux.h	2004-12-01 20:21:28.000000000 -0600

+++ gcc-4.0.0/gcc/config/rs6000/linux.h	2005-04-28 20:30:00.000000000 -0500

@@ -69,7 +69,11 @@

 #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"

 #define LINK_GCC_C_SEQUENCE_SPEC \

   "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"

diff -urN gcc-4.1.0/gcc/config/rs6000/sysv4.h gcc-4.1.0-patched/gcc/config/rs6000/sysv4.h

--- gcc-4.1.0/gcc/config/rs6000/sysv4.h	2005-04-13 19:26:50.000000000 -0500

+++ gcc-4.1.0-patched/gcc/config/rs6000/sysv4.h	2005-04-25 20:45:31.812950754 -0500

@@ -957,6 +957,7 @@

diff -urN gcc-4.0.0-dist/gcc/config/rs6000/sysv4.h gcc-4.0.0/gcc/config/rs6000/sysv4.h

--- gcc-4.0.0-dist/gcc/config/rs6000/sysv4.h	2005-02-15 09:53:52.000000000 -0600

+++ gcc-4.0.0/gcc/config/rs6000/sysv4.h	2005-04-28 20:30:00.000000000 -0500

@@ -956,6 +956,7 @@

   mcall-linux  : %(link_os_linux)       ; \

   mcall-gnu    : %(link_os_gnu)         ; \

   mcall-netbsd : %(link_os_netbsd)      ; \

   mcall-openbsd: %(link_os_openbsd)     ; \

                : %(link_os_default)     }"

@@ -1135,6 +1136,10 @@

@@ -1134,6 +1135,10 @@

   %{rdynamic:-export-dynamic} \

   %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"

 #if defined(HAVE_LD_EH_FRAME_HDR)

 # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "

 #endif

@@ -1301,6 +1306,7 @@

@@ -1300,6 +1305,7 @@

   { "link_os_sim",		LINK_OS_SIM_SPEC },			\

   { "link_os_freebsd",		LINK_OS_FREEBSD_SPEC },			\

   { "link_os_linux",		LINK_OS_LINUX_SPEC },			\

   { "link_os_gnu",		LINK_OS_GNU_SPEC },			\

   { "link_os_netbsd",		LINK_OS_NETBSD_SPEC },			\

   { "link_os_openbsd",		LINK_OS_OPENBSD_SPEC },			\

diff -urN gcc-4.1.0/gcc/config/sh/linux.h gcc-4.1.0-patched/gcc/config/sh/linux.h

--- gcc-4.1.0/gcc/config/sh/linux.h	2005-02-28 21:39:03.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/sh/linux.h	2005-04-25 20:45:31.814950416 -0500

@@ -55,12 +55,21 @@

diff -urN gcc-4.0.0-dist/gcc/config/sh/linux.h gcc-4.0.0/gcc/config/sh/linux.h

--- gcc-4.0.0-dist/gcc/config/sh/linux.h	2005-01-25 20:04:48.000000000 -0600

+++ gcc-4.0.0/gcc/config/sh/linux.h	2005-04-28 20:30:00.000000000 -0500

@@ -67,12 +67,21 @@

 #undef SUBTARGET_LINK_EMUL_SUFFIX

 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"

 #undef SUBTARGET_LINK_SPEC

    %{static:-static}"

+#endif

 /* Output assembler code to STREAM to call the profiler.  */

diff -urN gcc-4.1.0/gcc/config/sh/t-linux-uclibc gcc-4.1.0-patched/gcc/config/sh/t-linux-uclibc

--- gcc-4.1.0/gcc/config/sh/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/sh/t-linux-uclibc	2005-04-25 20:45:31.814950416 -0500

@@ -0,0 +1,13 @@

 #undef LIB_SPEC

 #define LIB_SPEC \

diff -urN gcc-4.0.0-dist/gcc/config/sh/t-linux-uclibc gcc-4.0.0/gcc/config/sh/t-linux-uclibc

--- gcc-4.0.0-dist/gcc/config/sh/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600

+++ gcc-4.0.0/gcc/config/sh/t-linux-uclibc	2005-04-28 20:30:00.000000000 -0500

@@ -0,0 +1,47 @@

+T_CFLAGS = -DUSE_UCLIBC

+

+TARGET_LIBGCC2_CFLAGS = -fpic -DNO_FPSCR_VALUES

+

+LIB2FUNCS_EXTRA=

+

+MULTILIB_OPTIONS= $(MULTILIB_ENDIAN) m3e/m4

+MULTILIB_DIRNAMES= 

+MULTILIB_MATCHES = 

+MULTILIB_EXCEPTIONS=

+

+EXTRA_MULTILIB_PARTS= crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o

diff -urN gcc-4.1.0/gcc/config/sh/t-sh64-uclibc gcc-4.1.0-patched/gcc/config/sh/t-sh64-uclibc

--- gcc-4.1.0/gcc/config/sh/t-sh64-uclibc	1969-12-31 18:00:00.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/sh/t-sh64-uclibc	2005-04-25 20:45:31.815950248 -0500

@@ -0,0 +1,13 @@

+EXTRA_MULTILIB_PARTS= crt1.o crti.o crtn.o crtbegin.o crtend.o

+

+LIB1ASMFUNCS = \

+  _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr \

+  _shcompact_call_trampoline _shcompact_return_trampoline \

+  _shcompact_incoming_args _ic_invalidate _nested_trampoline \

+  _push_pop_shmedia_regs \

+  _udivdi3 _divdi3 _umoddi3 _moddi3

+# Override t-slibgcc-elf-ver to export some libgcc symbols with

+# the symbol versions that glibc used, and hide some lib1func

+# routines which should not be called via PLT.  We have to create

+# the list from scratch.

+SHLIB_MAPFILES = \

+	$(srcdir)/libgcc-std.ver \

+	$(srcdir)/config/sh/libgcc-excl.ver \

+	$(srcdir)/config/sh/libgcc-glibc.ver

+

+MULTILIB_OPTIONS = $(MULTILIB_ENDIAN) m5-32media-nofpu/m5-compact/m5-compact-nofpu/m5-64media/m5-64media-nofpu

+MULTILIB_DIRNAMES= $(MULTILIB_ENDIAN) nofpu compact nofpu/compact media64 nofpu/media64

+MULTILIB_MATCHES=

+MULTILIB_EXCEPTIONS=

diff -urN gcc-4.1.0/gcc/config/t-linux-uclibc gcc-4.1.0-patched/gcc/config/t-linux-uclibc

--- gcc-4.1.0/gcc/config/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600

+++ gcc-4.1.0-patched/gcc/config/t-linux-uclibc	2005-04-25 20:45:31.815950248 -0500

+# Override SHLIB_LINK and SHLIB_INSTALL to use linker script

+# libgcc_s.so.

+SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \

+	-Wl,--soname=$(SHLIB_SONAME) \

+	-Wl,--version-script=$(SHLIB_MAP) \

+	-o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp @multilib_flags@ \

+	$(SHLIB_OBJS) $(SHLIB_LC) && \

+	rm -f $(SHLIB_DIR)/$(SHLIB_SOLINK) && \

+	if [ -f $(SHLIB_DIR)/$(SHLIB_SONAME) ]; then \

+	  mv -f $(SHLIB_DIR)/$(SHLIB_SONAME) \

+		$(SHLIB_DIR)/$(SHLIB_SONAME).backup; \

+	else true; fi && \

+	mv $(SHLIB_DIR)/$(SHLIB_SONAME).tmp $(SHLIB_DIR)/$(SHLIB_SONAME) && \

+	(echo "/* GNU ld script"; \

+	 echo "   Use the shared library, but some functions are only in"; \

+	 echo "   the static library.  */"; \

+	 echo "GROUP ( $(SHLIB_SONAME) libgcc.a )" \

+	) > $(SHLIB_DIR)/$(SHLIB_SOLINK)

+SHLIB_INSTALL = \

+	$$(mkinstalldirs) $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \

+	$(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_SONAME) \

+	  $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \

+	rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \

+	$(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_SOLINK) \

+	  $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)

diff -urN gcc-4.0.0-dist/gcc/config/t-linux-uclibc gcc-4.0.0/gcc/config/t-linux-uclibc

--- gcc-4.0.0-dist/gcc/config/t-linux-uclibc	1969-12-31 18:00:00.000000000 -0600

+++ gcc-4.0.0/gcc/config/t-linux-uclibc	2005-04-28 20:30:00.000000000 -0500

@@ -0,0 +1,15 @@

+T_CFLAGS = -DUSE_UCLIBC

+

+LIB2ADDEH = $(srcdir)/unwind-dw2.c $(srcdir)/unwind-dw2-fde.c \

+  $(srcdir)/unwind-sjlj.c $(srcdir)/gthr-gnat.c $(srcdir)/unwind-c.c

+LIB2ADDEHDEP = unwind.inc unwind-dw2-fde.h

diff -urN gcc-4.1.0/gcc/config.gcc gcc-4.1.0-patched/gcc/config.gcc

--- gcc-4.1.0/gcc/config.gcc	2005-04-23 23:01:23.000000000 -0500

+++ gcc-4.1.0-patched/gcc/config.gcc	2005-04-25 21:12:43.375594576 -0500

@@ -448,7 +448,14 @@

diff -urN gcc-4.0.0-dist/gcc/config.gcc gcc-4.0.0/gcc/config.gcc

--- gcc-4.0.0-dist/gcc/config.gcc	2005-03-30 21:17:08.000000000 -0600

+++ gcc-4.0.0/gcc/config.gcc	2005-04-28 20:30:00.000000000 -0500

@@ -439,7 +439,12 @@

   case ${enable_threads} in

     "" | yes | posix) thread_file='posix' ;;

   esac

-  tmake_file="t-slibgcc-elf-ver t-linux"

+  case ${target} in

+    *-linux*uclibc*)

+      tmake_file="t-slibgcc-elf-ver t-linux-uclibc"

+      ;;

+    *-*-linux-uclibc*)

+      tmake_file="t-slibgcc-elf-ver t-linux-uclibc" ;;

+    *)

+      tmake_file="t-slibgcc-elf-ver t-linux"

+      ;;

+      tmake_file="t-slibgcc-elf-ver t-linux" ;;

+  esac

   ;;

 *-*-gnu*)

   # On the Hurd, the setup is just about the same on

@@ -667,6 +674,12 @@

 	extra_parts=""

 	use_collect2=yes

 	;;

+arm*-*-linux-uclibc*)		# ARM GNU/Linux with ELF - uClibc

+	tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h"

+	tmake_file="t-slibgcc-elf-ver t-linux-uclibc arm/t-linux"

+	extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"

+	gnu_ld=yes

+	;;

 arm*-*-linux*)			# ARM GNU/Linux with ELF

 	tm_file="dbxelf.h elfos.h linux.h arm/elf.h  arm/linux-gas.h arm/linux-elf.h arm/aout.h arm/arm.h"

 	tmake_file="${tmake_file} arm/t-arm arm/t-linux"

@@ -765,6 +778,10 @@

@@ -744,6 +749,10 @@

 	tmake_file="cris/t-cris cris/t-elfmulti"

 	gas=yes

 	extra_options="${extra_options} cris/elf.opt"

 	;;

+cris-*-linux-uclibc*)

+	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"

 cris-*-linux*)

 	tm_file="dbxelf.h elfos.h svr4.h ${tm_file} linux.h cris/linux.h"

 	# We need to avoid using t-linux, so override default tmake_file

@@ -1443,6 +1460,16 @@

 	gnu_ld=yes

 	gas=yes

 	;;

+mips*-*-linux-uclibc*)			# Linux MIPS, either endian. uClibc

+        tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"

+	case ${target} in

+        mipsisa32*-*)

+                target_cpu_default="MASK_SOFT_FLOAT"

+		tm_defines="MIPS_ISA_DEFAULT=32"

+                ;;

+        esac

+	tmake_file="t-slibgcc-elf-ver t-linux-uclibc"

+	;;

 mips*-*-linux*)				# Linux MIPS, either endian.

         tm_file="dbxelf.h elfos.h svr4.h linux.h ${tm_file} mips/linux.h"

 	case ${target} in

@@ -1659,6 +1686,10 @@

 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h rs6000/linuxspe.h"

 	tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"

 	;;

+powerpc-*-linux-uclibc*)

+	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/linux.h"

+	tmake_file="rs6000/t-fprules rs6000/t-ppcos t-slibgcc-elf-ver t-linux-uclibc rs6000/t-ppccomm"

+	;;

 powerpc-*-linux*)

 	tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h"

 	tmake_file="rs6000/t-fprules rs6000/t-ppcos ${tmake_file} rs6000/t-ppccomm"

@@ -1821,6 +1852,8 @@

@@ -1780,6 +1789,8 @@

 	esac

 	tm_file="${tm_file} sh/elf.h"

 	case ${target} in

+	sh*-*-linux-uclibc*)	tmake_file="${tmake_file} t-linux-uclibc sh/t-linux-uclibc"

+			tm_file="${tm_file} linux.h sh/linux.h" ;;

+	sh*-*-linux-uclibc*) tmake_file="${tmake_file} sh/t-linux-uclibc"

+			tm_file="${tm_file} sh/linux.h" ;;

 	sh*-*-linux*)	tmake_file="${tmake_file} sh/t-linux"

 			tm_file="${tm_file} linux.h sh/linux.h" ;;

 			tm_file="${tm_file} sh/linux.h" ;;

 	sh*-*-kaos*)	tm_file="${tm_file} sh/embed-elf.h kaos.h sh/kaos-sh.h"

@@ -1840,6 +1873,11 @@

 	*-*-netbsd)

                 tmake_file="${tmake_file} sh/t-netbsd"

diff -urN gcc-4.0.0-dist/libffi/configure gcc-4.0.0/libffi/configure

--- gcc-4.0.0-dist/libffi/configure	2004-12-02 05:04:21.000000000 -0600

+++ gcc-4.0.0/libffi/configure	2005-04-30 12:18:05.000000000 -0500

@@ -3457,6 +3457,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

+

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'

diff -urN gcc-4.0.0-dist/libgfortran/configure gcc-4.0.0/libgfortran/configure

--- gcc-4.0.0-dist/libgfortran/configure	2005-04-21 02:04:10.000000000 -0500

+++ gcc-4.0.0/libgfortran/configure	2005-04-30 12:26:15.000000000 -0500

@@ -3684,6 +3684,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

+

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'

diff -urN gcc-4.0.0-dist/libjava/configure gcc-4.0.0/libjava/configure

--- gcc-4.0.0-dist/libjava/configure	2005-04-21 02:04:10.000000000 -0500

+++ gcc-4.0.0/libjava/configure	2005-04-30 12:27:15.000000000 -0500

@@ -4354,6 +4354,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

+

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'

diff -urN gcc-4.0.0-dist/libmudflap/configure gcc-4.0.0/libmudflap/configure

--- gcc-4.0.0-dist/libmudflap/configure	2005-01-02 16:24:50.000000000 -0600

+++ gcc-4.0.0/libmudflap/configure	2005-04-30 12:25:24.000000000 -0500

@@ -5380,6 +5380,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

+

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'

diff -urN gcc-4.0.0-dist/libobjc/configure gcc-4.0.0/libobjc/configure

--- gcc-4.0.0-dist/libobjc/configure	2005-04-21 02:04:10.000000000 -0500

+++ gcc-4.0.0/libobjc/configure	2005-04-30 12:25:55.000000000 -0500

@@ -3283,6 +3283,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;

+	sh64*-*-linux-uclibc*)

+		tmake_file="${tmake_file} sh/t-sh64-uclibc"

+		tm_file="${tm_file} sh/sh64.h"

+		extra_headers="shmedia.h ushmedia.h sshmedia.h"

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

 	sh64*-*-linux*)

 		tmake_file="${tmake_file} sh/t-sh64 sh/t-linux64"

 		tm_file="${tm_file} sh/sh64.h"

diff -urN gcc-4.1.0/libtool.m4 gcc-4.1.0-patched/libtool.m4

--- gcc-4.1.0/libtool.m4	2005-04-13 19:31:24.000000000 -0500

+++ gcc-4.1.0-patched/libtool.m4	2005-04-25 20:47:51.679369687 -0500

@@ -743,6 +743,11 @@

+

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'

diff -urN gcc-4.0.0-dist/libtool.m4 gcc-4.0.0/libtool.m4

--- gcc-4.0.0-dist/libtool.m4	2004-11-29 17:45:17.000000000 -0600

+++ gcc-4.0.0/libtool.m4	2005-04-30 12:28:32.000000000 -0500

@@ -682,6 +682,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     [lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$']

diff -urN gcc-4.1.0/ltconfig gcc-4.1.0-patched/ltconfig

--- gcc-4.1.0/ltconfig	2004-10-02 11:33:06.000000000 -0500

+++ gcc-4.1.0-patched/ltconfig	2005-04-25 20:45:31.836946707 -0500

diff -urN gcc-4.0.0-dist/ltconfig gcc-4.0.0/ltconfig

--- gcc-4.0.0-dist/ltconfig	2004-10-02 11:33:06.000000000 -0500

+++ gcc-4.0.0/ltconfig	2005-04-30 13:26:08.000000000 -0500

@@ -602,6 +602,7 @@

 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.

 linux-gnu*) ;;

 linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`

 esac

@@ -1273,6 +1274,24 @@

@@ -1273,6 +1274,23 @@

   dynamic_linker='GNU/Linux ld.so'

   ;;

+  # This implies no fast_install, which is unacceptable.

+  # Some rework will be needed to allow for fast_install

+  # before this can be enabled.

+  # Note: copied from linux-gnu, and may not be appropriate.

+  hardcode_into_libs=yes

+  # Assume using the uClibc dynamic linker.

+  dynamic_linker="uClibc ld.so"

 netbsd*)

   need_lib_prefix=no

   need_version=no

diff -urN gcc-4.0.0-dist/zlib/configure gcc-4.0.0/zlib/configure

--- gcc-4.0.0-dist/zlib/configure	2004-11-24 16:04:38.000000000 -0600

+++ gcc-4.0.0/zlib/configure	2005-04-30 12:30:40.000000000 -0500

@@ -3426,6 +3426,11 @@

   lt_cv_deplibs_check_method=pass_all

   ;;

+linux-uclibc*)

+  lt_cv_deplibs_check_method=pass_all

+  lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`

+  ;;

+

 netbsd* | knetbsd*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[^/\.]+\.so\.[0-9]+\.[0-9]+$'