source: clfs-embedded/patches/gcc-4.1.1-uclibc-1.patch @ 24e0008

Submitted By: Jim Gifford (patches at jg555 dot com)
Date: 2006-11-13
Initial Package Version: 4.1.1
Origin: uClibc and Buildroot
Upstream Status: uClibc Specific
Description: Makes GCC uClibc Friendly

diff -Naur gcc-4.1.1.orig/boehm-gc/configure gcc-4.1.1/boehm-gc/configure
--- gcc-4.1.1.orig/boehm-gc/configure   2006-05-24 16:46:15.000000000 -0700
+++ gcc-4.1.1/boehm-gc/configure        2006-11-13 21:14:41.484217626 -0800
@@ -4320,6 +4320,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 -Naur gcc-4.1.1.orig/boehm-gc/include/gc.h gcc-4.1.1/boehm-gc/include/gc.h
--- gcc-4.1.1.orig/boehm-gc/include/gc.h        2005-01-01 19:35:57.000000000 -0800
+++ gcc-4.1.1/boehm-gc/include/gc.h     2006-11-13 21:13:53.917810047 -0800
@@ -500,7 +500,7 @@
 #ifdef __linux__
 # include <features.h>
 # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \
-     && !defined(__ia64__)
+     && !defined(__ia64__) && !defined(__UCLIBC__)
 #   ifndef GC_HAVE_BUILTIN_BACKTRACE
 #     define GC_HAVE_BUILTIN_BACKTRACE
 #   endif
diff -Naur gcc-4.1.1.orig/configure gcc-4.1.1/configure
--- gcc-4.1.1.orig/configure    2005-12-16 04:57:40.000000000 -0800
+++ gcc-4.1.1/configure 2006-11-13 21:14:41.484217626 -0800
@@ -1133,7 +1133,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 -Naur gcc-4.1.1.orig/configure.in gcc-4.1.1/configure.in
--- gcc-4.1.1.orig/configure.in 2005-12-16 04:57:40.000000000 -0800
+++ gcc-4.1.1/configure.in      2006-11-13 21:14:41.488217492 -0800
@@ -341,7 +341,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 -Naur gcc-4.1.1.orig/contrib/regression/objs-gcc.sh gcc-4.1.1/contrib/regression/objs-gcc.sh
--- gcc-4.1.1.orig/contrib/regression/objs-gcc.sh       2005-08-14 17:41:31.000000000 -0700
+++ gcc-4.1.1/contrib/regression/objs-gcc.sh    2006-11-13 21:14:41.488217492 -0800
@@ -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 -Naur gcc-4.1.1.orig/gcc/config/alpha/linux-elf.h gcc-4.1.1/gcc/config/alpha/linux-elf.h
--- gcc-4.1.1.orig/gcc/config/alpha/linux-elf.h 2005-06-24 18:22:41.000000000 -0700
+++ gcc-4.1.1/gcc/config/alpha/linux-elf.h      2006-11-13 21:14:41.488217492 -0800
@@ -27,7 +27,11 @@
 #define SUBTARGET_EXTRA_SPECS \
 { "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
 
+#if defined USE_UCLIBC
+#define ELF_DYNAMIC_LINKER     "/lib/ld-uClibc.so.0"
+#else
 #define ELF_DYNAMIC_LINKER     "/lib/ld-linux.so.2"
+#endif
 
 #define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax}         \
   %{O*:-O3} %{!O*:-O1}                                         \
diff -Naur gcc-4.1.1.orig/gcc/config/arm/linux-eabi.h gcc-4.1.1/gcc/config/arm/linux-eabi.h
--- gcc-4.1.1.orig/gcc/config/arm/linux-eabi.h  2005-11-15 06:32:13.000000000 -0800
+++ gcc-4.1.1/gcc/config/arm/linux-eabi.h       2006-11-13 21:12:31.088578670 -0800
@@ -53,7 +53,11 @@
 /* Use ld-linux.so.3 so that it will be possible to run "classic"
    GNU/Linux binaries on an EABI system.  */
 #undef LINUX_TARGET_INTERPRETER
+#ifdef USE_UCLIBC
+#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
+#else
 #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.3"
+#endif
 
 /* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
    use the GNU/Linux version, not the generic BPABI version.  */
diff -Naur gcc-4.1.1.orig/gcc/config/arm/linux-elf.h gcc-4.1.1/gcc/config/arm/linux-elf.h
--- gcc-4.1.1.orig/gcc/config/arm/linux-elf.h   2005-10-09 18:04:31.000000000 -0700
+++ gcc-4.1.1/gcc/config/arm/linux-elf.h        2006-11-13 21:14:41.488217492 -0800
@@ -28,19 +28,33 @@
 #undef  TARGET_VERSION
 #define TARGET_VERSION  fputs (" (ARM GNU/Linux with ELF)", stderr);
 
+/*
+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
+ * (big endian) configurations.
+ */
+#if TARGET_BIG_ENDIAN_DEFAULT
+#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
+#define TARGET_ENDIAN_OPTION "mbig-endian"
+#define TARGET_LINKER_EMULATION "armelfb_linux"
+#else
+#define TARGET_ENDIAN_DEFAULT 0
+#define TARGET_ENDIAN_OPTION "mlittle-endian"
+#define TARGET_LINKER_EMULATION "armelf_linux"
+#endif
+
 #undef  TARGET_DEFAULT_FLOAT_ABI
 #define TARGET_DEFAULT_FLOAT_ABI ARM_FLOAT_ABI_HARD
 
 #undef  TARGET_DEFAULT
-#define TARGET_DEFAULT (0)
+#define TARGET_DEFAULT (TARGET_ENDIAN_DEFAULT)
 
 #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm6
 
-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux -p"
+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION " -p"
 
 #undef  MULTILIB_DEFAULTS
 #define MULTILIB_DEFAULTS \
-       { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" }
+       { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
 
 /* Now we define the strings used to build the spec file.  */
 #undef  LIB_SPEC
@@ -51,7 +65,11 @@
 
 #define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
 
+#ifdef USE_UCLIBC
+#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0"
+#else
 #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.2"
+#endif
 
 #define LINUX_TARGET_LINK_SPEC  "%{h*} %{version:-v} \
    %{b} \
@@ -61,7 +79,7 @@
    %{rdynamic:-export-dynamic} \
    %{!dynamic-linker:-dynamic-linker " LINUX_TARGET_INTERPRETER "} \
    -X \
-   %{mbig-endian:-EB}" \
+   %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
    SUBTARGET_EXTRA_LINK_SPEC
 
 #undef  LINK_SPEC
diff -Naur gcc-4.1.1.orig/gcc/config/cris/linux.h gcc-4.1.1/gcc/config/cris/linux.h
--- gcc-4.1.1.orig/gcc/config/cris/linux.h      2005-06-24 18:22:41.000000000 -0700
+++ gcc-4.1.1/gcc/config/cris/linux.h   2006-11-13 21:14:41.488217492 -0800
@@ -73,6 +73,25 @@
 #undef CRIS_DEFAULT_CPU_VERSION
 #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
 
+#ifdef USE_UCLIBC
+
+#undef CRIS_SUBTARGET_VERSION
+#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
+
+#undef CRIS_LINK_SUBTARGET_SPEC
+#define CRIS_LINK_SUBTARGET_SPEC \
+ "-mcrislinux\
+  -rpath-link include/asm/../..%s\
+  %{shared} %{static}\
+  %{symbolic:-Bdynamic} %{shlib:-Bdynamic} %{static:-Bstatic}\
+  %{!shared: \
+    %{!static: \
+      %{rdynamic:-export-dynamic} \
+      %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}} \
+  %{!r:%{O2|O3: --gc-sections}}"
+
+#else  /* USE_UCLIBC */
+
 #undef CRIS_SUBTARGET_VERSION
 #define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
 
@@ -87,6 +106,8 @@
   %{!shared:%{!static:%{rdynamic:-export-dynamic}}}\
   %{!r:%{O2|O3: --gc-sections}}"
 
+#endif  /* USE_UCLIBC */
+
 
 /* Node: Run-time Target */
 
diff -Naur gcc-4.1.1.orig/gcc/config/i386/linux.h gcc-4.1.1/gcc/config/i386/linux.h
--- gcc-4.1.1.orig/gcc/config/i386/linux.h      2005-08-10 10:53:01.000000000 -0700
+++ gcc-4.1.1/gcc/config/i386/linux.h   2006-11-13 21:14:41.488217492 -0800
@@ -107,6 +107,11 @@
 #define LINK_EMULATION "elf_i386"
 #define DYNAMIC_LINKER "/lib/ld-linux.so.2"
 
+#if defined USE_UCLIBC
+#undef DYNAMIC_LINKER
+#define DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#endif
+
 #undef  SUBTARGET_EXTRA_SPECS
 #define SUBTARGET_EXTRA_SPECS \
   { "link_emulation", LINK_EMULATION },\
diff -Naur gcc-4.1.1.orig/gcc/config/i386/linux64.h gcc-4.1.1/gcc/config/i386/linux64.h
--- gcc-4.1.1.orig/gcc/config/i386/linux64.h    2005-08-10 10:53:01.000000000 -0700
+++ gcc-4.1.1/gcc/config/i386/linux64.h 2006-11-13 21:14:41.520216420 -0800
@@ -54,14 +54,21 @@
    When the -shared link option is used a final link is not being
    done.  */
 
+#ifdef USE_UCLIBC
+#define ELF32_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
+#else
+#define ELF32_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#define ELF64_DYNAMIC_LINKER "/lib64/ld-linux-x86-64.so.2"
+#endif
 #undef LINK_SPEC
 #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
   %{shared:-shared} \
   %{!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 " ELF32_DYNAMIC_LINKER "}} \
+      %{!m32:%{!dynamic-linker:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}} \
     %{static:-static}}"
 
 /* Similar to standard Linux, but adding -ffast-math support.  */
diff -Naur gcc-4.1.1.orig/gcc/config/ia64/linux.h gcc-4.1.1/gcc/config/ia64/linux.h
--- gcc-4.1.1.orig/gcc/config/ia64/linux.h      2004-09-07 17:17:19.000000000 -0700
+++ gcc-4.1.1/gcc/config/ia64/linux.h   2006-11-13 21:14:41.520216420 -0800
@@ -37,13 +37,18 @@
 /* Define this for shared library support because it isn't in the main
    linux.h file.  */
 
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER     "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
+#endif
 #undef LINK_SPEC
 #define LINK_SPEC "\
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker:-dynamic-linker /lib/ld-linux-ia64.so.2}} \
+      %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
       %{static:-static}}"
 
 
diff -Naur gcc-4.1.1.orig/gcc/config/m68k/linux.h gcc-4.1.1/gcc/config/m68k/linux.h
--- gcc-4.1.1.orig/gcc/config/m68k/linux.h      2005-06-24 18:22:41.000000000 -0700
+++ gcc-4.1.1/gcc/config/m68k/linux.h   2006-11-13 21:14:41.520216420 -0800
@@ -123,12 +123,17 @@
 
 /* If ELF is the default format, we should not use /lib/elf.  */
 
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
+#endif
 #undef LINK_SPEC
 #define LINK_SPEC "-m m68kelf %{shared} \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker*:-dynamic-linker /lib/ld.so.1}} \
+      %{!dynamic-linker*:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
     %{static}}"
 
 /* For compatibility with linux/a.out */
diff -Naur gcc-4.1.1.orig/gcc/config/mips/linux.h gcc-4.1.1/gcc/config/mips/linux.h
--- gcc-4.1.1.orig/gcc/config/mips/linux.h      2005-06-24 18:22:41.000000000 -0700
+++ gcc-4.1.1/gcc/config/mips/linux.h   2006-11-13 21:14:41.520216420 -0800
@@ -105,6 +105,11 @@
 
 /* Borrowed from sparc/linux.h */
 #undef LINK_SPEC
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
+#endif
 #define LINK_SPEC \
  "%(endian_spec) \
   %{shared:-shared} \
@@ -112,7 +117,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
+        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
         %{static:-static}}}"
 
 #undef SUBTARGET_ASM_SPEC
diff -Naur gcc-4.1.1.orig/gcc/config/pa/pa-linux.h gcc-4.1.1/gcc/config/pa/pa-linux.h
--- gcc-4.1.1.orig/gcc/config/pa/pa-linux.h     2005-11-17 19:22:18.000000000 -0800
+++ gcc-4.1.1/gcc/config/pa/pa-linux.h  2006-11-13 21:14:41.520216420 -0800
@@ -49,13 +49,18 @@
 /* Define this for shared library support because it isn't in the main
    linux.h file.  */
 
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER "/lib/ld.so.1"
+#endif
 #undef LINK_SPEC
 #define LINK_SPEC "\
   %{shared:-shared} \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}} \
+      %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
       %{static:-static}}"
 
 /* glibc's profiling functions don't need gcc to allocate counters.  */
diff -Naur gcc-4.1.1.orig/gcc/config/rs6000/linux.h gcc-4.1.1/gcc/config/rs6000/linux.h
--- gcc-4.1.1.orig/gcc/config/rs6000/linux.h    2006-02-10 12:58:33.000000000 -0800
+++ gcc-4.1.1/gcc/config/rs6000/linux.h 2006-11-13 21:14:41.520216420 -0800
@@ -72,7 +72,11 @@
 #define LINK_START_DEFAULT_SPEC "%(link_start_linux)"
 
 #undef LINK_OS_DEFAULT_SPEC
+#ifdef USE_UCLIBC
+#define LINK_OS_DEFAULT_SPEC "%(link_os_linux_uclibc)"
+#else
 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
+#endif
 
 #define LINK_GCC_C_SEQUENCE_SPEC \
   "%{static:--start-group} %G %L %{static:--end-group}%{!static:%G}"
diff -Naur gcc-4.1.1.orig/gcc/config/rs6000/sysv4.h gcc-4.1.1/gcc/config/rs6000/sysv4.h
--- gcc-4.1.1.orig/gcc/config/rs6000/sysv4.h    2006-02-10 12:58:33.000000000 -0800
+++ gcc-4.1.1/gcc/config/rs6000/sysv4.h 2006-11-13 21:14:41.520216420 -0800
@@ -866,6 +866,7 @@
   mcall-linux  : %(link_os_linux)       ; \
   mcall-gnu    : %(link_os_gnu)         ; \
   mcall-netbsd : %(link_os_netbsd)      ; \
+  mcall-linux-uclibc : %(link_os_linux_uclibc); \
   mcall-openbsd: %(link_os_openbsd)     ; \
                : %(link_os_default)     }"
 
@@ -1043,6 +1044,10 @@
   %{rdynamic:-export-dynamic} \
   %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
 
+#define LINK_OS_LINUX_UCLIBC_SPEC "-m elf32ppclinux %{!shared: %{!static: \
+  %{rdynamic:-export-dynamic} \
+  %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}}}"
+
 #if defined(HAVE_LD_EH_FRAME_HDR)
 # define LINK_EH_SPEC "%{!static:--eh-frame-hdr} "
 #endif
@@ -1209,6 +1214,7 @@
   { "link_os_sim",             LINK_OS_SIM_SPEC },                     \
   { "link_os_freebsd",         LINK_OS_FREEBSD_SPEC },                 \
   { "link_os_linux",           LINK_OS_LINUX_SPEC },                   \
+  { "link_os_linux_uclibc",    LINK_OS_LINUX_UCLIBC_SPEC },            \
   { "link_os_gnu",             LINK_OS_GNU_SPEC },                     \
   { "link_os_netbsd",          LINK_OS_NETBSD_SPEC },                  \
   { "link_os_openbsd",         LINK_OS_OPENBSD_SPEC },                 \
diff -Naur gcc-4.1.1.orig/gcc/config/s390/linux.h gcc-4.1.1/gcc/config/s390/linux.h
--- gcc-4.1.1.orig/gcc/config/s390/linux.h      2006-02-11 00:38:51.000000000 -0800
+++ gcc-4.1.1/gcc/config/s390/linux.h   2006-11-13 21:14:41.520216420 -0800
@@ -77,6 +77,13 @@
 #define MULTILIB_DEFAULTS { "m31" }
 #endif
 
+#ifdef USE_UCLIBC
+#define ELF31_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#define ELF64_DYNAMIC_LINKER "/lib/ld64-uClibc.so.0"
+#else
+#define ELF31_DYNAMIC_LINKER "/lib/ld.so.1"
+#define ELF64_DYNAMIC_LINKER "/lib/ld64.so.1"
+#endif
 #undef  LINK_SPEC
 #define LINK_SPEC \
   "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
@@ -86,8 +93,8 @@
       %{!static: \
        %{rdynamic:-export-dynamic} \
        %{!dynamic-linker: \
-          %{m31:-dynamic-linker /lib/ld.so.1} \
-          %{m64:-dynamic-linker /lib/ld64.so.1}}}}"
+          %{m31:-dynamic-linker " ELF31_DYNAMIC_LINKER "} \
+          %{m64:-dynamic-linker " ELF64_DYNAMIC_LINKER "}}}}"
 
 
 #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
diff -Naur gcc-4.1.1.orig/gcc/config/sh/linux.h gcc-4.1.1/gcc/config/sh/linux.h
--- gcc-4.1.1.orig/gcc/config/sh/linux.h        2005-06-24 18:22:41.000000000 -0700
+++ gcc-4.1.1/gcc/config/sh/linux.h     2006-11-13 21:14:41.520216420 -0800
@@ -56,12 +56,21 @@
 #undef SUBTARGET_LINK_EMUL_SUFFIX
 #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
 #undef SUBTARGET_LINK_SPEC
+#ifdef USE_UCLIBC
+#define SUBTARGET_LINK_SPEC \
+  "%{shared:-shared} \
+   %{!static: \
+     %{rdynamic:-export-dynamic} \
+     %{!dynamic-linker:-dynamic-linker /lib/ld-uClibc.so.0}} \
+   %{static:-static}"
+#else
 #define SUBTARGET_LINK_SPEC \
   "%{shared:-shared} \
    %{!static: \
      %{rdynamic:-export-dynamic} \
      %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
    %{static:-static}"
+#endif
 
 /* Output assembler code to STREAM to call the profiler.  */
 
diff -Naur gcc-4.1.1.orig/gcc/config/sparc/linux.h gcc-4.1.1/gcc/config/sparc/linux.h
--- gcc-4.1.1.orig/gcc/config/sparc/linux.h     2006-02-11 00:38:51.000000000 -0800
+++ gcc-4.1.1/gcc/config/sparc/linux.h  2006-11-13 21:14:41.520216420 -0800
@@ -125,6 +125,11 @@
 
 /* If ELF is the default format, we should not use /lib/elf.  */
 
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER "/lib/ld-linux.so.2"
+#endif
 #undef  LINK_SPEC
 #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
   %{!mno-relax:%{!r:-relax}} \
@@ -132,7 +137,7 @@
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
         %{static:-static}}}"
 
 /* The sun bundled assembler doesn't accept -Yd, (and neither does gas).
diff -Naur gcc-4.1.1.orig/gcc/config/sparc/linux64.h gcc-4.1.1/gcc/config/sparc/linux64.h
--- gcc-4.1.1.orig/gcc/config/sparc/linux64.h   2006-02-11 00:38:51.000000000 -0800
+++ gcc-4.1.1/gcc/config/sparc/linux64.h        2006-11-13 21:14:41.520216420 -0800
@@ -162,12 +162,17 @@
   { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },       \
   { "link_arch",        LINK_ARCH_SPEC },
     
+#ifdef USE_UCLIBC
+#define ELF_DYNAMIC_LINKER     "/lib/ld-uClibc.so.0"
+#else
+#define ELF_DYNAMIC_LINKER  "/lib/ld-linux.so.2"
+#endif
 #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
   %{!shared: \
     %{!ibcs: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-        %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+        %{!dynamic-linker:-dynamic-linker " ELF_DYNAMIC_LINKER "}} \
         %{static:-static}}} \
 "
 
diff -Naur gcc-4.1.1.orig/gcc/config/t-linux-uclibc gcc-4.1.1/gcc/config/t-linux-uclibc
--- gcc-4.1.1.orig/gcc/config/t-linux-uclibc    1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/gcc/config/t-linux-uclibc 2006-11-13 21:14:41.480217760 -0800
@@ -0,0 +1,5 @@
+# Remove glibc specific files added in t-linux
+SHLIB_MAPFILES := $(filter-out $(srcdir)/config/libgcc-glibc.ver, $(SHLIB_MAPFILES))
+
+# Use unwind-dw2-fde instead of unwind-dw2-fde-glibc
+LIB2ADDEH := $(subst unwind-dw2-fde-glibc.c,unwind-dw2-fde.c,$(LIB2ADDEH))
diff -Naur gcc-4.1.1.orig/gcc/config.gcc gcc-4.1.1/gcc/config.gcc
--- gcc-4.1.1.orig/gcc/config.gcc       2006-05-09 13:02:29.000000000 -0700
+++ gcc-4.1.1/gcc/config.gcc    2006-11-13 21:14:41.480217760 -0800
@@ -672,9 +672,14 @@
        ;;
 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" 
+       case $target in
+       arm*b-*)
+               tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
+               ;;
+       esac
        tmake_file="${tmake_file} t-linux arm/t-arm"
        case ${target} in
-       arm*-*-linux-gnueabi)
+       arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
            tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
            tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi"
            # The BPABI long long divmod functions return a 128-bit value in 
@@ -1884,7 +1889,7 @@
        ;;
 sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \
 sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
-  sh-*-linux* | sh[346lbe]*-*-linux* | \
+  sh*-*-linux* | sh[346lbe]*-*-linux* | \
   sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
    sh64-*-netbsd* | sh64l*-*-netbsd*)
        tmake_file="${tmake_file} sh/t-sh sh/t-elf"
@@ -2338,6 +2343,12 @@
        ;;
 esac
 
+# Rather than hook into each target, just do it after all the linux
+# targets have been processed
+case ${target} in
+*-linux-uclibc*) tm_defines="${tm_defines} USE_UCLIBC" ; tmake_file="${tmake_file} t-linux-uclibc"
+esac
+
 case ${target} in
 i[34567]86-*-linux*aout* | i[34567]86-*-linux*libc1)
        tmake_file="${tmake_file} i386/t-gmm_malloc"
diff -Naur gcc-4.1.1.orig/gcc/configure gcc-4.1.1/gcc/configure
--- gcc-4.1.1.orig/gcc/configure        2006-02-14 08:50:45.000000000 -0800
+++ gcc-4.1.1/gcc/configure     2006-11-13 21:12:46.872051528 -0800
@@ -14762,7 +14762,7 @@
        tls_first_minor=14
        tls_as_opt="-m64 -Aesame --fatal-warnings"
        ;;
-  sh-*-* | sh[34]-*-*)
+  sh-*-* | sh[34]*-*-*)
     conftest_s='
        .section ".tdata","awT",@progbits
 foo:   .long   25
diff -Naur gcc-4.1.1.orig/gcc/configure.ac gcc-4.1.1/gcc/configure.ac
--- gcc-4.1.1.orig/gcc/configure.ac     2006-02-14 08:50:45.000000000 -0800
+++ gcc-4.1.1/gcc/configure.ac  2006-11-13 21:12:46.852052196 -0800
@@ -2435,7 +2435,7 @@
        tls_first_minor=14
        tls_as_opt="-m64 -Aesame --fatal-warnings"
        ;;
-  sh-*-* | sh[34]-*-*)
+  sh-*-* | sh[34]*-*-*)
     conftest_s='
        .section ".tdata","awT",@progbits
 foo:   .long   25
diff -Naur gcc-4.1.1.orig/libffi/configure gcc-4.1.1/libffi/configure
--- gcc-4.1.1.orig/libffi/configure     2006-05-24 16:46:15.000000000 -0700
+++ gcc-4.1.1/libffi/configure  2006-11-13 21:14:41.524216286 -0800
@@ -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 -Naur gcc-4.1.1.orig/libgfortran/configure gcc-4.1.1/libgfortran/configure
--- gcc-4.1.1.orig/libgfortran/configure        2006-05-24 16:46:15.000000000 -0700
+++ gcc-4.1.1/libgfortran/configure     2006-11-13 21:14:41.532216018 -0800
@@ -3699,6 +3699,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 -Naur gcc-4.1.1.orig/libjava/configure gcc-4.1.1/libjava/configure
--- gcc-4.1.1.orig/libjava/configure    2006-05-24 16:46:15.000000000 -0700
+++ gcc-4.1.1/libjava/configure 2006-11-13 21:14:41.536215884 -0800
@@ -5137,6 +5137,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 -Naur gcc-4.1.1.orig/libmudflap/configure gcc-4.1.1/libmudflap/configure
--- gcc-4.1.1.orig/libmudflap/configure 2005-10-04 16:54:38.000000000 -0700
+++ gcc-4.1.1/libmudflap/configure      2006-11-13 21:14:41.540215750 -0800
@@ -5382,6 +5382,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 -Naur gcc-4.1.1.orig/libobjc/configure gcc-4.1.1/libobjc/configure
--- gcc-4.1.1.orig/libobjc/configure    2006-05-24 16:46:15.000000000 -0700
+++ gcc-4.1.1/libobjc/configure 2006-11-13 21:14:41.540215750 -0800
@@ -3312,6 +3312,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 -Naur gcc-4.1.1.orig/libstdc++-v3/acinclude.m4 gcc-4.1.1/libstdc++-v3/acinclude.m4
--- gcc-4.1.1.orig/libstdc++-v3/acinclude.m4    2006-05-03 10:00:18.000000000 -0700
+++ gcc-4.1.1/libstdc++-v3/acinclude.m4 2006-11-13 21:11:59.373637272 -0800
@@ -1001,7 +1001,7 @@
   AC_MSG_CHECKING([for C locale to use])
   GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
     [use MODEL for target locale package],
-    [permit generic|gnu|ieee_1003.1-2001|yes|no|auto])
+    [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto])
   
   # If they didn't use this option switch, or if they specified --enable
   # with no specific model, we'll have to look for one.  If they
@@ -1017,6 +1017,9 @@
   # Default to "generic".
   if test $enable_clocale_flag = auto; then
     case ${target_os} in
+      *-uclibc*)
+        enable_clocale_flag=uclibc
+        ;;
       linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
         AC_EGREP_CPP([_GLIBCXX_ok], [
         #include <features.h>
@@ -1160,6 +1163,40 @@
       CTIME_CC=config/locale/generic/time_members.cc
       CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
       ;;
+    uclibc)
+      AC_MSG_RESULT(uclibc)
+
+      # Declare intention to use gettext, and add support for specific
+      # languages.
+      # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
+      ALL_LINGUAS="de fr"
+
+      # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
+      AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no)
+      if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
+        USE_NLS=yes
+      fi
+      # Export the build objects.
+      for ling in $ALL_LINGUAS; do \
+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
+      done
+      AC_SUBST(glibcxx_MOFILES)
+      AC_SUBST(glibcxx_POFILES)
+
+      CLOCALE_H=config/locale/uclibc/c_locale.h
+      CLOCALE_CC=config/locale/uclibc/c_locale.cc
+      CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
+      CCOLLATE_CC=config/locale/uclibc/collate_members.cc
+      CCTYPE_CC=config/locale/uclibc/ctype_members.cc
+      CMESSAGES_H=config/locale/uclibc/messages_members.h
+      CMESSAGES_CC=config/locale/uclibc/messages_members.cc
+      CMONEY_CC=config/locale/uclibc/monetary_members.cc
+      CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
+      CTIME_H=config/locale/uclibc/time_members.h
+      CTIME_CC=config/locale/uclibc/time_members.cc
+      CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
+      ;;
   esac
 
   # This is where the testsuite looks for locale catalogs, using the
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h gcc-4.1.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h       1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h    2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,63 @@
+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
+
+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+// Written by Jakub Jelinek <jakub@redhat.com>
+
+#include <bits/c++config.h>
+#include <clocale>
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning clean this up
+#endif
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+                                                  
+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l;
+extern "C" __typeof(strcoll_l) __strcoll_l;
+extern "C" __typeof(strftime_l) __strftime_l;
+extern "C" __typeof(strtod_l) __strtod_l;
+extern "C" __typeof(strtof_l) __strtof_l;
+extern "C" __typeof(strtold_l) __strtold_l;
+extern "C" __typeof(strxfrm_l) __strxfrm_l;
+extern "C" __typeof(newlocale) __newlocale;
+extern "C" __typeof(freelocale) __freelocale;
+extern "C" __typeof(duplocale) __duplocale;
+extern "C" __typeof(uselocale) __uselocale;
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+extern "C" __typeof(iswctype_l) __iswctype_l;
+extern "C" __typeof(towlower_l) __towlower_l;
+extern "C" __typeof(towupper_l) __towupper_l;
+extern "C" __typeof(wcscoll_l) __wcscoll_l;
+extern "C" __typeof(wcsftime_l) __wcsftime_l;
+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
+extern "C" __typeof(wctype_l) __wctype_l;
+#endif 
+
+#endif // GLIBC 2.3 and later
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc gcc-4.1.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc        1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/c_locale.cc     2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,152 @@
+// Wrapper for underlying C-language localization -*- C++ -*-
+
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.8  Standard locale categories.
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <cerrno>  // For errno
+#include <locale>
+#include <stdexcept>
+#include <langinfo.h>
+#include <bits/c++locale_internal.h>
+
+#ifndef __UCLIBC_HAS_XLOCALE__
+#define __strtol_l(S, E, B, L)      strtol((S), (E), (B))
+#define __strtoul_l(S, E, B, L)     strtoul((S), (E), (B))
+#define __strtoll_l(S, E, B, L)     strtoll((S), (E), (B))
+#define __strtoull_l(S, E, B, L)    strtoull((S), (E), (B))
+#define __strtof_l(S, E, L)         strtof((S), (E))
+#define __strtod_l(S, E, L)         strtod((S), (E))
+#define __strtold_l(S, E, L)        strtold((S), (E))
+#warning should dummy __newlocale check for C|POSIX ?
+#define __newlocale(a, b, c)        NULL
+#define __freelocale(a)             ((void)0)
+#define __duplocale(a)              __c_locale()
+#endif
+
+namespace std 
+{
+  template<>
+    void
+    __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, 
+                  const __c_locale& __cloc)
+    {
+      char* __sanity;
+      errno = 0;
+      float __f = __strtof_l(__s, &__sanity, __cloc);
+      if (__sanity != __s && errno != ERANGE)
+       __v = __f;
+      else
+       __err |= ios_base::failbit;
+    }
+
+  template<>
+    void
+    __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, 
+                  const __c_locale& __cloc)
+    {
+      char* __sanity;
+      errno = 0;
+      double __d = __strtod_l(__s, &__sanity, __cloc);
+      if (__sanity != __s && errno != ERANGE)
+       __v = __d;
+      else
+       __err |= ios_base::failbit;
+    }
+
+  template<>
+    void
+    __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
+                  const __c_locale& __cloc)
+    {
+      char* __sanity;
+      errno = 0;
+      long double __ld = __strtold_l(__s, &__sanity, __cloc);
+      if (__sanity != __s && errno != ERANGE)
+       __v = __ld;
+      else
+       __err |= ios_base::failbit;
+    }
+
+  void
+  locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s, 
+                                   __c_locale __old)
+  {
+    __cloc = __newlocale(1 << LC_ALL, __s, __old);
+#ifdef __UCLIBC_HAS_XLOCALE__
+    if (!__cloc)
+      {
+       // This named locale is not supported by the underlying OS.
+       __throw_runtime_error(__N("locale::facet::_S_create_c_locale "
+                             "name not valid"));
+      }
+#endif
+  }
+  
+  void
+  locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
+  {
+    if (__cloc && _S_get_c_locale() != __cloc)
+      __freelocale(__cloc); 
+  }
+
+  __c_locale
+  locale::facet::_S_clone_c_locale(__c_locale& __cloc)
+  { return __duplocale(__cloc); }
+} // namespace std
+
+namespace __gnu_cxx
+{
+  const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
+    {
+      "LC_CTYPE", 
+      "LC_NUMERIC",
+      "LC_TIME", 
+      "LC_COLLATE", 
+      "LC_MONETARY",
+      "LC_MESSAGES", 
+#if _GLIBCXX_NUM_CATEGORIES != 0
+      "LC_PAPER", 
+      "LC_NAME", 
+      "LC_ADDRESS",
+      "LC_TELEPHONE", 
+      "LC_MEASUREMENT", 
+      "LC_IDENTIFICATION" 
+#endif
+    };
+}
+
+namespace std
+{
+  const char* const* const locale::_S_categories = __gnu_cxx::category_names;
+}  // namespace std
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h gcc-4.1.1/libstdc++-v3/config/locale/uclibc/c_locale.h
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/c_locale.h      2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,117 @@
+// Wrapper for underlying C-language localization -*- C++ -*-
+
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.8  Standard locale categories.
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#ifndef _C_LOCALE_H
+#define _C_LOCALE_H 1
+
+#pragma GCC system_header
+
+#include <cstring>              // get std::strlen
+#include <cstdio>               // get std::snprintf or std::sprintf
+#include <clocale>
+#include <langinfo.h>          // For codecvt
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning fix this
+#endif
+#ifdef __UCLIBC_HAS_LOCALE__
+#include <iconv.h>             // For codecvt using iconv, iconv_t
+#endif
+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
+#include <libintl.h>           // For messages
+#endif
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning what is _GLIBCXX_C_LOCALE_GNU for
+#endif
+#define _GLIBCXX_C_LOCALE_GNU 1
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning fix categories
+#endif
+// #define _GLIBCXX_NUM_CATEGORIES 6
+#define _GLIBCXX_NUM_CATEGORIES 0
+ 
+#ifdef __UCLIBC_HAS_XLOCALE__
+namespace __gnu_cxx
+{
+  extern "C" __typeof(uselocale) __uselocale;
+}
+#endif
+
+namespace std
+{
+#ifdef __UCLIBC_HAS_XLOCALE__
+  typedef __locale_t           __c_locale;
+#else
+  typedef int*                 __c_locale;
+#endif
+
+  // Convert numeric value of type _Tv to string and return length of
+  // string.  If snprintf is available use it, otherwise fall back to
+  // the unsafe sprintf which, in general, can be dangerous and should
+  // be avoided.
+  template<typename _Tv>
+    int
+    __convert_from_v(char* __out, 
+                    const int __size __attribute__ ((__unused__)),
+                    const char* __fmt,
+#ifdef __UCLIBC_HAS_XLOCALE__
+                    _Tv __v, const __c_locale& __cloc, int __prec)
+    {
+      __c_locale __old = __gnu_cxx::__uselocale(__cloc);
+#else
+                    _Tv __v, const __c_locale&, int __prec)
+    {
+# ifdef __UCLIBC_HAS_LOCALE__
+      char* __old = std::setlocale(LC_ALL, NULL);
+      char* __sav = new char[std::strlen(__old) + 1];
+      std::strcpy(__sav, __old);
+      std::setlocale(LC_ALL, "C");
+# endif
+#endif
+
+      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+      __gnu_cxx::__uselocale(__old);
+#elif defined __UCLIBC_HAS_LOCALE__
+      std::setlocale(LC_ALL, __sav);
+      delete [] __sav;
+#endif
+      return __ret;
+    }
+}
+
+#endif
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc gcc-4.1.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc      2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,306 @@
+// std::codecvt implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.1.5 - Template class codecvt
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+#include <bits/c++locale_internal.h>
+
+namespace std
+{
+  // Specializations.
+#ifdef _GLIBCXX_USE_WCHAR_T
+  codecvt_base::result
+  codecvt<wchar_t, char, mbstate_t>::
+  do_out(state_type& __state, const intern_type* __from, 
+        const intern_type* __from_end, const intern_type*& __from_next,
+        extern_type* __to, extern_type* __to_end,
+        extern_type*& __to_next) const
+  {
+    result __ret = ok;
+    state_type __tmp_state(__state);
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
+#endif
+
+    // wcsnrtombs is *very* fast but stops if encounters NUL characters:
+    // in case we fall back to wcrtomb and then continue, in a loop.
+    // NB: wcsnrtombs is a GNU extension
+    for (__from_next = __from, __to_next = __to;
+        __from_next < __from_end && __to_next < __to_end
+        && __ret == ok;)
+      {
+       const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0',
+                                                     __from_end - __from_next);
+       if (!__from_chunk_end)
+         __from_chunk_end = __from_end;
+
+       __from = __from_next;
+       const size_t __conv = wcsnrtombs(__to_next, &__from_next,
+                                        __from_chunk_end - __from_next,
+                                        __to_end - __to_next, &__state);
+       if (__conv == static_cast<size_t>(-1))
+         {
+           // In case of error, in order to stop at the exact place we
+           // have to start again from the beginning with a series of
+           // wcrtomb.
+           for (; __from < __from_next; ++__from)
+             __to_next += wcrtomb(__to_next, *__from, &__tmp_state);
+           __state = __tmp_state;
+           __ret = error;
+         }
+       else if (__from_next && __from_next < __from_chunk_end)
+         {
+           __to_next += __conv;
+           __ret = partial;
+         }
+       else
+         {
+           __from_next = __from_chunk_end;
+           __to_next += __conv;
+         }
+
+       if (__from_next < __from_end && __ret == ok)
+         {
+           extern_type __buf[MB_LEN_MAX];
+           __tmp_state = __state;
+           const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state);
+           if (__conv > static_cast<size_t>(__to_end - __to_next))
+             __ret = partial;
+           else
+             {
+               memcpy(__to_next, __buf, __conv);
+               __state = __tmp_state;
+               __to_next += __conv;
+               ++__from_next;
+             }
+         }
+      }
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __uselocale(__old);
+#endif
+
+    return __ret; 
+  }
+  
+  codecvt_base::result
+  codecvt<wchar_t, char, mbstate_t>::
+  do_in(state_type& __state, const extern_type* __from, 
+       const extern_type* __from_end, const extern_type*& __from_next,
+       intern_type* __to, intern_type* __to_end,
+       intern_type*& __to_next) const
+  {
+    result __ret = ok;
+    state_type __tmp_state(__state);
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
+#endif
+
+    // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
+    // in case we store a L'\0' and then continue, in a loop.
+    // NB: mbsnrtowcs is a GNU extension
+    for (__from_next = __from, __to_next = __to;
+        __from_next < __from_end && __to_next < __to_end
+        && __ret == ok;)
+      {
+       const extern_type* __from_chunk_end;
+       __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0',
+                                                                 __from_end
+                                                                 - __from_next));
+       if (!__from_chunk_end)
+         __from_chunk_end = __from_end;
+
+       __from = __from_next;
+       size_t __conv = mbsnrtowcs(__to_next, &__from_next,
+                                  __from_chunk_end - __from_next,
+                                  __to_end - __to_next, &__state);
+       if (__conv == static_cast<size_t>(-1))
+         {
+           // In case of error, in order to stop at the exact place we
+           // have to start again from the beginning with a series of
+           // mbrtowc.
+           for (;; ++__to_next, __from += __conv)
+             {
+               __conv = mbrtowc(__to_next, __from, __from_end - __from,
+                                &__tmp_state);
+               if (__conv == static_cast<size_t>(-1)
+                   || __conv == static_cast<size_t>(-2))
+                 break;
+             }
+           __from_next = __from;
+           __state = __tmp_state;          
+           __ret = error;
+         }
+       else if (__from_next && __from_next < __from_chunk_end)
+         {
+           // It is unclear what to return in this case (see DR 382). 
+           __to_next += __conv;
+           __ret = partial;
+         }
+       else
+         {
+           __from_next = __from_chunk_end;
+           __to_next += __conv;
+         }
+
+       if (__from_next < __from_end && __ret == ok)
+         {
+           if (__to_next < __to_end)
+             {
+               // XXX Probably wrong for stateful encodings
+               __tmp_state = __state;          
+               ++__from_next;
+               *__to_next++ = L'\0';
+             }
+           else
+             __ret = partial;
+         }
+      }
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __uselocale(__old);
+#endif
+
+    return __ret; 
+  }
+
+  int 
+  codecvt<wchar_t, char, mbstate_t>::
+  do_encoding() const throw()
+  {
+    // XXX This implementation assumes that the encoding is
+    // stateless and is either single-byte or variable-width.
+    int __ret = 0;
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
+#endif
+    if (MB_CUR_MAX == 1)
+      __ret = 1;
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __uselocale(__old);
+#endif
+    return __ret;
+  }  
+
+  int 
+  codecvt<wchar_t, char, mbstate_t>::
+  do_max_length() const throw()
+  {
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
+#endif
+    // XXX Probably wrong for stateful encodings.
+    int __ret = MB_CUR_MAX;
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __uselocale(__old);
+#endif
+    return __ret;
+  }
+  
+  int 
+  codecvt<wchar_t, char, mbstate_t>::
+  do_length(state_type& __state, const extern_type* __from,
+           const extern_type* __end, size_t __max) const
+  {
+    int __ret = 0;
+    state_type __tmp_state(__state);
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __c_locale __old = __uselocale(_M_c_locale_codecvt);
+#endif
+
+    // mbsnrtowcs is *very* fast but stops if encounters NUL characters:
+    // in case we advance past it and then continue, in a loop.
+    // NB: mbsnrtowcs is a GNU extension
+  
+    // A dummy internal buffer is needed in order for mbsnrtocws to consider
+    // its fourth parameter (it wouldn't with NULL as first parameter).
+    wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t) 
+                                                          * __max));
+    while (__from < __end && __max)
+      {
+       const extern_type* __from_chunk_end;
+       __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0',
+                                                                 __end
+                                                                 - __from));
+       if (!__from_chunk_end)
+         __from_chunk_end = __end;
+
+       const extern_type* __tmp_from = __from;
+       size_t __conv = mbsnrtowcs(__to, &__from,
+                                  __from_chunk_end - __from,
+                                  __max, &__state);
+       if (__conv == static_cast<size_t>(-1))
+         {
+           // In case of error, in order to stop at the exact place we
+           // have to start again from the beginning with a series of
+           // mbrtowc.
+           for (__from = __tmp_from;; __from += __conv)
+             {
+               __conv = mbrtowc(NULL, __from, __end - __from,
+                                &__tmp_state);
+               if (__conv == static_cast<size_t>(-1)
+                   || __conv == static_cast<size_t>(-2))
+                 break;
+             }
+           __state = __tmp_state;
+           __ret += __from - __tmp_from;
+           break;
+         }
+       if (!__from)
+         __from = __from_chunk_end;
+       
+       __ret += __from - __tmp_from;
+       __max -= __conv;
+
+       if (__from < __end && __max)
+         {
+           // XXX Probably wrong for stateful encodings
+           __tmp_state = __state;
+           ++__from;
+           ++__ret;
+           --__max;
+         }
+      }
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __uselocale(__old);
+#endif
+
+    return __ret; 
+  }
+#endif
+}
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc gcc-4.1.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/collate_members.cc      2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,80 @@
+// std::collate implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.4.1.2  collate virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+#include <bits/c++locale_internal.h>
+
+#ifndef __UCLIBC_HAS_XLOCALE__
+#define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
+#define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
+#define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
+#define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
+#endif
+
+namespace std
+{
+  // These are basically extensions to char_traits, and perhaps should
+  // be put there instead of here.
+  template<>
+    int 
+    collate<char>::_M_compare(const char* __one, const char* __two) const
+    { 
+      int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate);
+      return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
+    }
+  
+  template<>
+    size_t
+    collate<char>::_M_transform(char* __to, const char* __from, 
+                               size_t __n) const 
+    { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template<>
+    int 
+    collate<wchar_t>::_M_compare(const wchar_t* __one, 
+                                const wchar_t* __two) const
+    {
+      int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate);
+      return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0);
+    }
+  
+  template<>
+    size_t
+    collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from,
+                                  size_t __n) const
+    { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
+#endif
+}
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc gcc-4.1.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc   1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc        2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,314 @@
+// std::ctype implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.1.1.2  ctype virtual functions.
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#define _LIBC
+#include <locale>
+#undef _LIBC
+#include <bits/c++locale_internal.h>
+
+#ifndef __UCLIBC_HAS_XLOCALE__
+#define __wctype_l(S, L)           wctype((S))
+#define __towupper_l(C, L)         towupper((C))
+#define __towlower_l(C, L)         towlower((C))
+#define __iswctype_l(C, M, L)      iswctype((C), (M))
+#endif
+
+namespace std
+{
+  // NB: The other ctype<char> specializations are in src/locale.cc and
+  // various /config/os/* files.
+  template<>
+    ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
+    : ctype<char>(0, false, __refs) 
+    {          
+      if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
+       {
+         this->_S_destroy_c_locale(this->_M_c_locale_ctype);
+         this->_S_create_c_locale(this->_M_c_locale_ctype, __s); 
+#ifdef __UCLIBC_HAS_XLOCALE__
+         this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper;
+         this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower;
+         this->_M_table = this->_M_c_locale_ctype->__ctype_b;
+#endif
+       }
+    }
+
+#ifdef _GLIBCXX_USE_WCHAR_T  
+  ctype<wchar_t>::__wmask_type
+  ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
+  {
+    __wmask_type __ret;
+    switch (__m)
+      {
+      case space:
+       __ret = __wctype_l("space", _M_c_locale_ctype);
+       break;
+      case print:
+       __ret = __wctype_l("print", _M_c_locale_ctype);
+       break;
+      case cntrl:
+       __ret = __wctype_l("cntrl", _M_c_locale_ctype);
+       break;
+      case upper:
+       __ret = __wctype_l("upper", _M_c_locale_ctype);
+       break;
+      case lower:
+       __ret = __wctype_l("lower", _M_c_locale_ctype);
+       break;
+      case alpha:
+       __ret = __wctype_l("alpha", _M_c_locale_ctype);
+       break;
+      case digit:
+       __ret = __wctype_l("digit", _M_c_locale_ctype);
+       break;
+      case punct:
+       __ret = __wctype_l("punct", _M_c_locale_ctype);
+       break;
+      case xdigit:
+       __ret = __wctype_l("xdigit", _M_c_locale_ctype);
+       break;
+      case alnum:
+       __ret = __wctype_l("alnum", _M_c_locale_ctype);
+       break;
+      case graph:
+       __ret = __wctype_l("graph", _M_c_locale_ctype);
+       break;
+      default:
+       __ret = __wmask_type();
+      }
+    return __ret;
+  }
+  
+  wchar_t
+  ctype<wchar_t>::do_toupper(wchar_t __c) const
+  { return __towupper_l(__c, _M_c_locale_ctype); }
+
+  const wchar_t*
+  ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const
+  {
+    while (__lo < __hi)
+      {
+        *__lo = __towupper_l(*__lo, _M_c_locale_ctype);
+        ++__lo;
+      }
+    return __hi;
+  }
+  
+  wchar_t
+  ctype<wchar_t>::do_tolower(wchar_t __c) const
+  { return __towlower_l(__c, _M_c_locale_ctype); }
+  
+  const wchar_t*
+  ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const
+  {
+    while (__lo < __hi)
+      {
+        *__lo = __towlower_l(*__lo, _M_c_locale_ctype);
+        ++__lo;
+      }
+    return __hi;
+  }
+
+  bool
+  ctype<wchar_t>::
+  do_is(mask __m, wchar_t __c) const
+  { 
+    // The case of __m == ctype_base::space is particularly important,
+    // due to its use in many istream functions.  Therefore we deal with
+    // it first, exploiting the knowledge that on GNU systems _M_bit[5]
+    // is the mask corresponding to ctype_base::space.  NB: an encoding
+    // change would not affect correctness!
+    bool __ret = false;
+    if (__m == _M_bit[5])
+      __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype);
+    else
+      {
+       // Highest bitmask in ctype_base == 10, but extra in "C"
+       // library for blank.
+       const size_t __bitmasksize = 11;
+       for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
+         if (__m & _M_bit[__bitcur])
+           {
+             if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
+               {
+                 __ret = true;
+                 break;
+               }
+             else if (__m == _M_bit[__bitcur])
+               break;
+           }
+      }
+    return __ret;    
+  }
+
+  const wchar_t* 
+  ctype<wchar_t>::
+  do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
+  {
+    for (; __lo < __hi; ++__vec, ++__lo)
+      {
+       // Highest bitmask in ctype_base == 10, but extra in "C"
+       // library for blank.
+       const size_t __bitmasksize = 11; 
+       mask __m = 0;
+       for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
+         if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype))
+           __m |= _M_bit[__bitcur];
+       *__vec = __m;
+      }
+    return __hi;
+  }
+  
+  const wchar_t* 
+  ctype<wchar_t>::
+  do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
+  {
+    while (__lo < __hi && !this->do_is(__m, *__lo))
+      ++__lo;
+    return __lo;
+  }
+
+  const wchar_t*
+  ctype<wchar_t>::
+  do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const
+  {
+    while (__lo < __hi && this->do_is(__m, *__lo) != 0)
+      ++__lo;
+    return __lo;
+  }
+
+  wchar_t
+  ctype<wchar_t>::
+  do_widen(char __c) const
+  { return _M_widen[static_cast<unsigned char>(__c)]; }
+
+  const char* 
+  ctype<wchar_t>::
+  do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
+  {
+    while (__lo < __hi)
+      {
+       *__dest = _M_widen[static_cast<unsigned char>(*__lo)];
+       ++__lo;
+       ++__dest;
+      }
+    return __hi;
+  }
+
+  char
+  ctype<wchar_t>::
+  do_narrow(wchar_t __wc, char __dfault) const
+  {
+    if (__wc >= 0 && __wc < 128 && _M_narrow_ok)
+      return _M_narrow[__wc];
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __c_locale __old = __uselocale(_M_c_locale_ctype);
+#endif
+    const int __c = wctob(__wc);
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __uselocale(__old);
+#endif
+    return (__c == EOF ? __dfault : static_cast<char>(__c)); 
+  }
+
+  const wchar_t*
+  ctype<wchar_t>::
+  do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, 
+           char* __dest) const
+  {
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __c_locale __old = __uselocale(_M_c_locale_ctype);
+#endif
+    if (_M_narrow_ok)
+      while (__lo < __hi)
+       {
+         if (*__lo >= 0 && *__lo < 128)
+           *__dest = _M_narrow[*__lo];
+         else
+           {
+             const int __c = wctob(*__lo);
+             *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
+           }
+         ++__lo;
+         ++__dest;
+       }
+    else
+      while (__lo < __hi)
+       {
+         const int __c = wctob(*__lo);
+         *__dest = (__c == EOF ? __dfault : static_cast<char>(__c));
+         ++__lo;
+         ++__dest;
+       }
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __uselocale(__old);
+#endif
+    return __hi;
+  }
+
+  void
+  ctype<wchar_t>::_M_initialize_ctype()
+  {
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __c_locale __old = __uselocale(_M_c_locale_ctype);
+#endif
+    wint_t __i;
+    for (__i = 0; __i < 128; ++__i)
+      {
+       const int __c = wctob(__i);
+       if (__c == EOF)
+         break;
+       else
+         _M_narrow[__i] = static_cast<char>(__c);
+      }
+    if (__i == 128)
+      _M_narrow_ok = true;
+    else
+      _M_narrow_ok = false;
+    for (size_t __j = 0;
+        __j < sizeof(_M_widen) / sizeof(wint_t); ++__j)
+      _M_widen[__j] = btowc(__j);
+
+    for (size_t __k = 0; __k <= 11; ++__k)
+      { 
+       _M_bit[__k] = static_cast<mask>(_ISbit(__k));
+       _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]);
+      }
+#ifdef __UCLIBC_HAS_XLOCALE__
+    __uselocale(__old);
+#endif
+  }
+#endif //  _GLIBCXX_USE_WCHAR_T
+}
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc gcc-4.1.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc        1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/messages_members.cc     2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,100 @@
+// std::messages implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.7.1.2  messages virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+#include <bits/c++locale_internal.h>
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning fix gettext stuff
+#endif
+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
+extern "C" char *__dcgettext(const char *domainname,
+                            const char *msgid, int category);
+#undef gettext
+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES)
+#else
+#undef gettext
+#define gettext(msgid) (msgid)
+#endif
+
+namespace std
+{
+  // Specializations.
+  template<>
+    string
+    messages<char>::do_get(catalog, int, int, const string& __dfault) const
+    {
+#ifdef __UCLIBC_HAS_XLOCALE__
+      __c_locale __old = __uselocale(_M_c_locale_messages);
+      const char* __msg = const_cast<const char*>(gettext(__dfault.c_str()));
+      __uselocale(__old);
+      return string(__msg);
+#elif defined __UCLIBC_HAS_LOCALE__
+      char* __old = strdup(setlocale(LC_ALL, NULL));
+      setlocale(LC_ALL, _M_name_messages);
+      const char* __msg = gettext(__dfault.c_str());
+      setlocale(LC_ALL, __old);
+      free(__old);
+      return string(__msg);
+#else
+      const char* __msg = gettext(__dfault.c_str());
+      return string(__msg);
+#endif
+    }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template<>
+    wstring
+    messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const
+    {
+# ifdef __UCLIBC_HAS_XLOCALE__
+      __c_locale __old = __uselocale(_M_c_locale_messages);
+      char* __msg = gettext(_M_convert_to_char(__dfault));
+      __uselocale(__old);
+      return _M_convert_from_char(__msg);
+# elif defined __UCLIBC_HAS_LOCALE__
+      char* __old = strdup(setlocale(LC_ALL, NULL));
+      setlocale(LC_ALL, _M_name_messages);
+      char* __msg = gettext(_M_convert_to_char(__dfault));
+      setlocale(LC_ALL, __old);
+      free(__old);
+      return _M_convert_from_char(__msg);
+# else
+      char* __msg = gettext(_M_convert_to_char(__dfault));
+      return _M_convert_from_char(__msg);
+# endif
+    }
+#endif
+}
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.1.1/libstdc++-v3/config/locale/uclibc/messages_members.h
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/messages_members.h      2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,121 @@
+// std::messages implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.7.1.2  messages functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning fix prototypes for *textdomain funcs
+#endif
+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
+extern "C" char *__textdomain(const char *domainname);
+extern "C" char *__bindtextdomain(const char *domainname,
+                                 const char *dirname);
+#else
+#undef __textdomain
+#undef __bindtextdomain
+#define __textdomain(D)           ((void)0)
+#define __bindtextdomain(D,P)     ((void)0)
+#endif
+
+  // Non-virtual member functions.
+  template<typename _CharT>
+     messages<_CharT>::messages(size_t __refs)
+     : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), 
+       _M_name_messages(_S_get_c_name())
+     { }
+
+  template<typename _CharT>
+     messages<_CharT>::messages(__c_locale __cloc, const char* __s, 
+                               size_t __refs) 
+     : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
+     {
+       const size_t __len = std::strlen(__s) + 1;
+       char* __tmp = new char[__len];
+       std::memcpy(__tmp, __s, __len);
+       _M_name_messages = __tmp;
+
+       // Last to avoid leaking memory if new throws.
+       _M_c_locale_messages = _S_clone_c_locale(__cloc);
+     }
+
+  template<typename _CharT>
+    typename messages<_CharT>::catalog 
+    messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 
+                          const char* __dir) const
+    { 
+      __bindtextdomain(__s.c_str(), __dir);
+      return this->do_open(__s, __loc); 
+    }
+
+  // Virtual member functions.
+  template<typename _CharT>
+    messages<_CharT>::~messages()
+    { 
+      if (_M_name_messages != _S_get_c_name())
+       delete [] _M_name_messages;
+      _S_destroy_c_locale(_M_c_locale_messages); 
+    }
+
+  template<typename _CharT>
+    typename messages<_CharT>::catalog 
+    messages<_CharT>::do_open(const basic_string<char>& __s, 
+                             const locale&) const
+    { 
+      // No error checking is done, assume the catalog exists and can
+      // be used.
+      __textdomain(__s.c_str());
+      return 0;
+    }
+
+  template<typename _CharT>
+    void    
+    messages<_CharT>::do_close(catalog) const 
+    { }
+
+   // messages_byname
+   template<typename _CharT>
+     messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs)
+     : messages<_CharT>(__refs) 
+     { 
+       if (this->_M_name_messages != locale::facet::_S_get_c_name())
+        delete [] this->_M_name_messages;
+       char* __tmp = new char[std::strlen(__s) + 1];
+       std::strcpy(__tmp, __s);
+       this->_M_name_messages = __tmp;
+
+       if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0)
+        {
+          this->_S_destroy_c_locale(this->_M_c_locale_messages);
+          this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
+        }
+     }
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc gcc-4.1.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc        1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc     2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,692 @@
+// std::moneypunct implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.6.3.2  moneypunct virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#define _LIBC
+#include <locale>
+#undef _LIBC
+#include <bits/c++locale_internal.h>
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning optimize this for uclibc
+#warning tailor for stub locale support
+#endif
+
+#ifndef __UCLIBC_HAS_XLOCALE__
+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
+#endif
+
+namespace std
+{
+  // Construct and return valid pattern consisting of some combination of:
+  // space none symbol sign value
+  money_base::pattern
+  money_base::_S_construct_pattern(char __precedes, char __space, char __posn)
+  { 
+    pattern __ret;
+
+    // This insanely complicated routine attempts to construct a valid
+    // pattern for use with monyepunct. A couple of invariants:
+
+    // if (__precedes) symbol -> value
+    // else value -> symbol
+    
+    // if (__space) space
+    // else none
+
+    // none == never first
+    // space never first or last
+
+    // Any elegant implementations of this are welcome.
+    switch (__posn)
+      {
+      case 0:
+      case 1:
+       // 1 The sign precedes the value and symbol.
+       __ret.field[0] = sign;
+       if (__space)
+         {
+           // Pattern starts with sign.
+           if (__precedes)
+             {
+               __ret.field[1] = symbol;
+               __ret.field[3] = value;
+             }
+           else
+             {
+               __ret.field[1] = value;
+               __ret.field[3] = symbol;
+             }
+           __ret.field[2] = space;
+         }
+       else
+         {
+           // Pattern starts with sign and ends with none.
+           if (__precedes)
+             {
+               __ret.field[1] = symbol;
+               __ret.field[2] = value;
+             }
+           else
+             {
+               __ret.field[1] = value;
+               __ret.field[2] = symbol;
+             }
+           __ret.field[3] = none;
+         }
+       break;
+      case 2:
+       // 2 The sign follows the value and symbol.
+       if (__space)
+         {
+           // Pattern either ends with sign.
+           if (__precedes)
+             {
+               __ret.field[0] = symbol;
+               __ret.field[2] = value;
+             }
+           else
+             {
+               __ret.field[0] = value;
+               __ret.field[2] = symbol;
+             }
+           __ret.field[1] = space;
+           __ret.field[3] = sign;
+         }
+       else
+         {
+           // Pattern ends with sign then none.
+           if (__precedes)
+             {
+               __ret.field[0] = symbol;
+               __ret.field[1] = value;
+             }
+           else
+             {
+               __ret.field[0] = value;
+               __ret.field[1] = symbol;
+             }
+           __ret.field[2] = sign;
+           __ret.field[3] = none;
+         }
+       break;
+      case 3:
+       // 3 The sign immediately precedes the symbol.
+       if (__precedes)
+         {
+           __ret.field[0] = sign;
+           __ret.field[1] = symbol;        
+           if (__space)
+             {
+               __ret.field[2] = space;
+               __ret.field[3] = value;
+             }
+           else
+             {
+               __ret.field[2] = value;         
+               __ret.field[3] = none;
+             }
+         }
+       else
+         {
+           __ret.field[0] = value;
+           if (__space)
+             {
+               __ret.field[1] = space;
+               __ret.field[2] = sign;
+               __ret.field[3] = symbol;
+             }
+           else
+             {
+               __ret.field[1] = sign;
+               __ret.field[2] = symbol;
+               __ret.field[3] = none;
+             }
+         }
+       break;
+      case 4:
+       // 4 The sign immediately follows the symbol.
+       if (__precedes)
+         {
+           __ret.field[0] = symbol;
+           __ret.field[1] = sign;
+           if (__space)
+             {
+               __ret.field[2] = space;
+               __ret.field[3] = value;
+             }
+           else
+             {
+               __ret.field[2] = value;
+               __ret.field[3] = none;
+             }
+         }
+       else
+         {
+           __ret.field[0] = value;
+           if (__space)
+             {
+               __ret.field[1] = space;
+               __ret.field[2] = symbol;
+               __ret.field[3] = sign;
+             }
+           else
+             {
+               __ret.field[1] = symbol;
+               __ret.field[2] = sign;
+               __ret.field[3] = none;
+             }
+         }
+       break;
+      default:
+       __ret = pattern();
+      }
+    return __ret;
+  }
+
+  template<> 
+    void
+    moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, 
+                                                    const char*)
+    {
+      if (!_M_data)
+       _M_data = new __moneypunct_cache<char, true>;
+
+      if (!__cloc)
+       {
+         // "C" locale
+         _M_data->_M_decimal_point = '.';
+         _M_data->_M_thousands_sep = ',';
+         _M_data->_M_grouping = "";
+         _M_data->_M_grouping_size = 0;
+         _M_data->_M_curr_symbol = "";
+         _M_data->_M_curr_symbol_size = 0;
+         _M_data->_M_positive_sign = "";
+         _M_data->_M_positive_sign_size = 0;
+         _M_data->_M_negative_sign = "";
+         _M_data->_M_negative_sign_size = 0;
+         _M_data->_M_frac_digits = 0;
+         _M_data->_M_pos_format = money_base::_S_default_pattern;
+         _M_data->_M_neg_format = money_base::_S_default_pattern;
+
+         for (size_t __i = 0; __i < money_base::_S_end; ++__i)
+           _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
+       }
+      else
+       {
+         // Named locale.
+         _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, 
+                                                       __cloc));
+         _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, 
+                                                       __cloc));
+         _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
+         _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
+         _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
+         _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
+
+         char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
+         if (!__nposn)
+           _M_data->_M_negative_sign = "()";
+         else
+           _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, 
+                                                       __cloc);
+         _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
+
+         // _Intl == true
+         _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
+         _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
+         _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, 
+                                                     __cloc));
+         char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
+         char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
+         char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
+         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
+                                                       __pposn);
+         char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
+         char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
+         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
+                                                       __nposn);
+       }
+    }
+
+  template<> 
+    void
+    moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, 
+                                                     const char*)
+    {
+      if (!_M_data)
+       _M_data = new __moneypunct_cache<char, false>;
+
+      if (!__cloc)
+       {
+         // "C" locale
+         _M_data->_M_decimal_point = '.';
+         _M_data->_M_thousands_sep = ',';
+         _M_data->_M_grouping = "";
+         _M_data->_M_grouping_size = 0;
+         _M_data->_M_curr_symbol = "";
+         _M_data->_M_curr_symbol_size = 0;
+         _M_data->_M_positive_sign = "";
+         _M_data->_M_positive_sign_size = 0;
+         _M_data->_M_negative_sign = "";
+         _M_data->_M_negative_sign_size = 0;
+         _M_data->_M_frac_digits = 0;
+         _M_data->_M_pos_format = money_base::_S_default_pattern;
+         _M_data->_M_neg_format = money_base::_S_default_pattern;
+
+         for (size_t __i = 0; __i < money_base::_S_end; ++__i)
+           _M_data->_M_atoms[__i] = money_base::_S_atoms[__i];
+       }
+      else
+       {
+         // Named locale.
+         _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, 
+                                                       __cloc));
+         _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, 
+                                                       __cloc));
+         _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
+         _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
+         _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
+         _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign);
+
+         char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
+         if (!__nposn)
+           _M_data->_M_negative_sign = "()";
+         else
+           _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
+                                                       __cloc);
+         _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign);
+
+         // _Intl == false
+         _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
+         _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol);
+         _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
+         char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
+         char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
+         char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
+         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
+                                                       __pposn);
+         char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
+         char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
+         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
+                                                       __nposn);
+       }
+    }
+
+  template<> 
+    moneypunct<char, true>::~moneypunct()
+    { delete _M_data; }
+
+  template<> 
+    moneypunct<char, false>::~moneypunct()
+    { delete _M_data; }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template<> 
+    void
+    moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, 
+#ifdef __UCLIBC_HAS_XLOCALE__
+                                                       const char*)
+#else
+                                                       const char* __name)
+#endif
+    {
+      if (!_M_data)
+       _M_data = new __moneypunct_cache<wchar_t, true>;
+
+      if (!__cloc)
+       {
+         // "C" locale
+         _M_data->_M_decimal_point = L'.';
+         _M_data->_M_thousands_sep = L',';
+         _M_data->_M_grouping = "";
+         _M_data->_M_grouping_size = 0;
+         _M_data->_M_curr_symbol = L"";
+         _M_data->_M_curr_symbol_size = 0;
+         _M_data->_M_positive_sign = L"";
+         _M_data->_M_positive_sign_size = 0;
+         _M_data->_M_negative_sign = L"";
+         _M_data->_M_negative_sign_size = 0;
+         _M_data->_M_frac_digits = 0;
+         _M_data->_M_pos_format = money_base::_S_default_pattern;
+         _M_data->_M_neg_format = money_base::_S_default_pattern;
+
+         // Use ctype::widen code without the facet...
+         for (size_t __i = 0; __i < money_base::_S_end; ++__i)
+           _M_data->_M_atoms[__i] =
+             static_cast<wchar_t>(money_base::_S_atoms[__i]);
+       }
+      else
+       {
+         // Named locale.
+#ifdef __UCLIBC_HAS_XLOCALE__
+         __c_locale __old = __uselocale(__cloc);
+#else
+         // Switch to named locale so that mbsrtowcs will work.
+         char* __old = strdup(setlocale(LC_ALL, NULL));
+         setlocale(LC_ALL, __name);
+#endif
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning fix this... should be monetary
+#endif
+#ifdef __UCLIBC__
+# ifdef __UCLIBC_HAS_XLOCALE__
+         _M_data->_M_decimal_point = __cloc->decimal_point_wc;
+         _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
+# elif defined __UCLIBC_HAS_LOCALE__
+         _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
+         _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
+# endif
+#else
+         union { char *__s; wchar_t __w; } __u;
+         __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
+         _M_data->_M_decimal_point = __u.__w;
+
+         __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
+         _M_data->_M_thousands_sep = __u.__w;
+#endif
+         _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
+         _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
+
+         const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
+         const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
+         const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc);
+
+         wchar_t* __wcs_ps = 0;
+         wchar_t* __wcs_ns = 0;
+         const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc));
+         try
+           {
+             mbstate_t __state;
+             size_t __len = strlen(__cpossign);
+             if (__len)
+               {
+                 ++__len;
+                 memset(&__state, 0, sizeof(mbstate_t));
+                 __wcs_ps = new wchar_t[__len];
+                 mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
+                 _M_data->_M_positive_sign = __wcs_ps;
+               }
+             else
+               _M_data->_M_positive_sign = L"";
+             _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
+             
+             __len = strlen(__cnegsign);
+             if (!__nposn)
+               _M_data->_M_negative_sign = L"()";
+             else if (__len)
+               { 
+                 ++__len;
+                 memset(&__state, 0, sizeof(mbstate_t));
+                 __wcs_ns = new wchar_t[__len];
+                 mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
+                 _M_data->_M_negative_sign = __wcs_ns;
+               }
+             else
+               _M_data->_M_negative_sign = L"";
+             _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
+             
+             // _Intl == true.
+             __len = strlen(__ccurr);
+             if (__len)
+               {
+                 ++__len;
+                 memset(&__state, 0, sizeof(mbstate_t));
+                 wchar_t* __wcs = new wchar_t[__len];
+                 mbsrtowcs(__wcs, &__ccurr, __len, &__state);
+                 _M_data->_M_curr_symbol = __wcs;
+               }
+             else
+               _M_data->_M_curr_symbol = L"";
+             _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
+           }
+         catch (...)
+           {
+             delete _M_data;
+             _M_data = 0;
+             delete __wcs_ps;
+             delete __wcs_ns;        
+#ifdef __UCLIBC_HAS_XLOCALE__
+             __uselocale(__old);
+#else
+             setlocale(LC_ALL, __old);
+             free(__old);
+#endif
+             __throw_exception_again;
+           } 
+         
+         _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, 
+                                                     __cloc));
+         char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc));
+         char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc));
+         char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc));
+         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
+                                                       __pposn);
+         char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc));
+         char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc));
+         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
+                                                       __nposn);
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+         __uselocale(__old);
+#else
+         setlocale(LC_ALL, __old);
+         free(__old);
+#endif
+       }
+    }
+
+  template<> 
+  void
+  moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
+#ifdef __UCLIBC_HAS_XLOCALE__
+                                                      const char*)
+#else
+                                                       const char* __name)
+#endif
+  {
+    if (!_M_data)
+      _M_data = new __moneypunct_cache<wchar_t, false>;
+
+    if (!__cloc)
+       {
+         // "C" locale
+         _M_data->_M_decimal_point = L'.';
+         _M_data->_M_thousands_sep = L',';
+         _M_data->_M_grouping = "";
+          _M_data->_M_grouping_size = 0;
+         _M_data->_M_curr_symbol = L"";
+         _M_data->_M_curr_symbol_size = 0;
+         _M_data->_M_positive_sign = L"";
+         _M_data->_M_positive_sign_size = 0;
+         _M_data->_M_negative_sign = L"";
+         _M_data->_M_negative_sign_size = 0;
+         _M_data->_M_frac_digits = 0;
+         _M_data->_M_pos_format = money_base::_S_default_pattern;
+         _M_data->_M_neg_format = money_base::_S_default_pattern;
+
+         // Use ctype::widen code without the facet...
+         for (size_t __i = 0; __i < money_base::_S_end; ++__i)
+           _M_data->_M_atoms[__i] =
+             static_cast<wchar_t>(money_base::_S_atoms[__i]);
+       }
+      else
+       {
+         // Named locale.
+#ifdef __UCLIBC_HAS_XLOCALE__
+         __c_locale __old = __uselocale(__cloc);
+#else
+         // Switch to named locale so that mbsrtowcs will work.
+         char* __old = strdup(setlocale(LC_ALL, NULL));
+         setlocale(LC_ALL, __name);
+#endif
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning fix this... should be monetary
+#endif
+#ifdef __UCLIBC__
+# ifdef __UCLIBC_HAS_XLOCALE__
+         _M_data->_M_decimal_point = __cloc->decimal_point_wc;
+         _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
+# elif defined __UCLIBC_HAS_LOCALE__
+         _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
+         _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
+# endif
+#else
+          union { char *__s; wchar_t __w; } __u;
+         __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc);
+         _M_data->_M_decimal_point = __u.__w;
+
+         __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc);
+         _M_data->_M_thousands_sep = __u.__w;
+#endif
+         _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc);
+          _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
+
+         const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc);
+         const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc);
+         const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc);
+
+         wchar_t* __wcs_ps = 0;
+         wchar_t* __wcs_ns = 0;
+         const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc));
+         try
+            {
+              mbstate_t __state;
+              size_t __len;
+              __len = strlen(__cpossign);
+              if (__len)
+                {
+                 ++__len;
+                 memset(&__state, 0, sizeof(mbstate_t));
+                 __wcs_ps = new wchar_t[__len];
+                 mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state);
+                 _M_data->_M_positive_sign = __wcs_ps;
+               }
+             else
+               _M_data->_M_positive_sign = L"";
+              _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign);
+             
+             __len = strlen(__cnegsign);
+             if (!__nposn)
+               _M_data->_M_negative_sign = L"()";
+             else if (__len)
+               { 
+                 ++__len;
+                 memset(&__state, 0, sizeof(mbstate_t));
+                 __wcs_ns = new wchar_t[__len];
+                 mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state);
+                 _M_data->_M_negative_sign = __wcs_ns;
+               }
+             else
+               _M_data->_M_negative_sign = L"";
+              _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign);
+
+             // _Intl == true.
+             __len = strlen(__ccurr);
+             if (__len)
+               {
+                 ++__len;
+                 memset(&__state, 0, sizeof(mbstate_t));
+                 wchar_t* __wcs = new wchar_t[__len];
+                 mbsrtowcs(__wcs, &__ccurr, __len, &__state);
+                 _M_data->_M_curr_symbol = __wcs;
+               }
+             else
+               _M_data->_M_curr_symbol = L"";
+              _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol);
+           }
+          catch (...)
+           {
+             delete _M_data;
+              _M_data = 0;
+             delete __wcs_ps;
+             delete __wcs_ns;        
+#ifdef __UCLIBC_HAS_XLOCALE__
+             __uselocale(__old);
+#else
+             setlocale(LC_ALL, __old);
+             free(__old);
+#endif
+              __throw_exception_again;
+           }
+
+         _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc));
+         char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc));
+         char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc));
+         char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc));
+         _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, 
+                                                       __pposn);
+         char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc));
+         char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc));
+         _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, 
+                                                       __nposn);
+
+#ifdef __UCLIBC_HAS_XLOCALE__
+         __uselocale(__old);
+#else
+         setlocale(LC_ALL, __old);
+         free(__old);
+#endif
+       }
+    }
+
+  template<> 
+    moneypunct<wchar_t, true>::~moneypunct()
+    {
+      if (_M_data->_M_positive_sign_size)
+       delete [] _M_data->_M_positive_sign;
+      if (_M_data->_M_negative_sign_size
+          && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
+       delete [] _M_data->_M_negative_sign;
+      if (_M_data->_M_curr_symbol_size)
+       delete [] _M_data->_M_curr_symbol;
+      delete _M_data;
+    }
+
+  template<> 
+    moneypunct<wchar_t, false>::~moneypunct()
+    {
+      if (_M_data->_M_positive_sign_size)
+       delete [] _M_data->_M_positive_sign;
+      if (_M_data->_M_negative_sign_size
+          && wcscmp(_M_data->_M_negative_sign, L"()") != 0)
+       delete [] _M_data->_M_negative_sign;
+      if (_M_data->_M_curr_symbol_size)
+       delete [] _M_data->_M_curr_symbol;
+      delete _M_data;
+    }
+#endif
+}
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc gcc-4.1.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc      2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,173 @@
+// std::numpunct implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.3.1.2  numpunct virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#define _LIBC
+#include <locale>
+#undef _LIBC
+#include <bits/c++locale_internal.h>
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning tailor for stub locale support
+#endif
+#ifndef __UCLIBC_HAS_XLOCALE__
+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
+#endif
+
+namespace std
+{
+  template<> 
+    void
+    numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
+    {
+      if (!_M_data)
+       _M_data = new __numpunct_cache<char>;
+
+      if (!__cloc)
+       {
+         // "C" locale
+         _M_data->_M_grouping = "";
+         _M_data->_M_grouping_size = 0;
+         _M_data->_M_use_grouping = false;
+
+         _M_data->_M_decimal_point = '.';
+         _M_data->_M_thousands_sep = ',';
+
+         for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
+           _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i];
+
+         for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
+           _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j];
+       }
+      else
+       {
+         // Named locale.
+         _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT, 
+                                                       __cloc));
+         _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP, 
+                                                       __cloc));
+
+         // Check for NULL, which implies no grouping.
+         if (_M_data->_M_thousands_sep == '\0')
+           _M_data->_M_grouping = "";
+         else
+           _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
+         _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
+       }
+
+      // NB: There is no way to extact this info from posix locales.
+      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
+      _M_data->_M_truename = "true";
+      _M_data->_M_truename_size = 4;
+      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
+      _M_data->_M_falsename = "false";
+      _M_data->_M_falsename_size = 5;
+    }
+ 
+  template<> 
+    numpunct<char>::~numpunct()
+    { delete _M_data; }
+   
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template<> 
+    void
+    numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
+    {
+      if (!_M_data)
+       _M_data = new __numpunct_cache<wchar_t>;
+
+      if (!__cloc)
+       {
+         // "C" locale
+         _M_data->_M_grouping = "";
+         _M_data->_M_grouping_size = 0;
+         _M_data->_M_use_grouping = false;
+
+         _M_data->_M_decimal_point = L'.';
+         _M_data->_M_thousands_sep = L',';
+
+         // Use ctype::widen code without the facet...
+         for (size_t __i = 0; __i < __num_base::_S_oend; ++__i)
+           _M_data->_M_atoms_out[__i] =
+             static_cast<wchar_t>(__num_base::_S_atoms_out[__i]);
+
+         for (size_t __j = 0; __j < __num_base::_S_iend; ++__j)
+           _M_data->_M_atoms_in[__j] =
+             static_cast<wchar_t>(__num_base::_S_atoms_in[__j]);
+       }
+      else
+       {
+         // Named locale.
+         // NB: In the GNU model wchar_t is always 32 bit wide.
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning fix this
+#endif
+#ifdef __UCLIBC__
+# ifdef __UCLIBC_HAS_XLOCALE__
+         _M_data->_M_decimal_point = __cloc->decimal_point_wc;
+         _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
+# elif defined __UCLIBC_HAS_LOCALE__
+         _M_data->_M_decimal_point = __global_locale->decimal_point_wc;
+         _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc;
+# endif
+#else
+         union { char *__s; wchar_t __w; } __u;
+         __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc);
+         _M_data->_M_decimal_point = __u.__w;
+
+         __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc);
+         _M_data->_M_thousands_sep = __u.__w;
+#endif
+
+         if (_M_data->_M_thousands_sep == L'\0')
+           _M_data->_M_grouping = "";
+         else
+           _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc);
+         _M_data->_M_grouping_size = strlen(_M_data->_M_grouping);
+       }
+
+      // NB: There is no way to extact this info from posix locales.
+      // _M_truename = __nl_langinfo_l(YESSTR, __cloc);
+      _M_data->_M_truename = L"true";
+      _M_data->_M_truename_size = 4;
+      // _M_falsename = __nl_langinfo_l(NOSTR, __cloc);
+      _M_data->_M_falsename = L"false";
+      _M_data->_M_falsename_size = 5;
+    }
+
+  template<> 
+    numpunct<wchar_t>::~numpunct()
+    { delete _M_data; }
+ #endif
+}
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc gcc-4.1.1/libstdc++-v3/config/locale/uclibc/time_members.cc
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc    1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,406 @@
+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
+
+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions
+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+#include <locale>
+#include <bits/c++locale_internal.h>
+
+#ifdef __UCLIBC_MJN3_ONLY__
+#warning tailor for stub locale support
+#endif
+#ifndef __UCLIBC_HAS_XLOCALE__
+#define __nl_langinfo_l(N, L)         nl_langinfo((N))
+#endif
+
+namespace std
+{
+  template<>
+    void
+    __timepunct<char>::
+    _M_put(char* __s, size_t __maxlen, const char* __format, 
+          const tm* __tm) const
+    {
+#ifdef __UCLIBC_HAS_XLOCALE__
+      const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
+                                       _M_c_locale_timepunct);
+#else
+      char* __old = strdup(setlocale(LC_ALL, NULL));
+      setlocale(LC_ALL, _M_name_timepunct);
+      const size_t __len = strftime(__s, __maxlen, __format, __tm);
+      setlocale(LC_ALL, __old);
+      free(__old);
+#endif
+      // Make sure __s is null terminated.
+      if (__len == 0)
+       __s[0] = '\0';
+    }
+
+  template<> 
+    void
+    __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
+    {
+      if (!_M_data)
+       _M_data = new __timepunct_cache<char>;
+
+      if (!__cloc)
+       {
+         // "C" locale
+         _M_c_locale_timepunct = _S_get_c_locale();
+
+         _M_data->_M_date_format = "%m/%d/%y";
+         _M_data->_M_date_era_format = "%m/%d/%y";
+         _M_data->_M_time_format = "%H:%M:%S";
+         _M_data->_M_time_era_format = "%H:%M:%S";
+         _M_data->_M_date_time_format = "";
+         _M_data->_M_date_time_era_format = "";
+         _M_data->_M_am = "AM";
+         _M_data->_M_pm = "PM";
+         _M_data->_M_am_pm_format = "";
+
+         // Day names, starting with "C"'s Sunday.
+         _M_data->_M_day1 = "Sunday";
+         _M_data->_M_day2 = "Monday";
+         _M_data->_M_day3 = "Tuesday";
+         _M_data->_M_day4 = "Wednesday";
+         _M_data->_M_day5 = "Thursday";
+         _M_data->_M_day6 = "Friday";
+         _M_data->_M_day7 = "Saturday";
+
+         // Abbreviated day names, starting with "C"'s Sun.
+         _M_data->_M_aday1 = "Sun";
+         _M_data->_M_aday2 = "Mon";
+         _M_data->_M_aday3 = "Tue";
+         _M_data->_M_aday4 = "Wed";
+         _M_data->_M_aday5 = "Thu";
+         _M_data->_M_aday6 = "Fri";
+         _M_data->_M_aday7 = "Sat";
+
+         // Month names, starting with "C"'s January.
+         _M_data->_M_month01 = "January";
+         _M_data->_M_month02 = "February";
+         _M_data->_M_month03 = "March";
+         _M_data->_M_month04 = "April";
+         _M_data->_M_month05 = "May";
+         _M_data->_M_month06 = "June";
+         _M_data->_M_month07 = "July";
+         _M_data->_M_month08 = "August";
+         _M_data->_M_month09 = "September";
+         _M_data->_M_month10 = "October";
+         _M_data->_M_month11 = "November";
+         _M_data->_M_month12 = "December";
+
+         // Abbreviated month names, starting with "C"'s Jan.
+         _M_data->_M_amonth01 = "Jan";
+         _M_data->_M_amonth02 = "Feb";
+         _M_data->_M_amonth03 = "Mar";
+         _M_data->_M_amonth04 = "Apr";
+         _M_data->_M_amonth05 = "May";
+         _M_data->_M_amonth06 = "Jun";
+         _M_data->_M_amonth07 = "Jul";
+         _M_data->_M_amonth08 = "Aug";
+         _M_data->_M_amonth09 = "Sep";
+         _M_data->_M_amonth10 = "Oct";
+         _M_data->_M_amonth11 = "Nov";
+         _M_data->_M_amonth12 = "Dec";
+       }
+      else
+       {
+         _M_c_locale_timepunct = _S_clone_c_locale(__cloc); 
+
+         _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc);
+         _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc);
+         _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc);
+         _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc);
+         _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc);
+         _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT,
+                                                            __cloc);
+         _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc);
+         _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc);
+         _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc);
+
+         // Day names, starting with "C"'s Sunday.
+         _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc);
+         _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc);
+         _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc);
+         _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc);
+         _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc);
+         _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc);
+         _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc);
+
+         // Abbreviated day names, starting with "C"'s Sun.
+         _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc);
+         _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc);
+         _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc);
+         _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc);
+         _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc);
+         _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc);
+         _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc);
+
+         // Month names, starting with "C"'s January.
+         _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc);
+         _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc);
+         _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc);
+         _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc);
+         _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc);
+         _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc);
+         _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc);
+         _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc);
+         _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc);
+         _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc);
+         _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc);
+         _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc);
+
+         // Abbreviated month names, starting with "C"'s Jan.
+         _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc);
+         _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc);
+         _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc);
+         _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc);
+         _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc);
+         _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc);
+         _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc);
+         _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc);
+         _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc);
+         _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc);
+         _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc);
+         _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc);
+       }
+    }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
+  template<>
+    void
+    __timepunct<wchar_t>::
+    _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, 
+          const tm* __tm) const
+    {
+#ifdef __UCLIBC_HAS_XLOCALE__
+      __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct);
+      const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
+                                       _M_c_locale_timepunct);
+#else
+      char* __old = strdup(setlocale(LC_ALL, NULL));
+      setlocale(LC_ALL, _M_name_timepunct);
+      const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
+      setlocale(LC_ALL, __old);
+      free(__old);
+#endif
+      // Make sure __s is null terminated.
+      if (__len == 0)
+       __s[0] = L'\0';
+    }
+
+  template<> 
+    void
+    __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
+    {
+      if (!_M_data)
+       _M_data = new __timepunct_cache<wchar_t>;
+
+#warning wide time stuff
+//       if (!__cloc)
+       {
+         // "C" locale
+         _M_c_locale_timepunct = _S_get_c_locale();
+
+         _M_data->_M_date_format = L"%m/%d/%y";
+         _M_data->_M_date_era_format = L"%m/%d/%y";
+         _M_data->_M_time_format = L"%H:%M:%S";
+         _M_data->_M_time_era_format = L"%H:%M:%S";
+         _M_data->_M_date_time_format = L"";
+         _M_data->_M_date_time_era_format = L"";
+         _M_data->_M_am = L"AM";
+         _M_data->_M_pm = L"PM";
+         _M_data->_M_am_pm_format = L"";
+
+         // Day names, starting with "C"'s Sunday.
+         _M_data->_M_day1 = L"Sunday";
+         _M_data->_M_day2 = L"Monday";
+         _M_data->_M_day3 = L"Tuesday";
+         _M_data->_M_day4 = L"Wednesday";
+         _M_data->_M_day5 = L"Thursday";
+         _M_data->_M_day6 = L"Friday";
+         _M_data->_M_day7 = L"Saturday";
+
+         // Abbreviated day names, starting with "C"'s Sun.
+         _M_data->_M_aday1 = L"Sun";
+         _M_data->_M_aday2 = L"Mon";
+         _M_data->_M_aday3 = L"Tue";
+         _M_data->_M_aday4 = L"Wed";
+         _M_data->_M_aday5 = L"Thu";
+         _M_data->_M_aday6 = L"Fri";
+         _M_data->_M_aday7 = L"Sat";
+
+         // Month names, starting with "C"'s January.
+         _M_data->_M_month01 = L"January";
+         _M_data->_M_month02 = L"February";
+         _M_data->_M_month03 = L"March";
+         _M_data->_M_month04 = L"April";
+         _M_data->_M_month05 = L"May";
+         _M_data->_M_month06 = L"June";
+         _M_data->_M_month07 = L"July";
+         _M_data->_M_month08 = L"August";
+         _M_data->_M_month09 = L"September";
+         _M_data->_M_month10 = L"October";
+         _M_data->_M_month11 = L"November";
+         _M_data->_M_month12 = L"December";
+
+         // Abbreviated month names, starting with "C"'s Jan.
+         _M_data->_M_amonth01 = L"Jan";
+         _M_data->_M_amonth02 = L"Feb";
+         _M_data->_M_amonth03 = L"Mar";
+         _M_data->_M_amonth04 = L"Apr";
+         _M_data->_M_amonth05 = L"May";
+         _M_data->_M_amonth06 = L"Jun";
+         _M_data->_M_amonth07 = L"Jul";
+         _M_data->_M_amonth08 = L"Aug";
+         _M_data->_M_amonth09 = L"Sep";
+         _M_data->_M_amonth10 = L"Oct";
+         _M_data->_M_amonth11 = L"Nov";
+         _M_data->_M_amonth12 = L"Dec";
+       }
+#if 0
+      else
+       {
+         _M_c_locale_timepunct = _S_clone_c_locale(__cloc); 
+
+         union { char *__s; wchar_t *__w; } __u;
+
+         __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc);
+         _M_data->_M_date_format = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc);
+         _M_data->_M_date_era_format = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc);
+         _M_data->_M_time_format = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc);
+         _M_data->_M_time_era_format = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc);
+         _M_data->_M_date_time_format = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc);
+         _M_data->_M_date_time_era_format = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc);
+         _M_data->_M_am = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc);
+         _M_data->_M_pm = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc);
+         _M_data->_M_am_pm_format = __u.__w;
+
+         // Day names, starting with "C"'s Sunday.
+         __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc);
+         _M_data->_M_day1 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc);
+         _M_data->_M_day2 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc);
+         _M_data->_M_day3 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc);
+         _M_data->_M_day4 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc);
+         _M_data->_M_day5 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc);
+         _M_data->_M_day6 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc);
+         _M_data->_M_day7 = __u.__w;
+
+         // Abbreviated day names, starting with "C"'s Sun.
+         __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc);
+         _M_data->_M_aday1 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc);
+         _M_data->_M_aday2 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc);
+         _M_data->_M_aday3 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc);
+         _M_data->_M_aday4 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc);
+         _M_data->_M_aday5 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc);
+         _M_data->_M_aday6 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc);
+         _M_data->_M_aday7 = __u.__w;
+
+         // Month names, starting with "C"'s January.
+         __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc);
+         _M_data->_M_month01 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc);
+         _M_data->_M_month02 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc);
+         _M_data->_M_month03 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc);
+         _M_data->_M_month04 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc);
+         _M_data->_M_month05 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc);
+         _M_data->_M_month06 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc);
+         _M_data->_M_month07 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc);
+         _M_data->_M_month08 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc);
+         _M_data->_M_month09 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc);
+         _M_data->_M_month10 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc);
+         _M_data->_M_month11 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc);
+         _M_data->_M_month12 = __u.__w;
+
+         // Abbreviated month names, starting with "C"'s Jan.
+         __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc);
+         _M_data->_M_amonth01 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc);
+         _M_data->_M_amonth02 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc);
+         _M_data->_M_amonth03 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc);
+         _M_data->_M_amonth04 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc);
+         _M_data->_M_amonth05 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc);
+         _M_data->_M_amonth06 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc);
+         _M_data->_M_amonth07 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc);
+         _M_data->_M_amonth08 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc);
+         _M_data->_M_amonth09 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc);
+         _M_data->_M_amonth10 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc);
+         _M_data->_M_amonth11 = __u.__w;
+         __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc);
+         _M_data->_M_amonth12 = __u.__w;
+       }
+#endif // 0
+    }
+#endif
+}
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.1.1/libstdc++-v3/config/locale/uclibc/time_members.h
--- gcc-4.1.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h     1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/locale/uclibc/time_members.h  2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,76 @@
+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
+
+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.2.5.1.2 - time_get functions
+// ISO C++ 14882: 22.2.5.3.2 - time_put functions
+//
+
+// Written by Benjamin Kosnik <bkoz@redhat.com>
+
+  template<typename _CharT>
+    __timepunct<_CharT>::__timepunct(size_t __refs) 
+    : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
+      _M_name_timepunct(_S_get_c_name())
+    { _M_initialize_timepunct(); }
+
+  template<typename _CharT>
+    __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) 
+    : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL), 
+      _M_name_timepunct(_S_get_c_name())
+    { _M_initialize_timepunct(); }
+
+  template<typename _CharT>
+    __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s,
+                                    size_t __refs) 
+    : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
+      _M_name_timepunct(NULL)
+    { 
+      const size_t __len = std::strlen(__s) + 1;
+      char* __tmp = new char[__len];
+      std::memcpy(__tmp, __s, __len);
+      _M_name_timepunct = __tmp;
+
+      try
+       { _M_initialize_timepunct(__cloc); }
+      catch(...)
+       {
+         delete [] _M_name_timepunct;
+         __throw_exception_again;
+       }
+    }
+
+  template<typename _CharT>
+    __timepunct<_CharT>::~__timepunct()
+    { 
+      if (_M_name_timepunct != _S_get_c_name())
+       delete [] _M_name_timepunct;
+      delete _M_data; 
+      _S_destroy_c_locale(_M_c_locale_timepunct); 
+    }
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/os/uclibc/ctype_base.h gcc-4.1.1/libstdc++-v3/config/os/uclibc/ctype_base.h
--- gcc-4.1.1.orig/libstdc++-v3/config/os/uclibc/ctype_base.h   1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/os/uclibc/ctype_base.h        2006-11-13 21:11:59.377637138 -0800
@@ -0,0 +1,64 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.1  Locales
+//
+  
+/** @file ctype_base.h
+ *  This is an internal header file, included by other library headers.
+ *  You should not attempt to use it directly.
+ */
+
+// Information as gleaned from /usr/include/ctype.h
+  
+  /// @brief  Base class for ctype.
+  struct ctype_base
+  {
+    // Note: In uClibc, the following two types depend on configuration.
+ 
+    // Non-standard typedefs.
+    typedef const __ctype_touplow_t* __to_type;
+
+    // NB: Offsets into ctype<char>::_M_table force a particular size
+    // on the mask type. Because of this, we don't use an enum.
+    typedef __ctype_mask_t     mask;   
+    static const mask upper            = _ISupper;
+    static const mask lower    = _ISlower;
+    static const mask alpha    = _ISalpha;
+    static const mask digit    = _ISdigit;
+    static const mask xdigit   = _ISxdigit;
+    static const mask space    = _ISspace;
+    static const mask print    = _ISprint;
+    static const mask graph    = _ISalpha | _ISdigit | _ISpunct;
+    static const mask cntrl    = _IScntrl;
+    static const mask punct    = _ISpunct;
+    static const mask alnum    = _ISalpha | _ISdigit;
+  };
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/os/uclibc/ctype_inline.h gcc-4.1.1/libstdc++-v3/config/os/uclibc/ctype_inline.h
--- gcc-4.1.1.orig/libstdc++-v3/config/os/uclibc/ctype_inline.h 1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/os/uclibc/ctype_inline.h      2006-11-13 21:11:59.381637005 -0800
@@ -0,0 +1,69 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 2000, 2002 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.1  Locales
+//
+  
+// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*)
+// functions go in ctype.cc
+  
+  bool
+  ctype<char>::
+  is(mask __m, char __c) const
+  { return _M_table[static_cast<unsigned char>(__c)] & __m; }
+
+  const char*
+  ctype<char>::
+  is(const char* __low, const char* __high, mask* __vec) const
+  {
+    while (__low < __high)
+      *__vec++ = _M_table[static_cast<unsigned char>(*__low++)];
+    return __high;
+  }
+
+  const char*
+  ctype<char>::
+  scan_is(mask __m, const char* __low, const char* __high) const
+  {
+    while (__low < __high 
+          && !(_M_table[static_cast<unsigned char>(*__low)] & __m))
+      ++__low;
+    return __low;
+  }
+
+  const char*
+  ctype<char>::
+  scan_not(mask __m, const char* __low, const char* __high) const
+  {
+    while (__low < __high 
+          && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0)
+      ++__low;
+    return __low;
+  }
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/os/uclibc/ctype_noninline.h gcc-4.1.1/libstdc++-v3/config/os/uclibc/ctype_noninline.h
--- gcc-4.1.1.orig/libstdc++-v3/config/os/uclibc/ctype_noninline.h      1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/os/uclibc/ctype_noninline.h   2006-11-13 21:11:59.381637005 -0800
@@ -0,0 +1,92 @@
+// Locale support -*- C++ -*-
+
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2004
+// Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+//
+// ISO C++ 14882: 22.1  Locales
+//
+  
+// Information as gleaned from /usr/include/ctype.h
+
+  const ctype_base::mask*
+  ctype<char>::classic_table() throw()
+  { return __C_ctype_b; }
+
+  ctype<char>::ctype(__c_locale, const mask* __table, bool __del, 
+                    size_t __refs) 
+  : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), 
+  _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
+  {
+    _M_toupper = __C_ctype_toupper;
+    _M_tolower = __C_ctype_tolower;
+    _M_table = __table ? __table : __C_ctype_b;
+    memset(_M_widen, 0, sizeof(_M_widen));
+    memset(_M_narrow, 0, sizeof(_M_narrow));
+  }
+
+  ctype<char>::ctype(const mask* __table, bool __del, size_t __refs)
+  : facet(__refs), _M_c_locale_ctype(_S_get_c_locale()), 
+  _M_del(__table != 0 && __del), _M_widen_ok(0), _M_narrow_ok(0)
+  {
+    _M_toupper = __C_ctype_toupper;
+    _M_tolower = __C_ctype_tolower;
+    _M_table = __table ? __table : __C_ctype_b;
+    memset(_M_widen, 0, sizeof(_M_widen));
+    memset(_M_narrow, 0, sizeof(_M_narrow));
+  }
+
+  char
+  ctype<char>::do_toupper(char __c) const
+  { return _M_toupper[static_cast<unsigned char>(__c)]; }
+
+  const char*
+  ctype<char>::do_toupper(char* __low, const char* __high) const
+  {
+    while (__low < __high)
+      {
+       *__low = _M_toupper[static_cast<unsigned char>(*__low)];
+       ++__low;
+      }
+    return __high;
+  }
+
+  char
+  ctype<char>::do_tolower(char __c) const
+  { return _M_tolower[static_cast<unsigned char>(__c)]; }
+
+  const char* 
+  ctype<char>::do_tolower(char* __low, const char* __high) const
+  {
+    while (__low < __high)
+      {
+       *__low = _M_tolower[static_cast<unsigned char>(*__low)];
+       ++__low;
+      }
+    return __high;
+  }
diff -Naur gcc-4.1.1.orig/libstdc++-v3/config/os/uclibc/os_defines.h gcc-4.1.1/libstdc++-v3/config/os/uclibc/os_defines.h
--- gcc-4.1.1.orig/libstdc++-v3/config/os/uclibc/os_defines.h   1969-12-31 16:00:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/config/os/uclibc/os_defines.h        2006-11-13 21:11:59.381637005 -0800
@@ -0,0 +1,44 @@
+// Specific definitions for GNU/Linux  -*- C++ -*-
+
+// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 2, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING.  If not, write to the Free
+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+// USA.
+
+// As a special exception, you may use this file as part of a free software
+// library without restriction.  Specifically, if other files instantiate
+// templates or use macros or inline functions from this file, or you compile
+// this file and link it with other files to produce an executable, this
+// file does not by itself cause the resulting executable to be covered by
+// the GNU General Public License.  This exception does not however
+// invalidate any other reasons why the executable file might be covered by
+// the GNU General Public License.
+
+#ifndef _GLIBCXX_OS_DEFINES
+#define _GLIBCXX_OS_DEFINES 1
+
+// System-specific #define, typedefs, corrections, etc, go here.  This
+// file will come before all others.
+
+// This keeps isanum, et al from being propagated as macros.
+#define __NO_CTYPE 1
+
+#include <features.h>
+
+// We must not see the optimized string functions GNU libc defines.
+#define __NO_STRING_INLINES
+
+#endif
diff -Naur gcc-4.1.1.orig/libstdc++-v3/configure gcc-4.1.1/libstdc++-v3/configure
--- gcc-4.1.1.orig/libstdc++-v3/configure       2006-05-03 10:00:18.000000000 -0700
+++ gcc-4.1.1/libstdc++-v3/configure    2006-11-13 21:13:26.070741474 -0800
@@ -4005,6 +4005,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]+$'
@@ -5740,7 +5745,7 @@
   enableval="$enable_clocale"
 
       case "$enableval" in
-       generic|gnu|ieee_1003.1-2001|yes|no|auto) ;;
+       generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;;
        *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5
 echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;}
    { (exit 1); exit 1; }; } ;;
@@ -5765,6 +5770,9 @@
   # Default to "generic".
   if test $enable_clocale_flag = auto; then
     case ${target_os} in
+      linux-uclibc*)
+        enable_clocale_flag=uclibc
+       ;;
       linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
         cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -5995,6 +6003,76 @@
       CTIME_CC=config/locale/generic/time_members.cc
       CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
       ;;
+    uclibc)
+      echo "$as_me:$LINENO: result: uclibc" >&5
+echo "${ECHO_T}uclibc" >&6
+
+      # Declare intention to use gettext, and add support for specific
+      # languages.
+      # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT
+      ALL_LINGUAS="de fr"
+
+      # Don't call AM-GNU-GETTEXT here. Instead, assume glibc.
+      # Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_check_msgfmt+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$check_msgfmt"; then
+  ac_cv_prog_check_msgfmt="$check_msgfmt" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_check_msgfmt="yes"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no"
+fi
+fi
+check_msgfmt=$ac_cv_prog_check_msgfmt
+if test -n "$check_msgfmt"; then
+  echo "$as_me:$LINENO: result: $check_msgfmt" >&5
+echo "${ECHO_T}$check_msgfmt" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+      if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then
+        USE_NLS=yes
+      fi
+      # Export the build objects.
+      for ling in $ALL_LINGUAS; do \
+        glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \
+        glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \
+      done
+
+
+
+      CLOCALE_H=config/locale/uclibc/c_locale.h
+      CLOCALE_CC=config/locale/uclibc/c_locale.cc
+      CCODECVT_CC=config/locale/uclibc/codecvt_members.cc
+      CCOLLATE_CC=config/locale/uclibc/collate_members.cc
+      CCTYPE_CC=config/locale/uclibc/ctype_members.cc
+      CMESSAGES_H=config/locale/uclibc/messages_members.h
+      CMESSAGES_CC=config/locale/uclibc/messages_members.cc
+      CMONEY_CC=config/locale/uclibc/monetary_members.cc
+      CNUMERIC_CC=config/locale/uclibc/numeric_members.cc
+      CTIME_H=config/locale/uclibc/time_members.h
+      CTIME_CC=config/locale/uclibc/time_members.cc
+      CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h
+      ;;
   esac
 
   # This is where the testsuite looks for locale catalogs, using the
@@ -7246,6 +7324,9 @@
 cat >>conftest.$ac_ext <<_ACEOF
 /* end confdefs.h.  */
 #include <complex.h>
+#ifdef __UCLIBC__
+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs
+#endif
 int
 main ()
 {
diff -Naur gcc-4.1.1.orig/libstdc++-v3/configure.host gcc-4.1.1/libstdc++-v3/configure.host
--- gcc-4.1.1.orig/libstdc++-v3/configure.host  2005-11-17 12:10:51.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/configure.host       2006-11-13 21:11:59.405636204 -0800
@@ -261,6 +261,12 @@
     ;;
 esac
 
+# Override for uClibc since linux-uclibc gets mishandled above.
+case "${host_os}" in
+  *-uclibc*)
+    os_include_dir="os/uclibc"
+    ;;
+esac
 
 # Set any OS-dependent and CPU-dependent bits.
 # THIS TABLE IS SORTED.  KEEP IT THAT WAY.
diff -Naur gcc-4.1.1.orig/libstdc++-v3/crossconfig.m4 gcc-4.1.1/libstdc++-v3/crossconfig.m4
--- gcc-4.1.1.orig/libstdc++-v3/crossconfig.m4  2006-01-11 23:59:07.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/crossconfig.m4       2006-11-13 21:11:59.405636204 -0800
@@ -143,6 +143,99 @@
        ;;
     esac
     ;;
+  *-uclibc*)
+# Temporary hack until we implement the float versions of the libm funcs
+    AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
+      machine/endian.h machine/param.h sys/machine.h sys/types.h \
+      fp.h float.h endian.h inttypes.h locale.h float.h stdint.h])
+    SECTION_FLAGS='-ffunction-sections -fdata-sections'
+    AC_SUBST(SECTION_FLAGS)
+    GLIBCXX_CHECK_LINKER_FEATURES
+    GLIBCXX_CHECK_COMPLEX_MATH_SUPPORT
+    GLIBCXX_CHECK_WCHAR_T_SUPPORT
+
+    # For LFS.
+    AC_DEFINE(HAVE_INT64_T)
+    case "$target" in
+      *-uclinux*)
+        # Don't enable LFS with uClinux
+        ;;
+      *)
+        AC_DEFINE(_GLIBCXX_USE_LFS)
+    esac
+
+    # For showmanyc_helper().
+    AC_CHECK_HEADERS(sys/ioctl.h sys/filio.h)
+    GLIBCXX_CHECK_POLL
+    GLIBCXX_CHECK_S_ISREG_OR_S_IFREG
+
+    # For xsputn_2().
+    AC_CHECK_HEADERS(sys/uio.h)
+    GLIBCXX_CHECK_WRITEV
+
+#     AC_DEFINE(HAVE_ACOSF)
+#     AC_DEFINE(HAVE_ASINF)
+#     AC_DEFINE(HAVE_ATANF)
+#     AC_DEFINE(HAVE_ATAN2F)
+    AC_DEFINE(HAVE_CEILF)
+    AC_DEFINE(HAVE_COPYSIGN)
+#     AC_DEFINE(HAVE_COPYSIGNF)
+#     AC_DEFINE(HAVE_COSF)
+#     AC_DEFINE(HAVE_COSHF)
+#     AC_DEFINE(HAVE_EXPF)
+#     AC_DEFINE(HAVE_FABSF)
+    AC_DEFINE(HAVE_FINITE)
+    AC_DEFINE(HAVE_FINITEF)
+    AC_DEFINE(HAVE_FLOORF)
+#     AC_DEFINE(HAVE_FMODF)
+#     AC_DEFINE(HAVE_FREXPF)
+    AC_DEFINE(HAVE_HYPOT)
+#     AC_DEFINE(HAVE_HYPOTF)
+    AC_DEFINE(HAVE_ISINF)
+    AC_DEFINE(HAVE_ISINFF)
+    AC_DEFINE(HAVE_ISNAN)
+    AC_DEFINE(HAVE_ISNANF)
+#     AC_DEFINE(HAVE_LOGF)
+#     AC_DEFINE(HAVE_LOG10F)
+#     AC_DEFINE(HAVE_MODFF)
+#     AC_DEFINE(HAVE_SINF)
+#     AC_DEFINE(HAVE_SINHF)
+#     AC_DEFINE(HAVE_SINCOS)
+#     AC_DEFINE(HAVE_SINCOSF)
+    AC_DEFINE(HAVE_SQRTF)
+#     AC_DEFINE(HAVE_TANF)
+#     AC_DEFINE(HAVE_TANHF)
+    if test x"long_double_math_on_this_cpu" = x"yes"; then
+      AC_MSG_ERROR([long_double_math_on_this_cpu is yes!])
+#       AC_DEFINE(HAVE_ACOSL)
+#       AC_DEFINE(HAVE_ASINL)
+#       AC_DEFINE(HAVE_ATANL)
+#       AC_DEFINE(HAVE_ATAN2L)
+#       AC_DEFINE(HAVE_CEILL)
+#       AC_DEFINE(HAVE_COPYSIGNL)
+#       AC_DEFINE(HAVE_COSL)
+#       AC_DEFINE(HAVE_COSHL)
+#       AC_DEFINE(HAVE_EXPL)
+#       AC_DEFINE(HAVE_FABSL)
+#       AC_DEFINE(HAVE_FINITEL)
+#       AC_DEFINE(HAVE_FLOORL)
+#       AC_DEFINE(HAVE_FMODL)
+#       AC_DEFINE(HAVE_FREXPL)
+#       AC_DEFINE(HAVE_HYPOTL)
+#       AC_DEFINE(HAVE_ISINFL)
+#       AC_DEFINE(HAVE_ISNANL)
+#       AC_DEFINE(HAVE_LOGL)
+#       AC_DEFINE(HAVE_LOG10L)
+#       AC_DEFINE(HAVE_MODFL)
+#       AC_DEFINE(HAVE_POWL)
+#       AC_DEFINE(HAVE_SINL)
+#       AC_DEFINE(HAVE_SINHL)
+#       AC_DEFINE(HAVE_SINCOSL)
+#       AC_DEFINE(HAVE_SQRTL)
+#       AC_DEFINE(HAVE_TANL)
+#       AC_DEFINE(HAVE_TANHL)
+    fi
+    ;;
   *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-knetbsd*-gnu)
     AC_CHECK_HEADERS([nan.h ieeefp.h endian.h sys/isa_defs.h \
       machine/endian.h machine/param.h sys/machine.h sys/types.h \
@@ -157,7 +250,7 @@
     AC_DEFINE(HAVE_INT64_T)
     case "$target" in
       *-uclinux*)
-        # Don't enable LFS with uClibc
+        # Don't enable LFS with uClinux
         ;;
       *)
         AC_DEFINE(_GLIBCXX_USE_LFS)
diff -Naur gcc-4.1.1.orig/libstdc++-v3/include/c_compatibility/wchar.h gcc-4.1.1/libstdc++-v3/include/c_compatibility/wchar.h
--- gcc-4.1.1.orig/libstdc++-v3/include/c_compatibility/wchar.h 2005-08-16 19:28:44.000000000 -0700
+++ gcc-4.1.1/libstdc++-v3/include/c_compatibility/wchar.h      2006-11-13 21:11:59.405636204 -0800
@@ -101,7 +101,9 @@
 using std::wmemcpy;
 using std::wmemmove;
 using std::wmemset;
+#if _GLIBCXX_HAVE_WCSFTIME
 using std::wcsftime;
+#endif
 
 #if _GLIBCXX_USE_C99
 using std::wcstold;
diff -Naur gcc-4.1.1.orig/libstdc++-v3/include/c_std/std_cstdio.h gcc-4.1.1/libstdc++-v3/include/c_std/std_cstdio.h
--- gcc-4.1.1.orig/libstdc++-v3/include/c_std/std_cstdio.h      2005-10-30 14:21:50.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/include/c_std/std_cstdio.h   2006-11-13 21:13:40.978242926 -0800
@@ -143,7 +143,7 @@
   using ::vsprintf;
 }
 
-#if _GLIBCXX_USE_C99
+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
 
 #undef snprintf
 #undef vfscanf
diff -Naur gcc-4.1.1.orig/libstdc++-v3/include/c_std/std_cwchar.h gcc-4.1.1/libstdc++-v3/include/c_std/std_cwchar.h
--- gcc-4.1.1.orig/libstdc++-v3/include/c_std/std_cwchar.h      2005-10-30 14:21:50.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/include/c_std/std_cwchar.h   2006-11-13 21:11:59.405636204 -0800
@@ -180,7 +180,9 @@
   using ::wcscoll;
   using ::wcscpy;
   using ::wcscspn;
+#if _GLIBCXX_HAVE_WCSFTIME
   using ::wcsftime;
+#endif
   using ::wcslen;
   using ::wcsncat;
   using ::wcsncmp;
diff -Naur gcc-4.1.1.orig/libstdc++-v3/include/ext/rope gcc-4.1.1/libstdc++-v3/include/ext/rope
--- gcc-4.1.1.orig/libstdc++-v3/include/ext/rope        2005-08-16 19:28:44.000000000 -0700
+++ gcc-4.1.1/libstdc++-v3/include/ext/rope     2006-11-13 21:14:58.075661874 -0800
@@ -57,6 +57,9 @@
 #include <bits/allocator.h>
 #include <ext/hash_fun.h>
 
+/* cope w/ index defined as macro, SuSv3 proposal */
+#undef index
+
 # ifdef __GC
 #   define __GC_CONST const
 # else
diff -Naur gcc-4.1.1.orig/libstdc++-v3/include/ext/ropeimpl.h gcc-4.1.1/libstdc++-v3/include/ext/ropeimpl.h
--- gcc-4.1.1.orig/libstdc++-v3/include/ext/ropeimpl.h  2005-08-16 19:28:44.000000000 -0700
+++ gcc-4.1.1/libstdc++-v3/include/ext/ropeimpl.h       2006-11-13 21:14:58.075661874 -0800
@@ -53,6 +53,9 @@
 #include <ext/memory> // For uninitialized_copy_n
 #include <ext/numeric> // For power
 
+/* cope w/ index defined as macro, SuSv3 proposal */
+#undef index
+
 namespace __gnu_cxx
 {
   using std::size_t;
diff -Naur gcc-4.1.1.orig/libstdc++-v3/src/Makefile.am gcc-4.1.1/libstdc++-v3/src/Makefile.am
--- gcc-4.1.1.orig/libstdc++-v3/src/Makefile.am 2006-01-09 20:01:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/src/Makefile.am      2006-11-13 21:12:17.149044056 -0800
@@ -234,6 +234,12 @@
          $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@
 
 
+install-exec-local:
+ifeq ($(enable_shared),yes)
+       $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o
+       $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
+endif
+
 # Added bits to build debug library.
 if GLIBCXX_BUILD_DEBUG
 all-local: build_debug
diff -Naur gcc-4.1.1.orig/libstdc++-v3/src/Makefile.in gcc-4.1.1/libstdc++-v3/src/Makefile.in
--- gcc-4.1.1.orig/libstdc++-v3/src/Makefile.in 2006-01-10 09:14:00.000000000 -0800
+++ gcc-4.1.1/libstdc++-v3/src/Makefile.in      2006-11-13 21:12:17.149044056 -0800
@@ -627,7 +627,7 @@
 
 install-data-am: install-data-local
 
-install-exec-am: install-toolexeclibLTLIBRARIES
+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
 
 install-info: install-info-am
 
@@ -660,6 +660,7 @@
        distclean-libtool distclean-tags distdir dvi dvi-am html \
        html-am info info-am install install-am install-data \
        install-data-am install-data-local install-exec \
+       install-exec-local \
        install-exec-am install-info install-info-am install-man \
        install-strip install-toolexeclibLTLIBRARIES installcheck \
        installcheck-am installdirs maintainer-clean \
@@ -760,6 +761,13 @@
 install_debug:
        (cd ${debugdir} && $(MAKE) \
        toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install)
+
+install-exec-local:
+ifeq ($(enable_shared),yes)
+       $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o
+       $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir)
+endif
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff -Naur gcc-4.1.1.orig/libtool.m4 gcc-4.1.1/libtool.m4
--- gcc-4.1.1.orig/libtool.m4   2005-07-15 19:30:53.000000000 -0700
+++ gcc-4.1.1/libtool.m4        2006-11-13 21:14:41.540215750 -0800
@@ -743,6 +743,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 -Naur gcc-4.1.1.orig/ltconfig gcc-4.1.1/ltconfig
--- gcc-4.1.1.orig/ltconfig     2005-07-15 19:30:53.000000000 -0700
+++ gcc-4.1.1/ltconfig  2006-11-13 21:14:41.544215616 -0800
@@ -603,6 +603,7 @@
 
 # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
 case $host_os in
+linux-uclibc*) ;;
 linux-gnu*) ;;
 linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
 esac
@@ -1274,6 +1275,23 @@
   dynamic_linker='GNU/Linux ld.so'
   ;;
 
+linux-uclibc*)
+  version_type=linux
+  need_lib_prefix=no
+  need_version=no
+  library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
+  soname_spec='${libname}${release}.so$major'
+  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_overrides_runpath=no
+  # This implies no fast_install, which is unacceptable.
+  # Some rework will be needed to allow for fast_install
+  # before this can be enabled.
+  hardcode_into_libs=yes
+  # Assume using the uClibc dynamic linker.
+  dynamic_linker="uClibc ld.so"
+  ;;
+
 netbsd*)
   need_lib_prefix=no
   need_version=no
diff -Naur gcc-4.1.1.orig/zlib/configure gcc-4.1.1/zlib/configure
--- gcc-4.1.1.orig/zlib/configure       2005-09-12 10:02:07.000000000 -0700
+++ gcc-4.1.1/zlib/configure    2006-11-13 21:14:41.544215616 -0800
@@ -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]+$'