* gcc-4.2.3:

	obsolete


git-svn-id: https://svn.pengutronix.de/svn/oselas/toolchain/trunks/OSELAS.Toolchain-trunk@7468 f8d472c7-5700-0410-ac5a-87979cec3adf

45 files changed, 0 insertions, 6731 deletions

diff --git a/patches/gcc-4.2.3/generic/arm-bigendian.patch b/patches/gcc-4.2.3/generic/arm-bigendian.patch
deleted file mode 100644
index 5340cd4..0000000
--- a/patches/gcc-4.2.3/generic/arm-bigendian.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
----
- gcc/config.gcc              |    5 +++++
- gcc/config/arm/bpabi.h      |   12 +++++++++++-
- gcc/config/arm/linux-eabi.h |   13 ++++++++++++-
- gcc/config/arm/linux-elf.h  |   22 ++++++++++++++++++----
- 4 files changed, 46 insertions(+), 6 deletions(-)
-
-Index: gcc-4.2.3/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.2.3/gcc/config/arm/linux-elf.h
-@@ -27,19 +27,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
-@@ -60,7 +74,7 @@
-    %{rdynamic:-export-dynamic} \
-    %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "} \
-    -X \
--   %{mbig-endian:-EB}" \
-+   %{mbig-endian:-EB} %{mlittle-endian:-EL}" \
-    SUBTARGET_EXTRA_LINK_SPEC
- 
- #undef  LINK_SPEC
-Index: gcc-4.2.3/gcc/config.gcc
-===================================================================
---- gcc-4.2.3.orig/gcc/config.gcc
-+++ gcc-4.2.3/gcc/config.gcc
-@@ -706,6 +706,11 @@ arm*-*-netbsd*)
- 	;;
- 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-*eabi)
-Index: gcc-4.2.3/gcc/config/arm/linux-eabi.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/linux-eabi.h
-+++ gcc-4.2.3/gcc/config/arm/linux-eabi.h
-@@ -19,6 +19,17 @@
-    along with GCC; see the file COPYING3.  If not see
-    <http://www.gnu.org/licenses/>.  */
- 
-+/*
-+ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
-+ * (big endian) configurations.
-+ */
-+#undef TARGET_LINKER_EMULATION
-+#if TARGET_BIG_ENDIAN_DEFAULT
-+#define TARGET_LINKER_EMULATION "armelfb_linux_eabi"
-+#else
-+#define TARGET_LINKER_EMULATION "armelf_linux_eabi"
-+#endif
-+
- /* On EABI GNU/Linux, we want both the BPABI builtins and the
-    GNU/Linux builtins.  */
- #undef TARGET_OS_CPP_BUILTINS
-@@ -47,7 +58,7 @@
- #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
- 
- #undef SUBTARGET_EXTRA_LINK_SPEC
--#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
-+#define SUBTARGET_EXTRA_LINK_SPEC " -m " TARGET_LINKER_EMULATION
- 
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
-Index: gcc-4.2.3/gcc/config/arm/bpabi.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/bpabi.h
-+++ gcc-4.2.3/gcc/config/arm/bpabi.h
-@@ -32,9 +32,19 @@
- #undef FPUTYPE_DEFAULT
- #define FPUTYPE_DEFAULT FPUTYPE_VFP
- 
-+/*
-+ * '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
-+#else
-+#define TARGET_ENDIAN_DEFAULT 0
-+#endif
-+
- /* EABI targets should enable interworking by default.  */
- #undef TARGET_DEFAULT
--#define TARGET_DEFAULT MASK_INTERWORK
-+#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT)
- 
- /* The ARM BPABI functions return a boolean; they use no special
-    calling convention.  */
diff --git a/patches/gcc-4.2.3/generic/arm-softfloat.diff b/patches/gcc-4.2.3/generic/arm-softfloat.diff
deleted file mode 100644
index c9e2f0a..0000000
--- a/patches/gcc-4.2.3/generic/arm-softfloat.diff
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# Submitted-By: Marc Kleine-Budde
-# Committed-By: Robert Schwebel
-#
-# Error:
-#
-# no error
-#
-# Description:
-#
-# Link assembler softfloat functions into gcc. As the functions are
-# there in that case anyway, don't add switches for float lib.
-#
-# State:
-#
-# upstream will not fix this because oabi is dead
-#
-
----
- gcc/config/arm/linux-elf.h |    4 ++--
- gcc/config/arm/t-linux     |    5 ++++-
- 2 files changed, 6 insertions(+), 3 deletions(-)
-
-Index: gcc-4.2.3/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.2.3/gcc/config/arm/linux-elf.h
-@@ -53,7 +53,7 @@
- 
- #undef  MULTILIB_DEFAULTS
- #define MULTILIB_DEFAULTS \
--	{ "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" }
-+	{ "marm", TARGET_ENDIAN_OPTION, "msoft-float" "mhard-float", "mno-thumb-interwork" }
- 
- /* Now we define the strings used to build the spec file.  */
- #undef  LIB_SPEC
-@@ -62,7 +62,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
- 
-Index: gcc-4.2.3/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/t-linux
-+++ gcc-4.2.3/gcc/config/arm/t-linux
-@@ -4,7 +4,10 @@ TARGET_LIBGCC2_CFLAGS = -fomit-frame-poi
- LIBGCC2_DEBUG_CFLAGS = -g0
- 
- LIB1ASMSRC = arm/lib1funcs.asm
--LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx
-+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
-+	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+	_fixsfsi _fixunssfsi _floatdidf _floatdisf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/patches/gcc-4.2.3/generic/gentoo/00_all_gcc-trampolinewarn.patch b/patches/gcc-4.2.3/generic/gentoo/00_all_gcc-trampolinewarn.patch
deleted file mode 100644
index 85d61f9..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/00_all_gcc-trampolinewarn.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-	This trivial patch causes gcc to emit a warning whenever
-	it generates a trampoline.  These are otherwise hard to
-	locate.  It is rigged to default ON - to have it default
-	to OFF remove the text 'Init(1)' from the common.opt
-	patch, leaving just 'Common Var(warn_trampolines)'.
-	Kevin F. Quinn <kevquinn@gentoo.org> 17 Jan 2006
-
----
- gcc/builtins.c |    3 +++
- gcc/common.opt |    4 ++++
- 2 files changed, 7 insertions(+)
-
-Index: gcc-4.2.3/gcc/common.opt
-===================================================================
---- gcc-4.2.3.orig/gcc/common.opt
-+++ gcc-4.2.3/gcc/common.opt
-@@ -156,6 +156,10 @@ Wsystem-headers
- Common Var(warn_system_headers)
- Do not suppress warnings from system headers
- 
-+Wtrampolines
-+Common Var(warn_trampolines) Init(1)
-+Warn whenever a trampoline is generated
-+
- Wuninitialized
- Common Var(warn_uninitialized)
- Warn about uninitialized automatic variables
-Index: gcc-4.2.3/gcc/builtins.c
-===================================================================
---- gcc-4.2.3.orig/gcc/builtins.c
-+++ gcc-4.2.3/gcc/builtins.c
-@@ -5253,6 +5253,9 @@ expand_builtin_init_trampoline (tree arg
-   trampolines_created = 1;
-   INITIALIZE_TRAMPOLINE (r_tramp, r_func, r_chain);
- 
-+  if (warn_trampolines)
-+    warning (OPT_Wtrampolines, "generating trampoline in object (requires executable stack)");
-+
-   return const0_rtx;
- }
- 
diff --git a/patches/gcc-4.2.3/generic/gentoo/01_all_gcc4-ice-hack.patch b/patches/gcc-4.2.3/generic/gentoo/01_all_gcc4-ice-hack.patch
deleted file mode 100644
index 8a09a71..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/01_all_gcc4-ice-hack.patch
+++ /dev/null
@@ -1,304 +0,0 @@
-2004-01-23  Jakub Jelinek  <jakub@redhat.com>
-
-	* gcc.c (execute): Don't free first string early, but at the end
-	of the function.  Call retry_ice if compiler exited with
-	ICE_EXIT_CODE.
-	(retry_ice): New function.
-	* diagnostic.c (diagnostic_count_diagnostic,
-	diagnostic_action_after_output, error_recursion): Exit with
-	ICE_EXIT_CODE instead of FATAL_EXIT_CODE.
-
----
- gcc/diagnostic.c |    2 
- gcc/gcc.c        |  237 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
- 2 files changed, 237 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/gcc/diagnostic.c
-===================================================================
---- gcc-4.2.3.orig/gcc/diagnostic.c
-+++ gcc-4.2.3/gcc/diagnostic.c
-@@ -269,7 +269,7 @@ diagnostic_action_after_output (diagnost
- 	real_abort ();
- 
-       fnotice (stderr, "compilation terminated.\n");
--      exit (FATAL_EXIT_CODE);
-+      exit (ICE_EXIT_CODE);
- 
-     default:
-       gcc_unreachable ();
-Index: gcc-4.2.3/gcc/gcc.c
-===================================================================
---- gcc-4.2.3.orig/gcc/gcc.c
-+++ gcc-4.2.3/gcc/gcc.c
-@@ -348,6 +348,9 @@ static void init_gcc_specs (struct obsta
- #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX)
- static const char *convert_filename (const char *, int, int);
- #endif
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
-+static void retry_ice (const char *prog, const char **argv);
-+#endif
- 
- static const char *if_exists_spec_function (int, const char **);
- static const char *if_exists_else_spec_function (int, const char **);
-@@ -2948,7 +2951,7 @@ execute (void)
- 	    }
- 	}
- 
--      if (string != commands[i].prog)
-+      if (i && string != commands[i].prog)
- 	free ((void *) string);
-     }
- 
-@@ -3005,6 +3008,17 @@ See %s for instructions.",
- 	else if (WIFEXITED (status)
- 		 && WEXITSTATUS (status) >= MIN_FATAL_STATUS)
- 	  {
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
-+	    /* For ICEs in cc1, cc1obj, cc1plus see if it is
-+	       reproducible or not.  */
-+	    char *p;
-+	    if (getenv("GCC_RETRY_ICE") == NULL
-+		&& WEXITSTATUS (status) == ICE_EXIT_CODE
-+		&& i == 0
-+		&& (p = strrchr (commands[0].argv[0], DIR_SEPARATOR))
-+		&& ! strncmp (p + 1, "cc1", 3))
-+	      retry_ice (commands[0].prog, commands[0].argv);
-+#endif
- 	    if (WEXITSTATUS (status) > greatest_status)
- 	      greatest_status = WEXITSTATUS (status);
- 	    ret_code = -1;
-@@ -3025,6 +3039,9 @@ See %s for instructions.",
- 	  }
-       }
- 
-+    if (commands[0].argv[0] != commands[0].prog)
-+      free ((PTR) commands[0].argv[0]);
-+
-     return ret_code;
-   }
- }
-@@ -5969,6 +5986,224 @@ give_switch (int switchnum, int omit_fir
-   switches[switchnum].validated = 1;
- }
- 
-+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS) || defined (WIN32))
-+#define RETRY_ICE_ATTEMPTS 2
-+
-+static void
-+retry_ice (const char *prog, const char **argv)
-+{
-+  int nargs, out_arg = -1, quiet = 0, attempt;
-+  int pid, retries, sleep_interval;
-+  const char **new_argv;
-+  char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2];
-+
-+  if (input_filename == NULL || ! strcmp (input_filename, "-"))
-+    return;
-+
-+  for (nargs = 0; argv[nargs] != NULL; ++nargs)
-+    /* Only retry compiler ICEs, not preprocessor ones.  */
-+    if (! strcmp (argv[nargs], "-E"))
-+      return;
-+    else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o')
-+      {
-+	if (out_arg == -1)
-+	  out_arg = nargs;
-+	else
-+	  return;
-+      }
-+    /* If the compiler is going to output any time information,
-+       it might vary between invocations.  */
-+    else if (! strcmp (argv[nargs], "-quiet"))
-+      quiet = 1;
-+    else if (! strcmp (argv[nargs], "-ftime-report"))
-+      return;
-+
-+  if (out_arg == -1 || !quiet)
-+    return;
-+
-+  memset (temp_filenames, '\0', sizeof (temp_filenames));
-+  new_argv = alloca ((nargs + 3) * sizeof (const char *));
-+  memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *));
-+  new_argv[nargs++] = "-frandom-seed=0";
-+  new_argv[nargs] = NULL;
-+  if (new_argv[out_arg][2] == '\0')
-+    new_argv[out_arg + 1] = "-";
-+  else
-+    new_argv[out_arg] = "-o-";
-+
-+  for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt)
-+    {
-+      int fd = -1;
-+      int status;
-+
-+      temp_filenames[attempt * 2] = make_temp_file (".out");
-+      temp_filenames[attempt * 2 + 1] = make_temp_file (".err");
-+
-+      if (attempt == RETRY_ICE_ATTEMPTS)
-+        {
-+	  int i;
-+	  int fd1, fd2;
-+	  struct stat st1, st2;
-+	  size_t n, len;
-+	  char *buf;
-+
-+	  buf = xmalloc (8192);
-+
-+	  for (i = 0; i < 2; ++i)
-+	    {
-+	      fd1 = open (temp_filenames[i], O_RDONLY);
-+	      fd2 = open (temp_filenames[2 + i], O_RDONLY);
-+
-+	      if (fd1 < 0 || fd2 < 0)
-+		{
-+		  i = -1;
-+		  close (fd1);
-+		  close (fd2);
-+		  break;
-+		}
-+
-+	      if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0)
-+		{
-+		  i = -1;
-+		  close (fd1);
-+		  close (fd2);
-+		  break;
-+		}
-+
-+	      if (st1.st_size != st2.st_size)
-+		{
-+		  close (fd1);
-+		  close (fd2);
-+		  break;
-+		}
-+
-+	      len = 0;
-+	      for (n = st1.st_size; n; n -= len)
-+		{
-+		  len = n;
-+		  if (len > 4096)
-+		    len = 4096;
-+
-+		  if (read (fd1, buf, len) != (int) len
-+		      || read (fd2, buf + 4096, len) != (int) len)
-+		    {
-+		      i = -1;
-+		      break;
-+		    }
-+
-+		  if (memcmp (buf, buf + 4096, len) != 0)
-+		    break;
-+		}
-+
-+	      close (fd1);
-+	      close (fd2);
-+
-+	      if (n)
-+		break;
-+	    }
-+
-+	  free (buf);
-+	  if (i == -1)
-+	    break;
-+
-+	  if (i != 2)
-+	    {
-+	      notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
-+	      break;
-+	    }
-+
-+          fd = open (temp_filenames[attempt * 2], O_RDWR);
-+	  if (fd < 0)
-+	    break;
-+	  write (fd, "//", 2);
-+	  for (i = 0; i < nargs; i++)
-+	    {
-+	      write (fd, " ", 1);
-+	      write (fd, new_argv[i], strlen (new_argv[i]));
-+	    }
-+	  write (fd, "\n", 1);
-+	  new_argv[nargs] = "-E";
-+	  new_argv[nargs + 1] = NULL;
-+        }
-+
-+      /* Fork a subprocess; wait and retry if it fails.  */
-+      sleep_interval = 1;
-+      pid = -1;
-+      for (retries = 0; retries < 4; retries++)
-+	{
-+	  pid = fork ();
-+	  if (pid >= 0)
-+	    break;
-+	  sleep (sleep_interval);
-+	  sleep_interval *= 2;
-+	}
-+
-+      if (pid < 0)
-+	break;
-+      else if (pid == 0)
-+	{
-+	  if (attempt != RETRY_ICE_ATTEMPTS)
-+	    fd = open (temp_filenames[attempt * 2], O_RDWR);
-+	  if (fd < 0)
-+	    exit (-1);
-+	  if (fd != 1)
-+	    {
-+	      close (1);
-+	      dup (fd);
-+	      close (fd);
-+	    }
-+
-+	  fd = open (temp_filenames[attempt * 2 + 1], O_RDWR);
-+	  if (fd < 0)
-+	    exit (-1);
-+	  if (fd != 2)
-+	    {
-+	      close (2);
-+	      dup (fd);
-+	      close (fd);
-+	    }
-+
-+	  if (prog == new_argv[0])
-+	    execvp (prog, (char *const *) new_argv);
-+	  else
-+	    execv (new_argv[0], (char *const *) new_argv);
-+	  exit (-1);
-+	}
-+
-+      if (waitpid (pid, &status, 0) < 0)
-+	break;
-+
-+      if (attempt < RETRY_ICE_ATTEMPTS
-+	  && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE))
-+	{
-+	  notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n");
-+	  break;
-+	}
-+      else if (attempt == RETRY_ICE_ATTEMPTS)
-+	{
-+	  close (fd);
-+	  if (WIFEXITED (status)
-+	      && WEXITSTATUS (status) == SUCCESS_EXIT_CODE)
-+	    {
-+	      notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n",
-+		      temp_filenames[attempt * 2]);
-+	      /* Make sure it is not deleted.  */
-+	      free (temp_filenames[attempt * 2]);
-+	      temp_filenames[attempt * 2] = NULL;
-+	      break;
-+	    }
-+	}
-+    }
-+
-+  for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++)
-+    if (temp_filenames[attempt])
-+      {
-+	unlink (temp_filenames[attempt]);
-+	free (temp_filenames[attempt]);
-+      }
-+}
-+#endif
-+
- /* Search for a file named NAME trying various prefixes including the
-    user's -B prefix and some standard ones.
-    Return the absolute file name found.  If nothing is found, return NAME.  */
diff --git a/patches/gcc-4.2.3/generic/gentoo/06_all_gcc4-slow-pthread-self.patch b/patches/gcc-4.2.3/generic/gentoo/06_all_gcc4-slow-pthread-self.patch
deleted file mode 100644
index 0fbfeab..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/06_all_gcc4-slow-pthread-self.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2005-05-20  Jakub Jelinek  <jakub@redhat.com>
-
-	* configure.host (slow_pthread_self): Set to empty unconditionally
-	on Linux targets.
-
----
- libjava/configure.host |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: gcc-4.2.3/libjava/configure.host
-===================================================================
---- gcc-4.2.3.orig/libjava/configure.host
-+++ gcc-4.2.3/libjava/configure.host
-@@ -192,6 +192,7 @@ case "${host}" in
-   sh-linux* | sh[34]*-linux*)
-   	can_unwind_signal=yes
- 	libgcj_ld_symbolic='-Wl,-Bsymbolic'
-+	slow_pthread_self=
- 	if test x$slow_pthread_self = xyes \
- 	   && test x$cross_compiling != xyes; then
- 	  cat > conftest.c <<EOF
diff --git a/patches/gcc-4.2.3/generic/gentoo/20_all_cris-dont-force-limits-header.patch b/patches/gcc-4.2.3/generic/gentoo/20_all_cris-dont-force-limits-header.patch
deleted file mode 100644
index b22e3c6..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/20_all_cris-dont-force-limits-header.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Remove assumption since it breaks building --without-headers
-
----
- gcc/config/cris/t-linux |    4 ----
- 1 file changed, 4 deletions(-)
-
-Index: gcc-4.2.3/gcc/config/cris/t-linux
-===================================================================
---- gcc-4.2.3.orig/gcc/config/cris/t-linux
-+++ gcc-4.2.3/gcc/config/cris/t-linux
-@@ -1,6 +1,2 @@
- TARGET_LIBGCC2_CFLAGS += -fPIC
- CRTSTUFF_T_CFLAGS_S = $(TARGET_LIBGCC2_CFLAGS)
--
--# We *know* we have a limits.h in the glibc library, with extra
--# definitions needed for e.g. libgfortran.
--LIMITS_H_TEST = :
diff --git a/patches/gcc-4.2.3/generic/gentoo/35_all_gcc-arm-pragma-pack.patch b/patches/gcc-4.2.3/generic/gentoo/35_all_gcc-arm-pragma-pack.patch
deleted file mode 100644
index 6cd5e4e..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/35_all_gcc-arm-pragma-pack.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-http://gcc.gnu.org/ml/gcc-patches/2006-10/msg01115.html
-
-From: Paul Brook <paul@codesourcery.com>
-Sender: gcc-patches-owner@gcc.gnu.org
-To: gcc-patches@gcc.gnu.org
-Subject: [patch] #pragma pack vs. STRUCTURE_SIZE_BOUNDARY
-Date: Sun, 22 Oct 2006 16:32:31 +0100
-
-Currently STRUCTURE_SIZE_BOUNDARY is obeyed even when
-#pragma pack(1) is in effect. By contrast __attribute__((packed)) overrides 
-STRUCTURE_SIZE_BOUNDARY.
-
-This matters when odd sized packed structs are nested inside each other.
-
-Given the purpose of #pragma pack is for compatibility with Win32, I think 
-#pragma pack(1) act the same as __attribute__((packed)).
-
-The patch below fixes this.
-Tested with cross to arm-none-eabi.
-Ok?
-
-Paul
-
-2006-10-22  Paul Brook  <paul@codesourcery.com>
-
-	gcc/
-	* stor-layout.c (start_record_layout): maximum_field_alignment
-	overrides STRUCTURE_SIZE_BOUNDARY.
-
-	gcc/testsuite/
-	* gcc.dg/pragma-pack-4.c: New test.
-
----
- gcc/stor-layout.c                    |   10 +++++++++-
- gcc/testsuite/gcc.dg/pragma-pack-4.c |   10 ++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/stor-layout.c
-===================================================================
---- gcc-4.2.3.orig/gcc/stor-layout.c
-+++ gcc-4.2.3/gcc/stor-layout.c
-@@ -530,7 +530,15 @@ start_record_layout (tree t)
- #ifdef STRUCTURE_SIZE_BOUNDARY
-   /* Packed structures don't need to have minimum size.  */
-   if (! TYPE_PACKED (t))
--    rli->record_align = MAX (rli->record_align, (unsigned) STRUCTURE_SIZE_BOUNDARY);
-+    {
-+      unsigned tmp;
-+
-+      /* #pragma pack overrides STRUCTURE_SIZE_BOUNDARY.  */
-+      tmp = (unsigned) STRUCTURE_SIZE_BOUNDARY;
-+      if (maximum_field_alignment != 0)
-+	tmp = MIN (tmp, maximum_field_alignment);
-+      rli->record_align = MAX (rli->record_align, tmp);
-+    }
- #endif
- 
-   rli->offset = size_zero_node;
-Index: gcc-4.2.3/gcc/testsuite/gcc.dg/pragma-pack-4.c
-===================================================================
---- gcc-4.2.3.orig/gcc/testsuite/gcc.dg/pragma-pack-4.c
-+++ gcc-4.2.3/gcc/testsuite/gcc.dg/pragma-pack-4.c
-@@ -1,3 +1,13 @@
-+/* Check that pragma pack overrides STRUCTURE_SIZE_BOUNDARY.  */
-+/* { dg-do compile } */
-+
-+#pragma pack(1)
-+struct S
-+{
-+  char a;
-+};
-+
-+int test[sizeof(struct S) == 1 ? 1: -1];
- /* PR c/28286 */
- /* { dg-do compile } */
- 
diff --git a/patches/gcc-4.2.3/generic/gentoo/36_all_gcc-arm-pr30486.patch b/patches/gcc-4.2.3/generic/gentoo/36_all_gcc-arm-pr30486.patch
deleted file mode 100644
index 39f6eb6..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/36_all_gcc-arm-pr30486.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://bugs.gentoo.org/194975
-http://gcc.gnu.org/PR30486
-
----
- gcc/fortran/trans-types.c |    7 +++++++
- 1 file changed, 7 insertions(+)
-
-Index: gcc-4.2.3/gcc/fortran/trans-types.c
-===================================================================
---- gcc-4.2.3.orig/gcc/fortran/trans-types.c
-+++ gcc-4.2.3/gcc/fortran/trans-types.c
-@@ -1799,6 +1799,13 @@ gfc_type_for_size (unsigned bits, int un
- 	  if (type && bits == TYPE_PRECISION (type))
- 	    return type;
- 	}
-+
-+      /* Handle TImode as a special case because it is used by some backends
-+         (eg. ARM) even though it is not available for normal use.  */
-+#if HOST_BITS_PER_WIDE_INT >= 64
-+      if (bits == TYPE_PRECISION (intTI_type_node))
-+	return intTI_type_node;
-+#endif
-     }
-   else
-     {
diff --git a/patches/gcc-4.2.3/generic/gentoo/51_all_gcc-3.4-libiberty-pic.patch b/patches/gcc-4.2.3/generic/gentoo/51_all_gcc-3.4-libiberty-pic.patch
deleted file mode 100644
index 11d2cc0..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/51_all_gcc-3.4-libiberty-pic.patch
+++ /dev/null
@@ -1,16 +0,0 @@
----
- libiberty/Makefile.in |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: gcc-4.2.3/libiberty/Makefile.in
-===================================================================
---- gcc-4.2.3.orig/libiberty/Makefile.in
-+++ gcc-4.2.3/libiberty/Makefile.in
-@@ -232,6 +232,7 @@ $(TARGETLIB): $(REQUIRED_OFILES) $(EXTRA
- 	  $(AR) $(AR_FLAGS) $(TARGETLIB) \
- 	    $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS); \
- 	  $(RANLIB) $(TARGETLIB); \
-+	  cp $(TARGETLIB) ../ ; \
- 	  cd ..; \
- 	else true; fi
- 
diff --git a/patches/gcc-4.2.3/generic/gentoo/53_all_gcc4-superh-default-multilib.patch b/patches/gcc-4.2.3/generic/gentoo/53_all_gcc4-superh-default-multilib.patch
deleted file mode 100644
index 102350b..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/53_all_gcc4-superh-default-multilib.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-The gcc-3.x toolchains would contain all the targets by default.  With gcc-4,
-you have to actually list out the multilibs you want or you will end up with
-just one when using targets like 'sh4-linux-gnu'.
-
-The resulting toolchain can't even build a kernel as the kernel needs to build
-with the nofpu flag to be sure that no fpu ops are generated.
-
-Here we restore the gcc-3.x behavior; the additional overhead of building all
-of these multilibs by default is negligible.
-
-http://bugs.gentoo.org/140205
-
----
- gcc/config.gcc |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/config.gcc
-===================================================================
---- gcc-4.2.3.orig/gcc/config.gcc
-+++ gcc-4.2.3/gcc/config.gcc
-@@ -2103,7 +2103,7 @@ sh-*-symbianelf* | sh[12346l]*-*-symbian
- 	if test x${sh_multilibs} = x ; then
- 		case ${target} in
- 		sh64-superh-linux* | \
--		sh[1234]*)	sh_multilibs=${sh_cpu_target} ;;
-+		sh[1234]*)	sh_multilibs=`cd ${srcdir}/config/sh ; echo t-mlib-sh[1-4]* | sed 's:t-mlib-sh:,m:g;s: ::g'` ;;
- 		sh64* | sh5*)	sh_multilibs=m5-32media,m5-32media-nofpu,m5-compact,m5-compact-nofpu,m5-64media,m5-64media-nofpu ;;
- 		sh-superh-*)	sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
- 		sh*-*-linux*)	sh_multilibs=m1,m3e,m4 ;;
diff --git a/patches/gcc-4.2.3/generic/gentoo/56_all_gcc-4-pr32177.patch b/patches/gcc-4.2.3/generic/gentoo/56_all_gcc-4-pr32177.patch
deleted file mode 100644
index fa2c7ff..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/56_all_gcc-4-pr32177.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-http://gcc.gnu.org/PR32177
-
-2007-06-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR c++/32177
-	* semantics.c (finish_omp_for): Call fold_build_cleanup_point_expr
-	on init, the non-decl cond operand and increment value.
-
----
- gcc/cp/semantics.c |   27 ++++++++++++++++++++++++++-
- 1 file changed, 26 insertions(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/cp/semantics.c
-===================================================================
---- gcc-4.2.3.orig/gcc/cp/semantics.c
-+++ gcc-4.2.3/gcc/cp/semantics.c
-@@ -3780,6 +3780,8 @@ tree
- finish_omp_for (location_t locus, tree decl, tree init, tree cond,
- 		tree incr, tree body, tree pre_body)
- {
-+  tree omp_for;
-+
-   if (decl == NULL)
-     {
-       if (init != NULL)
-@@ -3857,8 +3859,31 @@ finish_omp_for (location_t locus, tree d
-       add_stmt (pre_body);
-       pre_body = NULL;
-     }
-+
-+  init = fold_build_cleanup_point_expr (TREE_TYPE (init), init);
-   init = build_modify_expr (decl, NOP_EXPR, init);
--  return c_finish_omp_for (locus, decl, init, cond, incr, body, pre_body);
-+  if (cond && TREE_SIDE_EFFECTS (cond) && COMPARISON_CLASS_P (cond))
-+    {
-+      int n = TREE_SIDE_EFFECTS (TREE_OPERAND (cond, 1)) != 0;
-+      tree t = TREE_OPERAND (cond, n);
-+
-+      TREE_OPERAND (cond, n)
-+	= fold_build_cleanup_point_expr (TREE_TYPE (t), t);
-+    }
-+  omp_for = c_finish_omp_for (locus, decl, init, cond, incr, body, pre_body);
-+  if (omp_for != NULL
-+      && TREE_CODE (OMP_FOR_INCR (omp_for)) == MODIFY_EXPR
-+      && TREE_SIDE_EFFECTS (TREE_OPERAND (OMP_FOR_INCR (omp_for), 1))
-+      && BINARY_CLASS_P (TREE_OPERAND (OMP_FOR_INCR (omp_for), 1)))
-+    {
-+      tree t = TREE_OPERAND (OMP_FOR_INCR (omp_for), 1);
-+      int n = TREE_SIDE_EFFECTS (TREE_OPERAND (t, 1)) != 0;
-+
-+      TREE_OPERAND (t, n)
-+	= fold_build_cleanup_point_expr (TREE_TYPE (TREE_OPERAND (t, n)),
-+					 TREE_OPERAND (t, n));
-+    }
-+  return omp_for;
- }
- 
- void
diff --git a/patches/gcc-4.2.3/generic/gentoo/59_all_gcc-4-pr32893.patch b/patches/gcc-4.2.3/generic/gentoo/59_all_gcc-4-pr32893.patch
deleted file mode 100644
index e805f54..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/59_all_gcc-4-pr32893.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-http://gcc.gnu.org/PR32893
-
-2007-10-29  Dorit Nuzman  <dorit@il.ibm.com>
-
-	PR tree-optimization/32893
-	* tree-vectorize.c (vect_can_force_dr_alignment_p): Check
-	STACK_BOUNDARY instead of PREFERRED_STACK_BOUNDARY.
-
----
- gcc/tree-vectorizer.c |    9 +++------
- 1 file changed, 3 insertions(+), 6 deletions(-)
-
-Index: gcc-4.2.3/gcc/tree-vectorizer.c
-===================================================================
---- gcc-4.2.3.orig/gcc/tree-vectorizer.c
-+++ gcc-4.2.3/gcc/tree-vectorizer.c
-@@ -1530,12 +1530,9 @@ vect_can_force_dr_alignment_p (tree decl
-   if (TREE_STATIC (decl))
-     return (alignment <= MAX_OFILE_ALIGNMENT);
-   else
--    /* This is not 100% correct.  The absolute correct stack alignment
--       is STACK_BOUNDARY.  We're supposed to hope, but not assume, that
--       PREFERRED_STACK_BOUNDARY is honored by all translation units.
--       However, until someone implements forced stack alignment, SSE
--       isn't really usable without this.  */  
--    return (alignment <= PREFERRED_STACK_BOUNDARY); 
-+    /* This used to be PREFERRED_STACK_BOUNDARY, however, that is not 100%
-+       correct until someone implements forced stack alignment.  */
-+    return (alignment <= STACK_BOUNDARY); 
- }
- 
- 
diff --git a/patches/gcc-4.2.3/generic/gentoo/62_all_gcc4-noteGNUstack.patch b/patches/gcc-4.2.3/generic/gentoo/62_all_gcc4-noteGNUstack.patch
deleted file mode 100644
index 62df34a..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/62_all_gcc4-noteGNUstack.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-2005-02-08  Jakub Jelinek  <jakub@redhat.com>
-
-	* src/alpha/osf.S: Add .note.GNU-stack on Linux.
-	* src/s390/sysv.S: Likewise.
-	* src/powerpc/linux64.S: Likewise.
-	* src/powerpc/linux64_closure.S: Likewise.
-	* src/powerpc/ppc_closure.S: Likewise.
-	* src/powerpc/sysv.S: Likewise.
-	* src/x86/unix64.S: Likewise.
-	* src/x86/sysv.S: Likewise.
-	* src/sparc/v8.S: Likewise.
-	* src/sparc/v9.S: Likewise.
-	* src/m68k/sysv.S: Likewise.
-	* src/ia64/unix.S: Likewise.
-	* src/arm/sysv.S: Likewise.
-
-	* ia64_save_regs_in_stack.s: Moved to...
-	* ia64_save_regs_in_stack.S: ... this.  Add .note.GNU-stack
-	on Linux.
-
----
- boehm-gc/ia64_save_regs_in_stack.S   |   15 +++++++++++++++
- boehm-gc/ia64_save_regs_in_stack.s   |   12 ------------
- libffi/src/alpha/osf.S               |    4 ++++
- libffi/src/arm/sysv.S                |    3 +++
- libffi/src/ia64/unix.S               |    4 ++++
- libffi/src/m68k/sysv.S               |    4 ++++
- libffi/src/powerpc/linux64.S         |    4 ++++
- libffi/src/powerpc/linux64_closure.S |    4 ++++
- libffi/src/powerpc/ppc_closure.S     |    4 ++++
- libffi/src/powerpc/sysv.S            |    4 ++++
- libffi/src/s390/sysv.S               |    3 +++
- libffi/src/sparc/v8.S                |    4 ++++
- libffi/src/sparc/v9.S                |    4 ++++
- libffi/src/x86/sysv.S                |    4 ++++
- libffi/src/x86/unix64.S              |    4 ++++
- 15 files changed, 65 insertions(+), 12 deletions(-)
-
-Index: gcc-4.2.3/boehm-gc/ia64_save_regs_in_stack.S
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/boehm-gc/ia64_save_regs_in_stack.S
-@@ -0,0 +1,15 @@
-+        .text
-+        .align 16
-+        .global GC_save_regs_in_stack
-+        .proc GC_save_regs_in_stack
-+GC_save_regs_in_stack:
-+        .bodyfoo.mpg
-+        flushrs
-+        ;;
-+        mov r8=ar.bsp
-+        br.ret.sptk.few rp
-+        .endp GC_save_regs_in_stack
-+
-+#ifdef __linux__
-+	.section .note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/boehm-gc/ia64_save_regs_in_stack.s
-===================================================================
---- gcc-4.2.3.orig/boehm-gc/ia64_save_regs_in_stack.s
-+++ /dev/null
-@@ -1,12 +0,0 @@
--        .text
--        .align 16
--        .global GC_save_regs_in_stack
--        .proc GC_save_regs_in_stack
--GC_save_regs_in_stack:
--        .body
--        flushrs
--        ;;
--        mov r8=ar.bsp
--        br.ret.sptk.few rp
--        .endp GC_save_regs_in_stack
--
-Index: gcc-4.2.3/libffi/src/alpha/osf.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/alpha/osf.S
-+++ gcc-4.2.3/libffi/src/alpha/osf.S
-@@ -358,4 +358,8 @@ $LASFDE3:
- 	.byte	16		# uleb128 offset 16*-8
- 	.align 3
- $LEFDE3:
-+
-+#ifdef __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
- #endif
-Index: gcc-4.2.3/libffi/src/arm/sysv.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/arm/sysv.S
-+++ gcc-4.2.3/libffi/src/arm/sysv.S
-@@ -207,3 +207,6 @@ LSYM(Lepilogue):
- .ffi_call_SYSV_end:
-         .size    CNAME(ffi_call_SYSV),.ffi_call_SYSV_end-CNAME(ffi_call_SYSV)
- 
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",%progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/ia64/unix.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/ia64/unix.S
-+++ gcc-4.2.3/libffi/src/ia64/unix.S
-@@ -553,3 +553,7 @@ ffi_closure_unix:
- 	data8	@pcrel(.Lld_hfa_float)		// FFI_IA64_TYPE_HFA_FLOAT
- 	data8	@pcrel(.Lld_hfa_double)		// FFI_IA64_TYPE_HFA_DOUBLE
- 	data8	@pcrel(.Lld_hfa_ldouble)	// FFI_IA64_TYPE_HFA_LDOUBLE
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/m68k/sysv.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/m68k/sysv.S
-+++ gcc-4.2.3/libffi/src/m68k/sysv.S
-@@ -95,3 +95,7 @@ epilogue:
- 	unlk	%a6
- 	rts
- 	.size	ffi_call_SYSV,.-ffi_call_SYSV
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/powerpc/linux64.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/powerpc/linux64.S
-+++ gcc-4.2.3/libffi/src/powerpc/linux64.S
-@@ -175,3 +175,7 @@ ffi_call_LINUX64:
- 	.align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/powerpc/linux64_closure.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/powerpc/linux64_closure.S
-+++ gcc-4.2.3/libffi/src/powerpc/linux64_closure.S
-@@ -204,3 +204,7 @@ ffi_closure_LINUX64:
- 	.align 3
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/powerpc/ppc_closure.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/powerpc/ppc_closure.S
-+++ gcc-4.2.3/libffi/src/powerpc/ppc_closure.S
-@@ -281,3 +281,7 @@ END(ffi_closure_SYSV)
- .LEFDE1:
- 
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/powerpc/sysv.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/powerpc/sysv.S
-+++ gcc-4.2.3/libffi/src/powerpc/sysv.S
-@@ -217,3 +217,7 @@ END(ffi_call_SYSV)
-       .align 2
- .LEFDE1:
- #endif
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/s390/sysv.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/s390/sysv.S
-+++ gcc-4.2.3/libffi/src/s390/sysv.S
-@@ -427,3 +427,6 @@ ffi_closure_SYSV:
- 
- #endif
- 
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/sparc/v8.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/sparc/v8.S
-+++ gcc-4.2.3/libffi/src/sparc/v8.S
-@@ -265,3 +265,7 @@ done2:
- 	.byte	0x1f	! uleb128 0x1f
- 	.align	WS
- .LLEFDE2:
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/sparc/v9.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/sparc/v9.S
-+++ gcc-4.2.3/libffi/src/sparc/v9.S
-@@ -300,3 +300,7 @@ longdouble1:
- 	.align 8
- .LLEFDE2:
- #endif
-+
-+#ifdef __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/x86/sysv.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/x86/sysv.S
-+++ gcc-4.2.3/libffi/src/x86/sysv.S
-@@ -376,3 +376,7 @@ ffi_closure_raw_SYSV:
- #endif
- 
- #endif /* ifndef __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
-Index: gcc-4.2.3/libffi/src/x86/unix64.S
-===================================================================
---- gcc-4.2.3.orig/libffi/src/x86/unix64.S
-+++ gcc-4.2.3/libffi/src/x86/unix64.S
-@@ -410,3 +410,7 @@ ffi_closure_unix64:
- .LEFDE3:
- 
- #endif /* __x86_64__ */
-+
-+#if defined __ELF__ && defined __linux__
-+	.section	.note.GNU-stack,"",@progbits
-+#endif
diff --git a/patches/gcc-4.2.3/generic/gentoo/74_all_sh-pr24836.patch b/patches/gcc-4.2.3/generic/gentoo/74_all_sh-pr24836.patch
deleted file mode 100644
index d752f99..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/74_all_sh-pr24836.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
-
----
- gcc/configure    |    2 +-
- gcc/configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/gcc/configure.ac
-===================================================================
---- gcc-4.2.3.orig/gcc/configure.ac
-+++ gcc-4.2.3/gcc/configure.ac
-@@ -2535,7 +2535,7 @@ foo:	.long	25
- 	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
-Index: gcc-4.2.3/gcc/configure
-===================================================================
---- gcc-4.2.3.orig/gcc/configure
-+++ gcc-4.2.3/gcc/configure
-@@ -14562,7 +14562,7 @@ foo:	.long	25
- 	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 --git a/patches/gcc-4.2.3/generic/gentoo/85_all_gcc-ca-translation-typo.patch b/patches/gcc-4.2.3/generic/gentoo/85_all_gcc-ca-translation-typo.patch
deleted file mode 100644
index c713ad6..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/85_all_gcc-ca-translation-typo.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-http://bugs.gentoo.org/127190
-
-2006-03-28  Harald van Dijk  <truedfx@gentoo.org>
-
-	* ca.po: Fix printf flag typo in negative value translation.
-
----
- gcc/po/ca.po |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/po/ca.po
-===================================================================
---- gcc-4.2.3.orig/gcc/po/ca.po
-+++ gcc-4.2.3/gcc/po/ca.po
-@@ -34197,7 +34197,7 @@ msgstr "s'ignora l'atribut \"%s\""
- #~ msgstr "passant el valor negatiu `%E' per a %s %P de \"%D\""
- 
- #~ msgid "%s of negative value `%E' to `%T'"
--#~ msgstr "%s de valor negatiu `%I' a \"%T\""
-+#~ msgstr "%s de valor negatiu `%E' a \"%T\""
- 
- #~ msgid "initializing array with parameter list"
- #~ msgstr "inicialitzant una matriu amb una llista de paràmetres"
diff --git a/patches/gcc-4.2.3/generic/gentoo/90_all_mips-add-march-r10k.patch b/patches/gcc-4.2.3/generic/gentoo/90_all_mips-add-march-r10k.patch
deleted file mode 100644
index 90ae394..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/90_all_mips-add-march-r10k.patch
+++ /dev/null
@@ -1,405 +0,0 @@
----
- gcc/config/mips/10000.md |  248 +++++++++++++++++++++++++++++++++++++++++++++++
- gcc/config/mips/mips.c   |   62 +++++++++++
- gcc/config/mips/mips.h   |   12 ++
- gcc/config/mips/mips.md  |    3 
- 4 files changed, 324 insertions(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/config/mips/10000.md
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/gcc/config/mips/10000.md
-@@ -0,0 +1,248 @@
-+;; VR1x000 pipeline description.
-+;;   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
-+;;
-+;; This file is part of GCC.
-+
-+;; GCC 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.
-+
-+;; GCC 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 GCC; see the file COPYING.  If not, write to the
-+;; Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+;; MA 02110-1301, USA.
-+
-+
-+;; This file overrides parts of generic.md.  It is derived from the
-+;; old define_function_unit description.
-+
-+
-+
-+;; R12K/R14K/R16K are derivatives of R10K, thus copy its description
-+;; until specific tuning for each is added
-+
-+
-+;; R10000 has int queue, fp queue, address queue
-+(define_automaton "r10k_int, r10k_fp, r10k_addr")
-+
-+;; R10000 has 2 integer ALUs, fp-adder and fp-multiplier, load/store
-+(define_cpu_unit "r10k_alu1" "r10k_int")
-+(define_cpu_unit "r10k_alu2" "r10k_int")
-+(define_cpu_unit "r10k_fpadd" "r10k_fp")
-+(define_cpu_unit "r10k_fpmpy" "r10k_fp")
-+(define_cpu_unit "r10k_loadstore" "r10k_addr")
-+
-+;; R10000 has separate fp-div and fp-sqrt units as well and these can
-+;; execute in parallel, however their issue & completion logic is shared
-+;; by the fp-multiplier
-+(define_cpu_unit "r10k_fpdiv" "r10k_fp")
-+(define_cpu_unit "r10k_fpsqrt" "r10k_fp")
-+
-+
-+
-+
-+;; loader
-+(define_insn_reservation "r10k_load" 2
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "load,prefetch,prefetchx"))
-+  "r10k_loadstore")
-+
-+(define_insn_reservation "r10k_store" 0
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "store,fpstore,fpidxstore"))
-+  "r10k_loadstore")
-+
-+(define_insn_reservation "r10k_fpload" 3
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "fpload,fpidxload"))
-+  "r10k_loadstore")
-+
-+
-+
-+
-+;; Integer add/sub + logic ops, and mf/mt hi/lo can be done by alu1 or alu2
-+;; Miscellaneous arith goes here too (this is a guess)
-+(define_insn_reservation "r10k_arith" 1
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "arith,mfhilo,mthilo,slt,clz,const,nop,trap"))
-+  "r10k_alu1 | r10k_alu2")
-+
-+
-+
-+
-+;; ALU1 handles shifts, branch eval, and condmove
-+;;
-+;; Brancher is separate, but part of ALU1, but can only
-+;; do one branch per cycle (needs implementing??)
-+;;
-+;; jump, call - unsure if brancher handles these too (added for now)
-+(define_insn_reservation "r10k_shift" 1
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "shift,branch,jump,call"))
-+  "r10k_alu1")
-+
-+(define_insn_reservation "r10k_int_cmove" 1
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "condmove")
-+            (eq_attr "mode" "SI,DI")))
-+  "r10k_alu1")
-+
-+
-+
-+
-+;; Coprocessor Moves
-+;; mtc1/dmtc1 are handled by ALU1
-+;; mfc1/dmfc1 are handled by the fp-multiplier
-+(define_insn_reservation "r10k_mt_xfer" 3
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "xfer")
-+            (not (match_operand 0 "fpr_operand"))))
-+  "r10k_alu1")
-+
-+(define_insn_reservation "r10k_mf_xfer" 2
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "xfer")
-+            (match_operand 0 "fpr_operand")))
-+  "r10k_fpmpy")
-+
-+
-+
-+
-+;; Only ALU2 does int multiplications and divisions
-+;; R10K allows an int insn using register Lo to be issued
-+;; one cycle earlier than an insn using register Hi for
-+;; the insns below, however, we skip on doing this
-+;; for now until correct usage of lo_operand() is figured
-+;; out.
-+;;
-+;; Divides keep ALU2 busy, but this isn't expressed here (I think...?)
-+(define_insn_reservation "r10k_imul_single" 6
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "imul,imul3,imadd")
-+            (eq_attr "mode" "SI")))
-+  "r10k_alu2 * 6")
-+
-+(define_insn_reservation "r10k_imul_double" 10
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "imul,imul3,imadd")
-+            (eq_attr "mode" "DI")))
-+  "r10k_alu2 * 10")
-+
-+(define_insn_reservation "r10k_idiv_single" 35
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "idiv")
-+            (eq_attr "mode" "SI")))
-+  "r10k_alu2 * 35")
-+
-+(define_insn_reservation "r10k_idiv_double" 67
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "idiv")
-+            (eq_attr "mode" "DI")))
-+  "r10k_alu2 * 67")
-+
-+
-+
-+
-+;; FP add/sub, mul, abs value, neg, comp, & moves
-+(define_insn_reservation "r10k_fp_miscadd" 2
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "fadd,fabs,fneg,fcmp"))
-+  "r10k_fpadd")
-+
-+(define_insn_reservation "r10k_fp_miscmul" 2
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "fmul,fmove"))
-+  "r10k_fpmpy")
-+
-+(define_insn_reservation "r10k_fp_cmove" 2
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "condmove")
-+            (eq_attr "mode" "SF,DF")))
-+  "r10k_fpmpy")
-+
-+
-+
-+
-+;; fcvt.s.[wl] has latency 4, repeat 2
-+;; All other fcvt have latency 2, repeat 1
-+(define_insn_reservation "r10k_fcvt_single" 4
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "fcvt")
-+            (eq_attr "cnv_mode" "I2S")))
-+  "r10k_fpadd * 2")
-+
-+(define_insn_reservation "r10k_fcvt_other" 2
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "fcvt")
-+            (eq_attr "cnv_mode" "!I2S")))
-+  "r10k_fpadd")
-+
-+
-+
-+
-+;; fmadd -  Runs through fp-adder first, then fp-multiplier
-+;;
-+;; The latency for fmadd is 2 cycles if the result is used
-+;; by another fmadd instruction
-+(define_insn_reservation "r10k_fmadd" 4
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "fmadd"))
-+  "r10k_fpadd, r10k_fpmpy")
-+
-+(define_bypass 2 "r10k_fmadd" "r10k_fmadd")
-+
-+
-+
-+
-+;; fp Divisions & square roots 
-+(define_insn_reservation "r10k_fdiv_single" 12
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "fdiv,frdiv")
-+            (eq_attr "mode" "SF")))
-+  "r10k_fpdiv * 14")
-+
-+(define_insn_reservation "r10k_fdiv_double" 19
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "fdiv,frdiv")
-+            (eq_attr "mode" "DF")))
-+  "r10k_fpdiv * 21")
-+
-+(define_insn_reservation "r10k_fsqrt_single" 18
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "fsqrt")
-+            (eq_attr "mode" "SF")))
-+  "r10k_fpsqrt * 20")
-+
-+(define_insn_reservation "r10k_fsqrt_double" 33
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "fsqrt")
-+            (eq_attr "mode" "DF")))
-+  "r10k_fpsqrt * 35")
-+
-+(define_insn_reservation "r10k_frsqrt_single" 30
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "frsqrt")
-+            (eq_attr "mode" "SF")))
-+  "r10k_fpsqrt * 20")
-+
-+(define_insn_reservation "r10k_frsqrt_double" 52
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (and (eq_attr "type" "frsqrt")
-+            (eq_attr "mode" "DF")))
-+  "r10k_fpsqrt * 35")
-+
-+
-+
-+
-+;; Unknown/multi (this is a guess)
-+(define_insn_reservation "r10k_unknown" 1
-+  (and (eq_attr "cpu" "r10000,r12000,r14000,r16000")
-+       (eq_attr "type" "unknown,multi"))
-+  "r10k_alu1 + r10k_alu2")
-+
-Index: gcc-4.2.3/gcc/config/mips/mips.c
-===================================================================
---- gcc-4.2.3.orig/gcc/config/mips/mips.c
-+++ gcc-4.2.3/gcc/config/mips/mips.c
-@@ -734,6 +734,10 @@ const struct mips_cpu_info mips_cpu_info
- 
-   /* MIPS IV */
-   { "r8000", PROCESSOR_R8000, 4 },
-+  { "r10000", PROCESSOR_R10000, 4 },
-+  { "r12000", PROCESSOR_R12000, 4 },
-+  { "r14000", PROCESSOR_R14000, 4 },
-+  { "r16000", PROCESSOR_R16000, 4 },
-   { "vr5000", PROCESSOR_R5000, 4 },
-   { "vr5400", PROCESSOR_R5400, 4 },
-   { "vr5500", PROCESSOR_R5500, 4 },
-@@ -1014,6 +1018,58 @@ static struct mips_rtx_cost_data const m
-                        1,           /* branch_cost */
-                        4            /* memory_latency */
-     },
-+    { /* R10000 */
-+      COSTS_N_INSNS (2),            /* fp_add */
-+      COSTS_N_INSNS (2),            /* fp_mult_sf */
-+      COSTS_N_INSNS (2),            /* fp_mult_df */
-+      COSTS_N_INSNS (12),           /* fp_div_sf */
-+      COSTS_N_INSNS (19),           /* fp_div_df */
-+      COSTS_N_INSNS (6),            /* int_mult_si */
-+      COSTS_N_INSNS (10),           /* int_mult_di */
-+      COSTS_N_INSNS (35),           /* int_div_si */
-+      COSTS_N_INSNS (67),           /* int_div_di */
-+                       1,           /* branch_cost */
-+                       4            /* memory_latency */
-+    },
-+    { /* R12000 */
-+      COSTS_N_INSNS (2),            /* fp_add */
-+      COSTS_N_INSNS (2),            /* fp_mult_sf */
-+      COSTS_N_INSNS (2),            /* fp_mult_df */
-+      COSTS_N_INSNS (12),           /* fp_div_sf */
-+      COSTS_N_INSNS (19),           /* fp_div_df */
-+      COSTS_N_INSNS (6),            /* int_mult_si */
-+      COSTS_N_INSNS (10),           /* int_mult_di */
-+      COSTS_N_INSNS (35),           /* int_div_si */
-+      COSTS_N_INSNS (67),           /* int_div_di */
-+                       1,           /* branch_cost */
-+                       4            /* memory_latency */
-+    },
-+    { /* R14000 */
-+      COSTS_N_INSNS (2),            /* fp_add */
-+      COSTS_N_INSNS (2),            /* fp_mult_sf */
-+      COSTS_N_INSNS (2),            /* fp_mult_df */
-+      COSTS_N_INSNS (12),           /* fp_div_sf */
-+      COSTS_N_INSNS (19),           /* fp_div_df */
-+      COSTS_N_INSNS (6),            /* int_mult_si */
-+      COSTS_N_INSNS (10),           /* int_mult_di */
-+      COSTS_N_INSNS (35),           /* int_div_si */
-+      COSTS_N_INSNS (67),           /* int_div_di */
-+                       1,           /* branch_cost */
-+                       4            /* memory_latency */
-+    },
-+    { /* R16000 */
-+      COSTS_N_INSNS (2),            /* fp_add */
-+      COSTS_N_INSNS (2),            /* fp_mult_sf */
-+      COSTS_N_INSNS (2),            /* fp_mult_df */
-+      COSTS_N_INSNS (12),           /* fp_div_sf */
-+      COSTS_N_INSNS (19),           /* fp_div_df */
-+      COSTS_N_INSNS (6),            /* int_mult_si */
-+      COSTS_N_INSNS (10),           /* int_mult_di */
-+      COSTS_N_INSNS (35),           /* int_div_si */
-+      COSTS_N_INSNS (67),           /* int_div_di */
-+                       1,           /* branch_cost */
-+                       4            /* memory_latency */
-+    },
-     { /* SB1 */
-       /* These costs are the same as the SB-1A below.  */
-       COSTS_N_INSNS (4),            /* fp_add */
-@@ -10136,6 +10192,12 @@ mips_issue_rate (void)
- {
-   switch (mips_tune)
-     {
-+    case PROCESSOR_R10000:
-+    case PROCESSOR_R12000:
-+    case PROCESSOR_R14000:
-+    case PROCESSOR_R16000:
-+      return 4;
-+
-     case PROCESSOR_R4130:
-     case PROCESSOR_R5400:
-     case PROCESSOR_R5500:
-Index: gcc-4.2.3/gcc/config/mips/mips.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/mips/mips.h
-+++ gcc-4.2.3/gcc/config/mips/mips.h
-@@ -56,6 +56,10 @@ enum processor_type {
-   PROCESSOR_R7000,
-   PROCESSOR_R8000,
-   PROCESSOR_R9000,
-+  PROCESSOR_R10000,
-+  PROCESSOR_R12000,
-+  PROCESSOR_R14000,
-+  PROCESSOR_R16000,
-   PROCESSOR_SB1,
-   PROCESSOR_SB1A,
-   PROCESSOR_SR71000,
-@@ -208,6 +212,10 @@ extern const struct mips_rtx_cost_data *
- #define TARGET_MIPS5500             (mips_arch == PROCESSOR_R5500)
- #define TARGET_MIPS7000             (mips_arch == PROCESSOR_R7000)
- #define TARGET_MIPS9000             (mips_arch == PROCESSOR_R9000)
-+#define TARGET_MIPS10000            (mips_arch == PROCESSOR_R10000)
-+#define TARGET_MIPS12000            (mips_arch == PROCESSOR_R12000)
-+#define TARGET_MIPS14000            (mips_arch == PROCESSOR_R14000)
-+#define TARGET_MIPS16000            (mips_arch == PROCESSOR_R16000)
- #define TARGET_SB1                  (mips_arch == PROCESSOR_SB1		\
- 				     || mips_arch == PROCESSOR_SB1A)
- #define TARGET_SR71K                (mips_arch == PROCESSOR_SR71000)
-@@ -224,6 +232,10 @@ extern const struct mips_rtx_cost_data *
- #define TUNE_MIPS6000               (mips_tune == PROCESSOR_R6000)
- #define TUNE_MIPS7000               (mips_tune == PROCESSOR_R7000)
- #define TUNE_MIPS9000               (mips_tune == PROCESSOR_R9000)
-+#define TUNE_MIPS10000              (mips_tune == PROCESSOR_R10000)
-+#define TUNE_MIPS12000              (mips_tune == PROCESSOR_R12000)
-+#define TUNE_MIPS14000              (mips_tune == PROCESSOR_R14000)
-+#define TUNE_MIPS16000              (mips_tune == PROCESSOR_R16000)
- #define TUNE_SB1                    (mips_tune == PROCESSOR_SB1		\
- 				     || mips_tune == PROCESSOR_SB1A)
- 
-Index: gcc-4.2.3/gcc/config/mips/mips.md
-===================================================================
---- gcc-4.2.3.orig/gcc/config/mips/mips.md
-+++ gcc-4.2.3/gcc/config/mips/mips.md
-@@ -340,7 +340,7 @@
- ;; Attribute describing the processor.  This attribute must match exactly
- ;; with the processor_type enumeration in mips.h.
- (define_attr "cpu"
--  "r3000,4kc,4kp,5kc,5kf,20kc,24k,24kx,m4k,r3900,r6000,r4000,r4100,r4111,r4120,r4130,r4300,r4600,r4650,r5000,r5400,r5500,r7000,r8000,r9000,sb1,sb1a,sr71000"
-+  "r3000,4kc,4kp,5kc,5kf,20kc,24k,24kx,m4k,r3900,r6000,r4000,r4100,r4111,r4120,r4130,r4300,r4600,r4650,r5000,r5400,r5500,r7000,r8000,r9000,r10000,r12000,r14000,r16000,sb1,sb1a,sr71000"
-   (const (symbol_ref "mips_tune")))
- 
- ;; The type of hardware hazard associated with this instruction.
-@@ -600,6 +600,7 @@
- (include "6000.md")
- (include "7000.md")
- (include "9000.md")
-+(include "10000.md")
- (include "sb1.md")
- (include "sr71k.md")
- (include "generic.md")
diff --git a/patches/gcc-4.2.3/generic/gentoo/91_all_mips-ip28_cache_barriers-v4.patch b/patches/gcc-4.2.3/generic/gentoo/91_all_mips-ip28_cache_barriers-v4.patch
deleted file mode 100644
index 48d52f6..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/91_all_mips-ip28_cache_barriers-v4.patch
+++ /dev/null
@@ -1,352 +0,0 @@
----
- gcc/config/mips/mips.c        |    7 
- gcc/config/mips/mips.opt      |   10 +
- gcc/config/mips/r10k-cacheb.c |  298 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 315 insertions(+)
-
-Index: gcc-4.2.3/gcc/config/mips/mips.c
-===================================================================
---- gcc-4.2.3.orig/gcc/config/mips/mips.c
-+++ gcc-4.2.3/gcc/config/mips/mips.c
-@@ -255,6 +255,9 @@ static const char *const mips_fp_conditi
-   MIPS_FP_CONDITIONS (STRINGIFY)
- };
- 
-+/* R10K Cache Barrier Functions */
-+#include "r10k-cacheb.c"
-+
- /* A function to save or store a register.  The first argument is the
-    register and the second is the stack slot.  */
- typedef void (*mips_save_restore_fn) (rtx, rtx);
-@@ -8908,6 +8911,10 @@ vr4130_avoid_branch_rt_conflict (rtx ins
- 	  XEXP (cond, 1) = tmp;
- 	}
-     }
-+  if (TARGET_R10K_SPECEX)
-+    {
-+      r10k_insert_cache_barriers ();
-+    }
- }
- 
- /* Implement -mvr4130-align.  Go through each basic block and simulate the
-Index: gcc-4.2.3/gcc/config/mips/mips.opt
-===================================================================
---- gcc-4.2.3.orig/gcc/config/mips/mips.opt
-+++ gcc-4.2.3/gcc/config/mips/mips.opt
-@@ -219,3 +219,13 @@ Perform VR4130-specific alignment optimi
- mxgot
- Target Report Var(TARGET_XGOT)
- Lift restrictions on GOT size
-+
-+mr10k-cache-barrier=
-+Target Report Joined UInteger Var(TARGET_R10K_SPECEX)
-+-mr10k-cache-barrier[=1|2]	Generate cache barriers for SGI Indigo2/O2 R10k
-+
-+mr10k-cache-barrier
-+Target Undocumented Var(TARGET_R10K_SPECEX) VarExists
-+
-+mip28-cache-barrier
-+Target Undocumented Var(TARGET_R10K_SPECEX) VarExists
-Index: gcc-4.2.3/gcc/config/mips/r10k-cacheb.c
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/gcc/config/mips/r10k-cacheb.c
-@@ -0,0 +1,298 @@
-+/* Subroutines used for MIPS code generation: generate cache-barriers
-+   for SiliconGraphics IP28 and IP32/R10000 kernel-code.
-+   Copyright (C) 2005,2006 peter fuerst, pf@net.alphadv.de.
-+
-+This file is intended to become part of GCC.
-+
-+This file 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 file 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 GCC; see the file COPYING.  If not, write to the
-+Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston,
-+MA  02110-1301  USA.  */
-+
-+
-+#define ASM_R10K_CACHE_BARRIER	"cache 0x14,0($sp)"
-+
-+static int is_stack_pointer (rtx *x, void *data);
-+static int check_p_mem_expr (rtx *memx, void *data);
-+static int check_p_pattern_for_store (rtx *body, void *data);
-+static int strmatch (const char *txt, const char *match);
-+static int check_insn_for_store (int state, rtx insn);
-+static int bb_insert_store_cache_barrier (rtx head, rtx nxtb);
-+static int scan_1_bb_for_store (rtx head, rtx end);
-+static int r10k_insert_cache_barriers (void);
-+
-+
-+/* Check, whether an instruction is a possibly harmful store instruction,
-+   i.e. a store which might cause damage, if speculatively executed. */
-+
-+/* Return truth value whether the expression `*memx' instantiates
-+   (mem:M (not (stackpointer_address or constant))). */
-+
-+static int
-+is_stack_pointer (rtx *x, void *data)
-+{
-+  return (*x == stack_pointer_rtx);
-+}
-+
-+static int
-+check_p_mem_expr (rtx *memx, void *data)
-+{
-+  if (!MEM_P (*memx) || for_each_rtx (memx, is_stack_pointer, 0))
-+    return 0;
-+
-+  /* Stores/Loads to/from constant addresses can be considered
-+     harmless, since:
-+     1)  the address is always valid, even when taken speculatively.
-+     2a) the location is (hopefully) never used as a dma-target, thus
-+         there is no danger of cache-inconsistency.
-+     2b) uncached loads/stores are guaranteed to be non-speculative. */
-+  if ( CONSTANT_P(XEXP (*memx, 0)) )
-+    return 0;
-+
-+  return 1;
-+}
-+
-+/* Return truth value whether we find (set (mem:M (non_stackpointer_address)
-+   ...)) in instruction-pattern `body'.
-+   Here we assume, that addressing with the stackpointer accesses neither
-+   uncached-aliased nor invalid memory.
-+   (May be, this applies to the global pointer and frame pointer also,
-+   but its saver not to assume it. And probably it's not worthwile to
-+   regard these registers)
-+
-+   Speculative loads from invalid addresses also cause bus errors...
-+   So check for (set (reg:M ...) (mem:M (non_stackpointer_address)))
-+   too, unless there is an enhanced bus-error handler. */
-+
-+static int
-+check_p_pattern_for_store (rtx *body, void *data)
-+{
-+  if (*body && GET_CODE (*body) == SET)
-+    {
-+      /* Cache-barriers for SET_SRC may be requested as well. */
-+      if (!(TARGET_R10K_SPECEX & 2))
-+        body = &SET_DEST(*body);
-+
-+      if (for_each_rtx (body, check_p_mem_expr, 0))
-+        return 1;
-+
-+      /* Don't traverse sub-expressions again. */
-+      return -1;
-+    }
-+  return 0;
-+}
-+
-+static int
-+strmatch (const char *txt, const char *match)
-+{
-+  return !strncmp(txt, match, strlen (match));
-+}
-+
-+/* Check for (ins (set (mem:M (dangerous_address)) ...)) or end of the
-+   current basic block in instruction `insn'.
-+   `state': (internal) recursion-counter and delayslot-flag
-+   Criteria to recognize end-of/next basic-block are reduplicated here
-+   from final_scan_insn.
-+   return >0: `insn' is critical.
-+   return <0: `insn' is at end of current basic-block.
-+   return 0:  `insn' can be ignored. */
-+
-+static int
-+check_insn_for_store (int state, rtx insn)
-+{
-+  rtx body;
-+
-+  if (INSN_DELETED_P (insn))
-+    return 0;
-+
-+  if (LABEL_P (insn))
-+    return -1;
-+
-+  if (CALL_P (insn) || JUMP_P (insn) || NONJUMP_INSN_P (insn))
-+    {
-+      body = PATTERN (insn);
-+      if (GET_CODE (body) == SEQUENCE)
-+        {
-+          /* A delayed-branch sequence. */
-+          rtx insq;
-+          FOR_EACH_SUBINSN(insq, insn)
-+            if (! INSN_DELETED_P (insq))
-+              {
-+                /* |1: delay-slot completely contained in sequence. */
-+                if (check_insn_for_store (8+state|1, insq) > 0)
-+                  return 1;
-+              }
-+          /* Following a (conditional) branch sequence, we have a new
-+             basic block.  */
-+          if (JUMP_P (SEQ_BEGIN(insn)))
-+            return -1;
-+          /* Handle a call sequence like a conditional branch sequence. */
-+          if (CALL_P (SEQ_BEGIN(insn)))
-+            return -1;
-+        }
-+      if (GET_CODE (body) == PARALLEL)
-+        if (for_each_rtx (&body, check_p_pattern_for_store, 0))
-+           return 1;
-+
-+      /* Now, only a `simple' INSN or JUMP_INSN remains to be checked. */
-+      if (NONJUMP_INSN_P (insn))
-+        {
-+          /* Since we don't know what's inside, we must take inline
-+             assembly to be dangerous. */
-+          if (GET_CODE (body) == ASM_INPUT)
-+            {
-+              const char *t = XSTR (body, 0);
-+              if (t && !strmatch(t, ASM_R10K_CACHE_BARRIER))
-+                return 1;
-+            }
-+
-+          if (check_p_pattern_for_store (&body, 0) > 0)
-+            return 1;
-+        }
-+      /* Handle a CALL_INSN instruction like a conditional branch. */
-+      if (JUMP_P (insn) || CALL_P (insn))
-+        {
-+          /* Following a (conditional) branch, we have a new basic block. */
-+          /* But check insn(s) in delay-slot first.  If we could know in
-+             advance that this jump is in `.reorder' mode, where gas will
-+             insert a `nop' into the delay-slot, we could skip this test.
-+             Since we don't know, always assume `.noreorder', sometimes
-+             emitting a cache-barrier, that isn't needed.  */
-+          /* But if we are here recursively, already checking a (pseudo-)
-+             delay-slot, we are done.  */
-+          if ( !(state & 1) )
-+            for (insn = NEXT_INSN (insn); insn; insn = NEXT_INSN (insn))
-+              {
-+                if (LABEL_P (insn) || CALL_P (insn) || JUMP_P (insn))
-+                  /* Not in delay-slot at all. */
-+                  break;
-+
-+                if (NONJUMP_INSN_P (insn))
-+                  {
-+                    if (GET_CODE (PATTERN (insn)) == SEQUENCE)
-+                      /* Not in delay-slot at all. */
-+                      break;
-+
-+                    if (check_insn_for_store (8+state|1, insn) > 0)
-+                      return 1;
-+                    /* We're done anyway. */
-+                    break;
-+                  }
-+                /* skip NOTE,... */;
-+              }
-+          return -1;
-+        }
-+    }
-+  return 0;
-+}
-+
-+
-+/* Scan a basic block, starting with `insn', for a possibly harmful store
-+   instruction.  If found, output a cache barrier at the start of this
-+   block.  */
-+
-+static int
-+bb_insert_store_cache_barrier (rtx head, rtx nxtb)
-+{
-+  rtx insn = head;
-+
-+  if (!insn || insn == nxtb)
-+     return 0;
-+
-+  while ((insn = NEXT_INSN (insn)) && insn != nxtb)
-+    {
-+      int found;
-+
-+      if (NOTE_INSN_BASIC_BLOCK_P(insn)) /* See scan_1_bb_for_store() */
-+        break;
-+      
-+      found = check_insn_for_store (0, insn);
-+      if (found < 0)
-+        break;
-+      if (found > 0)
-+        {
-+          /* found critical store instruction */
-+          insn = gen_rtx_ASM_INPUT (VOIDmode,
-+                                    ASM_R10K_CACHE_BARRIER "\t"
-+                                    ASM_COMMENT_START " Cache Barrier");
-+          /* Here we rely on the assumption, that an explicit delay-slot
-+             - if any - is already embedded (in a sequence) in 'head'! */
-+          insn = emit_insn_after (insn, head);
-+          return 1;
-+        }
-+    }
-+  return 0;
-+}
-+
-+
-+/* Scan one basic block for a possibly harmful store instruction.
-+   If found, insert a cache barrier at the start of this block,
-+   return number of inserted cache_barriers. */
-+
-+static int
-+scan_1_bb_for_store (rtx head, rtx end)
-+{
-+  rtx nxtb;
-+  int count;
-+  gcc_assert (head);
-+  gcc_assert (end);
-+
-+  /* Note: 'end' is not necessarily reached from 'head' (hidden in
-+     SEQUENCE, PARALLEL), but 'nxtb' is. */
-+  nxtb = NEXT_INSN (end);
-+
-+  /* Each basic block starts with zero or more CODE_LABEL(s), followed
-+     by one NOTE_INSN_BASIC_BLOCK.
-+     Note: bb_head may equal next_insn(bb_end) already ! */
-+  while (head && head != nxtb && LABEL_P (head))
-+    head = NEXT_INSN (head);
-+
-+  if (!head || head == nxtb)
-+    return 0;
-+
-+  /* Handle the basic block itself, at most up to next CALL_INSN. */
-+  count = bb_insert_store_cache_barrier (head, nxtb);
-+
-+  /* 1) Handle any CALL_INSN instruction like a conditional branch.
-+     2) There may be "basic blocks" in the list, which are no basic blocks
-+        at all. (containing CODE_LABELs in the body or gathering several
-+        other basic blocks (e.g. bb5 containing bb6,bb7,bb8)). */
-+
-+  while ((head = NEXT_INSN (head)) && head != nxtb)
-+    {
-+      if (INSN_DELETED_P (head))
-+        continue;
-+
-+      /* Later we'll be called again for this bb on its own. */
-+      if (NOTE_INSN_BASIC_BLOCK_P(head))
-+        break;
-+
-+      if (CALL_P (SEQ_BEGIN (head)) || LABEL_P (head))
-+        count += bb_insert_store_cache_barrier (head, nxtb);
-+    }
-+  return count;
-+}
-+
-+static int
-+r10k_insert_cache_barriers (void)
-+{
-+  if (TARGET_R10K_SPECEX)
-+    {
-+      basic_block bb;
-+
-+      FOR_EACH_BB (bb)
-+        if (0 <= bb->index)
-+          scan_1_bb_for_store (BB_HEAD (bb), BB_END (bb));
-+    }
-+  return 0;
-+}
diff --git a/patches/gcc-4.2.3/generic/gentoo/92_all_mips-pthread-with-shared.patch b/patches/gcc-4.2.3/generic/gentoo/92_all_mips-pthread-with-shared.patch
deleted file mode 100644
index 342daad..0000000
--- a/patches/gcc-4.2.3/generic/gentoo/92_all_mips-pthread-with-shared.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-just like this, but for mips:
-http://gcc.gnu.org/ml/gcc-patches/2002-12/msg00526.html
-
----
- gcc/config/mips/linux.h   |    4 ++--
- gcc/config/mips/linux64.h |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-Index: gcc-4.2.3/gcc/config/mips/linux.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/mips/linux.h
-+++ gcc-4.2.3/gcc/config/mips/linux.h
-@@ -174,7 +174,7 @@ along with GCC; see the file COPYING3.  
- #undef LIB_SPEC
- #define LIB_SPEC "\
- %{shared: -lc} \
--%{!shared: %{pthread:-lpthread} \
--  %{profile:-lc_p} %{!profile: -lc}}"
-+%{pthread:-lpthread} \
-+%{!shared: %{profile:-lc_p} %{!profile: -lc}}"
- 
- #define MD_UNWIND_SUPPORT "config/mips/linux-unwind.h"
-Index: gcc-4.2.3/gcc/config/mips/linux64.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/mips/linux64.h
-+++ gcc-4.2.3/gcc/config/mips/linux64.h
-@@ -32,8 +32,8 @@ along with GCC; see the file COPYING3.  
- #undef LIB_SPEC
- #define LIB_SPEC "\
- %{shared: -lc} \
--%{!shared: %{pthread:-lpthread} \
--  %{profile:-lc_p} %{!profile: -lc}}"
-+%{pthread:-lpthread} \
-+%{!shared: %{profile:-lc_p} %{!profile: -lc}}"
- 
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
- #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
diff --git a/patches/gcc-4.2.3/generic/no-host-includes.diff b/patches/gcc-4.2.3/generic/no-host-includes.diff
deleted file mode 100644
index da20fb8..0000000
--- a/patches/gcc-4.2.3/generic/no-host-includes.diff
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Submitted-By: Marc Kleine-Budde, 2006-11-03
-#
-# Error:
-#
-# No error :)
-# With this patch gcc bails out if you include a host include path into the searchlist (-I)
-#
-# Description:
-#
-# inspired by:
-# http://www.openembedded.org/repo/org.openembedded.dev/packages/gcc/gcc-4.1.1/zecke-no-host-includes.patch
-#
----
-# gcc/c-incpath.c |   28 ++++++++++++++++++++++++++++
-# 1 file changed, 28 insertions(+)
-#
-Index: gcc-4.2.3/gcc/c-incpath.c
-===================================================================
---- gcc-4.2.3.orig/gcc/c-incpath.c
-+++ gcc-4.2.3/gcc/c-incpath.c
-@@ -359,6 +359,34 @@ add_path (char *path, int chain, int cxx
-   p->construct = 0;
-   p->user_supplied_p = user_supplied_p;
- 
-+#ifdef CROSS_COMPILE
-+    /* A common error when cross compiling is including
-+    host headers. This code below will try to fail fast
-+    for cross compiling. Currently we consider /usr/include,
-+    /opt/include and /sw/include as harmful.  */
-+	{
-+		unsigned int i;
-+		const char *bad_path[] = {
-+			"/usr/include",
-+			"/usr/local/include",
-+			"/sw/include",
-+			"/opt/include",
-+		};
-+
-+		for (i = 0; i < sizeof(bad_path)/sizeof(bad_path[0]); i++) {
-+			if( strstr(p->name, bad_path[i]) == p->name ) {
-+				fprintf(stderr,_("\n"
-+						 "CROSS COMPILE Badness: %s in INCLUDEPATH: %s\n"
-+						 "\n"),
-+
-+				      bad_path[i], p->name);
-+
-+				exit (FATAL_EXIT_CODE);
-+			}
-+		}
-+	}
-+#endif
-+
-   add_cpp_dir_path (p, chain);
- }
- 
diff --git a/patches/gcc-4.2.3/generic/oe/arm-thumb-cache.patch b/patches/gcc-4.2.3/generic/oe/arm-thumb-cache.patch
deleted file mode 100644
index 5820a10..0000000
--- a/patches/gcc-4.2.3/generic/oe/arm-thumb-cache.patch
+++ /dev/null
@@ -1,35 +0,0 @@
----
- gcc/config/arm/linux-gas.h |   16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-Index: gcc-4.2.3/gcc/config/arm/linux-gas.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/linux-gas.h
-+++ gcc-4.2.3/gcc/config/arm/linux-gas.h
-@@ -43,6 +43,7 @@
- 
- /* Clear the instruction cache from `beg' to `end'.  This makes an
-    inline system call to SYS_cacheflush.  */
-+#if !defined(__thumb__)
- #define CLEAR_INSN_CACHE(BEG, END)					\
- {									\
-   register unsigned long _beg __asm ("a1") = (unsigned long) (BEG);	\
-@@ -52,3 +53,18 @@
- 		    : "=r" (_beg)					\
- 		    : "0" (_beg), "r" (_end), "r" (_flg));		\
- }
-+#else
-+#define CLEAR_INSN_CACHE(BEG, END)					\
-+{									\
-+  register unsigned long _beg __asm ("a1") = (unsigned long) (BEG);	\
-+  register unsigned long _end __asm ("a2") = (unsigned long) (END);	\
-+  register unsigned long _flg __asm ("a3") = 0;				\
-+  register unsigned long _swi __asm ("a4") = 0xf0002;			\
-+  __asm __volatile ("push      {r7}\n"                                 \
-+               "       mov     r7,a4\n"                                \
-+               "       swi     0       @ sys_cacheflush\n"             \
-+               "       pop     {r7}\n"                                 \
-+                   : "=r" (_beg)                                       \
-+                   : "0" (_beg), "r" (_end), "r" (_flg), "r" (_swi));  \
-+}
-+#endif
diff --git a/patches/gcc-4.2.3/generic/oe/arm-thumb.patch b/patches/gcc-4.2.3/generic/oe/arm-thumb.patch
deleted file mode 100644
index a85416a..0000000
--- a/patches/gcc-4.2.3/generic/oe/arm-thumb.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-
-#
-# Patch managed by http://www.holgerschurig.de/patcher.html
-#
-
----
- gcc/config/arm/lib1funcs.asm |   18 +++++++++++++++++-
- gcc/config/arm/t-linux       |    1 +
- 2 files changed, 18 insertions(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/config/arm/lib1funcs.asm
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/lib1funcs.asm
-+++ gcc-4.2.3/gcc/config/arm/lib1funcs.asm
-@@ -995,10 +995,24 @@ LSYM(Lover12):
- 	.code	32
- 	FUNC_START div0
- 
-+#if ! defined __thumb__
- 	stmfd	sp!, {r1, lr}
- 	mov	r0, #SIGFPE
- 	bl	SYM(raise) __PLT__
- 	RETLDM	r1
-+#else
-+       push    {r1, lr}
-+	mov	r0, #SIGFPE
-+	bl	SYM(raise) __PLT__
-+#if __ARM_ARCH__ > 4
-+       pop     {r1, pc}
-+#else
-+       @ on 4T that won't work
-+       pop     {r1}
-+       pop     {r3}
-+       bx      r3
-+#endif
-+#endif
- 
- 	FUNC_END div0
- 	
-@@ -1146,11 +1160,12 @@ LSYM(Lover12):
-    code here switches to the correct mode before executing the function.  */
- 	
- 	.text
--	.align 0
-+	.align 1
-         .force_thumb
- 
- .macro call_via register
- 	THUMB_FUNC_START _call_via_\register
-+       .hidden SYM (_call_via_\register)
- 
- 	bx	\register
- 	nop
-@@ -1247,6 +1262,7 @@ _arm_return_r11:
- 	.code	16
- 
- 	THUMB_FUNC_START _interwork_call_via_\register
-+       .hidden SYM (_interwork_call_via_\register)
- 
- 	bx	pc
- 	nop
-Index: gcc-4.2.3/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/t-linux
-+++ gcc-4.2.3/gcc/config/arm/t-linux
-@@ -7,6 +7,7 @@ LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \
- 	_negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
- 	_truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+	_call_via_rX \
- 	_fixsfsi _fixunssfsi _floatdidf _floatdisf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
diff --git a/patches/gcc-4.2.3/generic/oe/fix-ICE-in-arm_unwind_emit_set.diff b/patches/gcc-4.2.3/generic/oe/fix-ICE-in-arm_unwind_emit_set.diff
deleted file mode 100644
index b4d172b..0000000
--- a/patches/gcc-4.2.3/generic/oe/fix-ICE-in-arm_unwind_emit_set.diff
+++ /dev/null
@@ -1,24 +0,0 @@
----
- gcc/config/arm/arm.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
-Index: gcc-4.2.3/gcc/config/arm/arm.c
-===================================================================
---- gcc-4.2.3.orig/gcc/config/arm/arm.c
-+++ gcc-4.2.3/gcc/config/arm/arm.c
-@@ -15485,6 +15485,15 @@ arm_unwind_emit_set (FILE * asm_out_file
- 	  asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n",
- 		       REGNO (e0), (int)INTVAL(XEXP (e1, 1)));
- 	}
-+     else if (GET_CODE (e1) == PLUS
-+	      && GET_CODE (XEXP (e1, 0)) == REG
-+	      && REGNO (XEXP (e1, 0)) == SP_REGNUM
-+	      && GET_CODE (XEXP (e1, 1)) == CONST_INT)
-+	{
-+	  /* Set reg to offset from sp.  */
-+	  asm_fprintf (asm_out_file, "\t.movsp %r, #%d\n",
-+		       REGNO (e0), (int)INTVAL(XEXP (e1, 1)));
-+	}
-       else
- 	abort ();
-       break;
diff --git a/patches/gcc-4.2.3/generic/oe/gcc-4.0.2-e300c2c3.patch b/patches/gcc-4.2.3/generic/oe/gcc-4.0.2-e300c2c3.patch
deleted file mode 100644
index 87cb09e..0000000
--- a/patches/gcc-4.2.3/generic/oe/gcc-4.0.2-e300c2c3.patch
+++ /dev/null
@@ -1,319 +0,0 @@
-Adds support for Freescale Power architecture e300c2 and e300c3 cores.
-http://www.bitshrine.org/gpp/tc-fsl-x86lnx-e300c3-nptl-4.0.2-2.src.rpm
-
-Leon Woestenberg <leonw@mailcan.com>
-
----
- gcc/config.gcc                |    2 
- gcc/config/rs6000/e300c2c3.md |  189 ++++++++++++++++++++++++++++++++++++++++++
- gcc/config/rs6000/rs6000.c    |   24 +++++
- gcc/config/rs6000/rs6000.h    |    4 
- gcc/config/rs6000/rs6000.md   |    3 
- 5 files changed, 220 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/gcc/config/rs6000/e300c2c3.md
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/gcc/config/rs6000/e300c2c3.md
-@@ -0,0 +1,189 @@
-+;; Pipeline description for Motorola PowerPC e300c3 core.
-+;;   Copyright (C) 2003 Free Software Foundation, Inc.
-+;;
-+;; This file is part of GCC.
-+
-+;; GCC 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.
-+
-+;; GCC 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 GCC; see the file COPYING.  If not, write to the
-+;; Free Software Foundation, 59 Temple Place - Suite 330, Boston,
-+;; MA 02111-1307, USA.
-+
-+(define_automaton "ppce300c3_most,ppce300c3_long,ppce300c3_retire")
-+(define_cpu_unit "ppce300c3_decode_0,ppce300c3_decode_1" "ppce300c3_most")
-+
-+;; We don't simulate general issue queue (GIC).  If we have SU insn
-+;; and then SU1 insn, they can not be issued on the same cycle
-+;; (although SU1 insn and then SU insn can be issued) because the SU
-+;; insn will go to SU1 from GIC0 entry.  Fortunately, the first cycle
-+;; multipass insn scheduling will find the situation and issue the SU1
-+;; insn and then the SU insn.
-+(define_cpu_unit "ppce300c3_issue_0,ppce300c3_issue_1"   "ppce300c3_most")
-+
-+;; We could describe completion buffers slots in combination with the
-+;; retirement units and the order of completion but the result
-+;; automaton would behave in the same way because we can not describe
-+;; real latency time with taking in order completion into account.
-+;; Actually we could define the real latency time by querying reserved
-+;; automaton units but the current scheduler uses latency time before
-+;; issuing insns and making any reservations.
-+;;
-+;; So our description is aimed to achieve a insn schedule in which the
-+;; insns would not wait in the completion buffer.
-+(define_cpu_unit "ppce300c3_retire_0,ppce300c3_retire_1" "ppce300c3_retire")
-+
-+;; Branch unit:
-+(define_cpu_unit "ppce300c3_bu" "ppce300c3_most")
-+
-+;; IU:
-+(define_cpu_unit "ppce300c3_iu0_stage0,ppce300c3_iu1_stage0" "ppce300c3_most")
-+
-+;; IU: This used to describe non-pipelined division.
-+(define_cpu_unit "ppce300c3_mu_div" "ppce300c3_long")
-+
-+;; SRU:
-+(define_cpu_unit "ppce300c3_sru_stage0" "ppce300c3_most")
-+
-+;; Here we simplified LSU unit description not describing the stages.
-+(define_cpu_unit "ppce300c3_lsu" "ppce300c3_most")
-+
-+;; FPU:
-+(define_cpu_unit "ppce300c3_fpu" "ppce300c3_most")
-+
-+;; The following units are used to make automata deterministic
-+(define_cpu_unit "present_ppce300c3_decode_0" "ppce300c3_most")
-+(define_cpu_unit "present_ppce300c3_issue_0" "ppce300c3_most")
-+(define_cpu_unit "present_ppce300c3_retire_0" "ppce300c3_retire")
-+(define_cpu_unit "present_ppce300c3_iu0_stage0" "ppce300c3_most")
-+
-+;; The following sets to make automata deterministic when option ndfa is used.
-+(presence_set "present_ppce300c3_decode_0" "ppce300c3_decode_0")
-+(presence_set "present_ppce300c3_issue_0" "ppce300c3_issue_0")
-+(presence_set "present_ppce300c3_retire_0" "ppce300c3_retire_0")
-+(presence_set "present_ppce300c3_iu0_stage0" "ppce300c3_iu0_stage0")
-+
-+;; Some useful abbreviations.
-+(define_reservation "ppce300c3_decode"
-+    "ppce300c3_decode_0|ppce300c3_decode_1+present_ppce300c3_decode_0")
-+(define_reservation "ppce300c3_issue"
-+    "ppce300c3_issue_0|ppce300c3_issue_1+present_ppce300c3_issue_0")
-+(define_reservation "ppce300c3_retire"
-+   "ppce300c3_retire_0|ppce300c3_retire_1+present_ppce300c3_retire_0")
-+(define_reservation "ppce300c3_iu_stage0"
-+   "ppce300c3_iu0_stage0|ppce300c3_iu1_stage0+present_ppce300c3_iu0_stage0")
-+
-+;; Compares can be executed either one of the IU or SRU
-+(define_insn_reservation "ppce300c3_cmp" 1
-+  (and (eq_attr "type" "cmp,compare,delayed_compare,fast_compare")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+(ppce300c3_iu_stage0|ppce300c3_sru_stage0) \
-+        +ppce300c3_retire")
-+
-+;; Other one cycle IU insns
-+(define_insn_reservation "ppce300c3_iu" 1
-+  (and (eq_attr "type" "integer,insert_word")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0+ppce300c3_retire")
-+
-+;; Branch.  Actually this latency time is not used by the scheduler.
-+(define_insn_reservation "ppce300c3_branch" 1
-+  (and (eq_attr "type" "jmpreg,branch")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_bu,ppce300c3_retire")
-+
-+;; Multiply is non-pipelined but can be executed in any IU
-+(define_insn_reservation "ppce300c3_multiply" 2
-+  (and (eq_attr "type" "imul,imul2,imul3,imul_compare")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0, \
-+   ppce300c3_iu_stage0+ppce300c3_retire")
-+
-+;; Divide.  We use the average latency time here.  We omit reserving a
-+;; retire unit because of the result automata will be huge.
-+(define_insn_reservation "ppce300c3_divide" 20
-+  (and (eq_attr "type" "idiv")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_iu_stage0+ppce300c3_mu_div,\
-+   ppce300c3_mu_div*19")
-+
-+;; CR logical
-+(define_insn_reservation "ppce300c3_cr_logical" 1
-+  (and (eq_attr "type" "cr_logical,delayed_cr")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mfcr
-+(define_insn_reservation "ppce300c3_mfcr" 1
-+  (and (eq_attr "type" "mfcr")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mtcrf
-+(define_insn_reservation "ppce300c3_mtcrf" 1
-+  (and (eq_attr "type" "mtcr")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Mtjmpr
-+(define_insn_reservation "ppce300c3_mtjmpr" 1
-+  (and (eq_attr "type" "mtjmpr,mfjmpr")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_sru_stage0+ppce300c3_retire")
-+
-+;; Float point instructions
-+(define_insn_reservation "ppce300c3_fpcompare" 3
-+  (and (eq_attr "type" "fpcompare")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fp" 3
-+  (and (eq_attr "type" "fp")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_dmul" 4
-+  (and (eq_attr "type" "dmul")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu,nothing,ppce300c3_retire")
-+
-+; Divides are not pipelined
-+(define_insn_reservation "ppce300c3_sdiv" 18
-+  (and (eq_attr "type" "sdiv")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu*17")
-+
-+(define_insn_reservation "ppce300c3_ddiv" 33
-+  (and (eq_attr "type" "ddiv")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_fpu,ppce300c3_fpu*32")
-+
-+;; Loads
-+(define_insn_reservation "ppce300c3_load" 2
-+  (and (eq_attr "type" "load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fpload" 2
-+  (and (eq_attr "type" "fpload,fpload_ux,fpload_u")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+;; Stores.
-+(define_insn_reservation "ppce300c3_store" 2
-+  (and (eq_attr "type" "store,store_ux,store_u")
-+       (ior (eq_attr "cpu" "ppce300c2") (eq_attr "cpu" "ppce300c3")))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-+
-+(define_insn_reservation "ppce300c3_fpstore" 2
-+  (and (eq_attr "type" "fpstore,fpstore_ux,fpstore_u")
-+       (eq_attr "cpu" "ppce300c3"))
-+  "ppce300c3_decode,ppce300c3_issue+ppce300c3_lsu,ppce300c3_retire")
-Index: gcc-4.2.3/gcc/config/rs6000/rs6000.c
-===================================================================
---- gcc-4.2.3.orig/gcc/config/rs6000/rs6000.c
-+++ gcc-4.2.3/gcc/config/rs6000/rs6000.c
-@@ -556,6 +556,21 @@ struct processor_costs ppc8540_cost = {
-   COSTS_N_INSNS (29),   /* ddiv */
- };
- 
-+/* Instruction costs on E300C2 and E300C3 cores.  */
-+static const
-+struct processor_costs ppce300c2c3_cost = {
-+  COSTS_N_INSNS (4),    /* mulsi */
-+  COSTS_N_INSNS (4),    /* mulsi_const */
-+  COSTS_N_INSNS (4),    /* mulsi_const9 */
-+  COSTS_N_INSNS (4),    /* muldi */
-+  COSTS_N_INSNS (19),   /* divsi */
-+  COSTS_N_INSNS (19),   /* divdi */
-+  COSTS_N_INSNS (3),    /* fp */
-+  COSTS_N_INSNS (4),    /* dmul */
-+  COSTS_N_INSNS (18),   /* sdiv */
-+  COSTS_N_INSNS (33),   /* ddiv */
-+};
-+
- /* Instruction costs on POWER4 and POWER5 processors.  */
- static const
- struct processor_costs power4_cost = {
-@@ -1175,6 +1190,8 @@ rs6000_override_options (const char *def
- 	 /* 8548 has a dummy entry for now.  */
- 	 {"8548", PROCESSOR_PPC8540,
- 	  POWERPC_BASE_MASK | MASK_PPC_GFXOPT | MASK_STRICT_ALIGN},
-+ 	 {"e300c2", PROCESSOR_PPCE300C2, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
-+ 	 {"e300c3", PROCESSOR_PPCE300C3, POWERPC_BASE_MASK},
- 	 {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
- 	 {"970", PROCESSOR_POWER4,
- 	  POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64},
-@@ -1567,6 +1584,11 @@ rs6000_override_options (const char *def
- 	rs6000_cost = &ppc8540_cost;
- 	break;
- 
-+      case PROCESSOR_PPCE300C2:
-+      case PROCESSOR_PPCE300C3:
-+	rs6000_cost = &ppce300c2c3_cost;
-+	break;
-+
-       case PROCESSOR_POWER4:
-       case PROCESSOR_POWER5:
- 	rs6000_cost = &power4_cost;
-@@ -16838,6 +16860,8 @@ rs6000_issue_rate (void)
-   case CPU_PPC750:
-   case CPU_PPC7400:
-   case CPU_PPC8540:
-+  case CPU_PPCE300C2:
-+  case CPU_PPCE300C3:
-     return 2;
-   case CPU_RIOS2:
-   case CPU_PPC604:
-Index: gcc-4.2.3/gcc/config/rs6000/rs6000.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/rs6000/rs6000.h
-+++ gcc-4.2.3/gcc/config/rs6000/rs6000.h
-@@ -110,6 +110,8 @@
- %{mcpu=970: -mpower4 -maltivec} \
- %{mcpu=G5: -mpower4 -maltivec} \
- %{mcpu=8540: -me500} \
-+%{mcpu=e300c2: -mppc} \
-+%{mcpu=e300c3: -mppc -mpmr} \
- %{maltivec: -maltivec} \
- -many"
- 
-@@ -210,6 +212,8 @@ enum processor_type
-    PROCESSOR_PPC7400,
-    PROCESSOR_PPC7450,
-    PROCESSOR_PPC8540,
-+   PROCESSOR_PPCE300C2,
-+   PROCESSOR_PPCE300C3,
-    PROCESSOR_POWER4,
-    PROCESSOR_POWER5
- };
-Index: gcc-4.2.3/gcc/config/rs6000/rs6000.md
-===================================================================
---- gcc-4.2.3.orig/gcc/config/rs6000/rs6000.md
-+++ gcc-4.2.3/gcc/config/rs6000/rs6000.md
-@@ -105,7 +105,7 @@
- ;; Processor type -- this attribute must exactly match the processor_type
- ;; enumeration in rs6000.h.
- 
--(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,power4,power5"
-+(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,ppce300c2,ppce300c3,power4,power5"
-   (const (symbol_ref "rs6000_cpu_attr")))
- 
- (automata_option "ndfa")
-@@ -121,6 +121,7 @@
- (include "7xx.md")
- (include "7450.md")
- (include "8540.md")
-+(include "e300c2c3.md")
- (include "power4.md")
- (include "power5.md")
- 
-Index: gcc-4.2.3/gcc/config.gcc
-===================================================================
---- gcc-4.2.3.orig/gcc/config.gcc
-+++ gcc-4.2.3/gcc/config.gcc
-@@ -2880,7 +2880,7 @@ case "${target}" in
- 			| rios | rios1 | rios2 | rsc | rsc1 | rs64a \
- 			| 401 | 403 | 405 | 405fp | 440 | 440fp | 505 \
- 			| 601 | 602 | 603 | 603e | ec603e | 604 \
--			| 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
-+			| 604e | 620 | 630 | 740 | 750 | 7400 | 7450 | e300c[23] \
- 			| 854[08] | 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5)
- 				# OK
- 				;;
diff --git a/patches/gcc-4.2.3/generic/oe/gcc41-configure.in.patch b/patches/gcc-4.2.3/generic/oe/gcc41-configure.in.patch
deleted file mode 100644
index 457c238..0000000
--- a/patches/gcc-4.2.3/generic/oe/gcc41-configure.in.patch
+++ /dev/null
@@ -1,31 +0,0 @@
----
- configure    |    2 +-
- configure.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/configure.in
-===================================================================
---- gcc-4.2.3.orig/configure.in
-+++ gcc-4.2.3/configure.in
-@@ -2080,7 +2080,7 @@ fi
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}"
- 
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
-  *" newlib "*)
-   case " $target_configargs " in
-Index: gcc-4.2.3/configure
-===================================================================
---- gcc-4.2.3.orig/configure
-+++ gcc-4.2.3/configure
-@@ -3373,7 +3373,7 @@ fi
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache --build=${build_alias} --host=${target_alias} --target=${target_alias} ${target_configargs}"
- 
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
-  *" newlib "*)
-   case " $target_configargs " in
diff --git a/patches/gcc-4.2.3/generic/oe/ldflags.patch b/patches/gcc-4.2.3/generic/oe/ldflags.patch
deleted file mode 100644
index c52c95e..0000000
--- a/patches/gcc-4.2.3/generic/oe/ldflags.patch
+++ /dev/null
@@ -1,31 +0,0 @@
----
- Makefile.in  |    2 +-
- Makefile.tpl |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/Makefile.in
-===================================================================
---- gcc-4.2.3.orig/Makefile.in
-+++ gcc-4.2.3/Makefile.in
-@@ -346,7 +346,7 @@ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFL
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
-Index: gcc-4.2.3/Makefile.tpl
-===================================================================
---- gcc-4.2.3.orig/Makefile.tpl
-+++ gcc-4.2.3/Makefile.tpl
-@@ -349,7 +349,7 @@ SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFL
- CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
- LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
- LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
--LDFLAGS_FOR_TARGET = 
-+LDFLAGS_FOR_TARGET = @LDFLAGS@ 
- PICFLAG_FOR_TARGET = 
- 
- # ------------------------------------
diff --git a/patches/gcc-4.2.3/generic/oe/zecke-xgcc-cpp.patch b/patches/gcc-4.2.3/generic/oe/zecke-xgcc-cpp.patch
deleted file mode 100644
index d84a7e8..0000000
--- a/patches/gcc-4.2.3/generic/oe/zecke-xgcc-cpp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-upstream: n/a
-comment: Use the preprocessor we have just compiled instead the one of
-the system. There might be incompabilities between us and them.
-
----
- Makefile.in |    1 +
- 1 file changed, 1 insertion(+)
-
-Index: gcc-4.2.3/Makefile.in
-===================================================================
---- gcc-4.2.3.orig/Makefile.in
-+++ gcc-4.2.3/Makefile.in
-@@ -194,6 +194,7 @@ BASE_TARGET_EXPORTS = \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET)"; export CC; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-+	CPP="$(CC_FOR_TARGET) -E"; export CCP; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
- 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/patches/gcc-4.2.3/generic/series b/patches/gcc-4.2.3/generic/series
deleted file mode 100644
index cf25a45..0000000
--- a/patches/gcc-4.2.3/generic/series
+++ /dev/null
@@ -1,53 +0,0 @@
-# bail out on host includes
-no-host-includes.diff
-
-# ARM big endian and softfloat
-arm-bigendian.patch
-arm-softfloat.diff
-
-# from uclibc
-uclibc/100-uclibc-conf.patch
-uclibc/103-uclibc-conf-noupstream.patch
-uclibc/104-gnuhurd-uclibc-conf.patch
-uclibc/200-uclibc-locale.patch
-uclibc/203-uclibc-locale-no__x.patch
-uclibc/204-uclibc-locale-wchar_fix.patch
-uclibc/205-uclibc-locale-update.patch
-uclibc/300-libstdc++-pic.patch
-uclibc/301-missing-execinfo_h.patch
-uclibc/302-c99-snprintf.patch
-uclibc/303-c99-complex-ugly-hack.patch
-uclibc/304-index_macro.patch
-uclibc/305-libmudflap-susv3-legacy.patch
-uclibc/306-libstdc++-namespace.patch
-uclibc/307-locale_facets.patch
-uclibc/402-libbackend_dep_gcov-iov.h.patch
-uclibc/904-flatten-switch-stmt-00.patch
-uclibc/920-soft-float.patch
-
-# from gentoo
-gentoo/00_all_gcc-trampolinewarn.patch
-gentoo/01_all_gcc4-ice-hack.patch
-gentoo/06_all_gcc4-slow-pthread-self.patch
-gentoo/20_all_cris-dont-force-limits-header.patch
-gentoo/35_all_gcc-arm-pragma-pack.patch
-gentoo/36_all_gcc-arm-pr30486.patch
-gentoo/51_all_gcc-3.4-libiberty-pic.patch
-gentoo/53_all_gcc4-superh-default-multilib.patch
-gentoo/56_all_gcc-4-pr32177.patch
-gentoo/59_all_gcc-4-pr32893.patch
-gentoo/62_all_gcc4-noteGNUstack.patch
-gentoo/74_all_sh-pr24836.patch
-gentoo/85_all_gcc-ca-translation-typo.patch
-#gentoo/90_all_mips-add-march-r10k.patch
-#gentoo/91_all_mips-ip28_cache_barriers-v4.patch
-gentoo/92_all_mips-pthread-with-shared.patch
-
-# from oe
-oe/arm-thumb-cache.patch
-oe/arm-thumb.patch
-oe/fix-ICE-in-arm_unwind_emit_set.diff
-oe/gcc-4.0.2-e300c2c3.patch
-oe/gcc41-configure.in.patch
-oe/ldflags.patch
-oe/zecke-xgcc-cpp.patch
diff --git a/patches/gcc-4.2.3/generic/uclibc/100-uclibc-conf.patch b/patches/gcc-4.2.3/generic/uclibc/100-uclibc-conf.patch
deleted file mode 100644
index 8e4164e..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/100-uclibc-conf.patch
+++ /dev/null
@@ -1,251 +0,0 @@
----
- boehm-gc/configure             |    2 +-
- contrib/regression/objs-gcc.sh |    4 ++++
- gcc/config/cris/linux.h        |    6 +++++-
- libffi/configure               |    2 +-
- libgfortran/configure          |    2 +-
- libgomp/configure              |    2 +-
- libjava/classpath/configure    |    2 +-
- libjava/classpath/ltconfig     |    4 ++--
- libjava/configure              |    2 +-
- libmudflap/configure           |    2 +-
- libobjc/configure              |    2 +-
- libssp/configure               |    2 +-
- libstdc++-v3/configure         |    2 +-
- libtool.m4                     |    2 +-
- ltconfig                       |    4 ++--
- zlib/configure                 |    2 +-
- 16 files changed, 25 insertions(+), 17 deletions(-)
-
-Index: gcc-4.2.3/libgomp/configure
-===================================================================
---- gcc-4.2.3.orig/libgomp/configure
-+++ gcc-4.2.3/libgomp/configure
-@@ -3893,7 +3893,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/gcc/config/cris/linux.h
-===================================================================
---- gcc-4.2.3.orig/gcc/config/cris/linux.h
-+++ gcc-4.2.3/gcc/config/cris/linux.h
-@@ -73,7 +73,11 @@ along with GCC; see the file COPYING3.  
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
- 
- #undef CRIS_SUBTARGET_VERSION
--#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#if UCLIBC_DEFAULT
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+#else
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#endif
- 
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
- 
-Index: gcc-4.2.3/libstdc++-v3/configure
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/configure
-+++ gcc-4.2.3/libstdc++-v3/configure
-@@ -4283,7 +4283,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/zlib/configure
-===================================================================
---- gcc-4.2.3.orig/zlib/configure
-+++ gcc-4.2.3/zlib/configure
-@@ -3429,7 +3429,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/libobjc/configure
-===================================================================
---- gcc-4.2.3.orig/libobjc/configure
-+++ gcc-4.2.3/libobjc/configure
-@@ -3314,7 +3314,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/libgfortran/configure
-===================================================================
---- gcc-4.2.3.orig/libgfortran/configure
-+++ gcc-4.2.3/libgfortran/configure
-@@ -3721,7 +3721,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/libmudflap/configure
-===================================================================
---- gcc-4.2.3.orig/libmudflap/configure
-+++ gcc-4.2.3/libmudflap/configure
-@@ -5394,7 +5394,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/boehm-gc/configure
-===================================================================
---- gcc-4.2.3.orig/boehm-gc/configure
-+++ gcc-4.2.3/boehm-gc/configure
-@@ -4323,7 +4323,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/libffi/configure
-===================================================================
---- gcc-4.2.3.orig/libffi/configure
-+++ gcc-4.2.3/libffi/configure
-@@ -3460,7 +3460,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/libssp/configure
-===================================================================
---- gcc-4.2.3.orig/libssp/configure
-+++ gcc-4.2.3/libssp/configure
-@@ -4480,7 +4480,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.2.3.orig/contrib/regression/objs-gcc.sh
-+++ gcc-4.2.3/contrib/regression/objs-gcc.sh
-@@ -105,6 +105,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H
-  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
-Index: gcc-4.2.3/libjava/classpath/ltconfig
-===================================================================
---- gcc-4.2.3.orig/libjava/classpath/ltconfig
-+++ gcc-4.2.3/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
-Index: gcc-4.2.3/libjava/classpath/configure
-===================================================================
---- gcc-4.2.3.orig/libjava/classpath/configure
-+++ gcc-4.2.3/libjava/classpath/configure
-@@ -5307,7 +5307,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/libjava/configure
-===================================================================
---- gcc-4.2.3.orig/libjava/configure
-+++ gcc-4.2.3/libjava/configure
-@@ -5424,7 +5424,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/libtool.m4
-===================================================================
---- gcc-4.2.3.orig/libtool.m4
-+++ gcc-4.2.3/libtool.m4
-@@ -739,7 +739,7 @@ irix5* | irix6*)
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
-Index: gcc-4.2.3/ltconfig
-===================================================================
---- gcc-4.2.3.orig/ltconfig
-+++ gcc-4.2.3/ltconfig
-@@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-
- 
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
- 
-@@ -1251,7 +1251,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
diff --git a/patches/gcc-4.2.3/generic/uclibc/103-uclibc-conf-noupstream.patch b/patches/gcc-4.2.3/generic/uclibc/103-uclibc-conf-noupstream.patch
deleted file mode 100644
index 852124f..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/103-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- gcc/config.gcc |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/config.gcc
-===================================================================
---- gcc-4.2.3.orig/gcc/config.gcc
-+++ gcc-4.2.3/gcc/config.gcc
-@@ -1972,7 +1972,7 @@ score-*-elf)
-         ;;
- 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"
diff --git a/patches/gcc-4.2.3/generic/uclibc/104-gnuhurd-uclibc-conf.patch b/patches/gcc-4.2.3/generic/uclibc/104-gnuhurd-uclibc-conf.patch
deleted file mode 100644
index f759be0..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/104-gnuhurd-uclibc-conf.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- gcc/config.gcc |    3 +++
- 1 file changed, 3 insertions(+)
-
-Index: gcc-4.2.3/gcc/config.gcc
-===================================================================
---- gcc-4.2.3.orig/gcc/config.gcc
-+++ gcc-4.2.3/gcc/config.gcc
-@@ -497,6 +497,9 @@ case ${target} in
-     alpha*)
-       tm_file="${cpu_type}/${cpu_type}.h alpha/elf.h alpha/linux.h alpha/linux-elf.h gnu.h ${tm_file}"
-       ;;
-+    i[34567]86-*hurd*-*)
-+      tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h i386/gnu.h gnu.h ${tm_file}"
-+      ;;
-     i[34567]86-*-*)
-       tm_file="${cpu_type}/${cpu_type}.h i386/unix.h i386/att.h dbxelf.h elfos.h svr4.h linux.h i386/linux.h gnu.h ${tm_file}"
-       ;;
diff --git a/patches/gcc-4.2.3/generic/uclibc/200-uclibc-locale.patch b/patches/gcc-4.2.3/generic/uclibc/200-uclibc-locale.patch
deleted file mode 100644
index 02daf6a..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/200-uclibc-locale.patch
+++ /dev/null
@@ -1,2841 +0,0 @@
----
- libstdc++-v3/acinclude.m4                              |   39 
- libstdc++-v3/config/locale/uclibc/c++locale_internal.h |   63 +
- libstdc++-v3/config/locale/uclibc/c_locale.cc          |  160 +++
- libstdc++-v3/config/locale/uclibc/c_locale.h           |  117 ++
- libstdc++-v3/config/locale/uclibc/codecvt_members.cc   |  306 +++++++
- libstdc++-v3/config/locale/uclibc/collate_members.cc   |   80 +
- libstdc++-v3/config/locale/uclibc/ctype_members.cc     |  300 +++++++
- libstdc++-v3/config/locale/uclibc/messages_members.cc  |  100 ++
- libstdc++-v3/config/locale/uclibc/messages_members.h   |  118 ++
- libstdc++-v3/config/locale/uclibc/monetary_members.cc  |  692 +++++++++++++++++
- libstdc++-v3/config/locale/uclibc/numeric_members.cc   |  160 +++
- libstdc++-v3/config/locale/uclibc/time_members.cc      |  406 +++++++++
- libstdc++-v3/config/locale/uclibc/time_members.h       |   68 +
- libstdc++-v3/configure                                 |   75 +
- libstdc++-v3/include/c_compatibility/wchar.h           |    2 
- libstdc++-v3/include/c_std/std_cwchar.h                |    2 
- 16 files changed, 2686 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/libstdc++-v3/acinclude.m4
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/acinclude.m4
-+++ gcc-4.2.3/libstdc++-v3/acinclude.m4
-@@ -1334,7 +1334,7 @@ dnl
- AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
-   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])
- 
-   # Deal with gettext issues.  Default to not using it (=no) until we detect
-   # support for it later.  Let the user turn it off via --e/d, but let that
-@@ -1355,6 +1355,9 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
-   # 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)
-         enable_clocale_flag=gnu	
-         ;;
-@@ -1526,6 +1529,40 @@ AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
-       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
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-@@ -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, 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.
-+
-+// 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
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.cc
-@@ -0,0 +1,160 @@
-+// Wrapper for underlying C-language localization -*- C++ -*-
-+
-+// Copyright (C) 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.
-+
-+//
-+// 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)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  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)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  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)
-+    {
-+      if (!(__err & ios_base::failbit))
-+	{
-+	  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 (_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
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.h
-@@ -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, 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.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_XCLOCALE__
-+		     _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_XCLOCALE__
-+      __gnu_cxx::__uselocale(__old);
-+#elif defined __UCLIBC_HAS_LOCALE__
-+      std::setlocale(LC_ALL, __sav);
-+      delete [] __sav;
-+#endif
-+      return __ret;
-+    }
-+}
-+
-+#endif
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-@@ -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, 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.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
-+}
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/collate_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/collate_members.cc
-@@ -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, 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.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
-+}
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-@@ -0,0 +1,300 @@
-+// 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, 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.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
-+  { 
-+    // Highest bitmask in ctype_base == 10, but extra in "C"
-+    // library for blank.
-+    bool __ret = false;
-+    const size_t __bitmasksize = 11; 
-+    for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
-+      if (__m & _M_bit[__bitcur]
-+	  && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
-+	{
-+	  __ret = true;
-+	  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
-+}
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.cc
-@@ -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, 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.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
-+}
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.h
-@@ -0,0 +1,118 @@
-+// std::messages 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, 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.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(_S_clone_c_locale(__cloc)),
-+     _M_name_messages(__s)
-+     {
-+       char* __tmp = new char[std::strlen(__s) + 1];
-+       std::strcpy(__tmp, __s);
-+       _M_name_messages = __tmp;
-+     }
-+
-+  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); 
-+	 }
-+     }
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-@@ -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, 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.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:
-+	;
-+      }
-+    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;
-+# else
-+	  _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;
-+# else
-+	  _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
-+}
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-@@ -0,0 +1,160 @@
-+// 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, 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.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.
-+	  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;
-+
-+	  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
-+}
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.cc
-@@ -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, 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.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
-+}
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.h
-===================================================================
---- /dev/null
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.h
-@@ -0,0 +1,68 @@
-+// 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, 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.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(__s)
-+    { 
-+      char* __tmp = new char[std::strlen(__s) + 1];
-+      std::strcpy(__tmp, __s);
-+      _M_name_timepunct = __tmp;
-+      _M_initialize_timepunct(__cloc); 
-+    }
-+
-+  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); 
-+    }
-Index: gcc-4.2.3/libstdc++-v3/configure
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/configure
-+++ gcc-4.2.3/libstdc++-v3/configure
-@@ -5769,7 +5769,7 @@ if test "${enable_clocale+set}" = set; t
-   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; }; } ;;
-@@ -5802,6 +5802,9 @@ fi;
-   # 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)
-         enable_clocale_flag=gnu
-         ;;
-@@ -6190,6 +6193,76 @@ echo "${ECHO_T}IEEE 1003.1" >&6
-       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
-Index: gcc-4.2.3/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/include/c_compatibility/wchar.h
-+++ gcc-4.2.3/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -101,7 +101,9 @@ using std::wmemcmp;
- using std::wmemcpy;
- using std::wmemmove;
- using std::wmemset;
-+#if _GLIBCXX_HAVE_WCSFTIME
- using std::wcsftime;
-+#endif
- 
- #if _GLIBCXX_USE_C99
- using std::wcstold;
-Index: gcc-4.2.3/libstdc++-v3/include/c_std/std_cwchar.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/include/c_std/std_cwchar.h
-+++ gcc-4.2.3/libstdc++-v3/include/c_std/std_cwchar.h
-@@ -182,7 +182,9 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
-   using ::wcscoll;
-   using ::wcscpy;
-   using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
-   using ::wcsftime;
-+#endif
-   using ::wcslen;
-   using ::wcsncat;
-   using ::wcsncmp;
diff --git a/patches/gcc-4.2.3/generic/uclibc/203-uclibc-locale-no__x.patch b/patches/gcc-4.2.3/generic/uclibc/203-uclibc-locale-no__x.patch
deleted file mode 100644
index 4ac310b..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/203-uclibc-locale-no__x.patch
+++ /dev/null
@@ -1,246 +0,0 @@
----
- libstdc++-v3/config/locale/uclibc/c++locale_internal.h |   45 +++++++++++++++++
- libstdc++-v3/config/locale/uclibc/c_locale.cc          |   14 -----
- libstdc++-v3/config/locale/uclibc/c_locale.h           |    1 
- libstdc++-v3/config/locale/uclibc/collate_members.cc   |    7 --
- libstdc++-v3/config/locale/uclibc/ctype_members.cc     |    7 --
- libstdc++-v3/config/locale/uclibc/messages_members.cc  |    7 --
- libstdc++-v3/config/locale/uclibc/messages_members.h   |   18 ++----
- libstdc++-v3/config/locale/uclibc/monetary_members.cc  |    4 -
- libstdc++-v3/config/locale/uclibc/numeric_members.cc   |    3 -
- libstdc++-v3/config/locale/uclibc/time_members.cc      |    3 -
- 10 files changed, 55 insertions(+), 54 deletions(-)
-
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-@@ -60,4 +60,49 @@ extern "C" __typeof(wcsxfrm_l) __wcsxfrm
- extern "C" __typeof(wctype_l) __wctype_l;
- #endif 
- 
-+# define __nl_langinfo_l nl_langinfo_l
-+# define __strcoll_l strcoll_l
-+# define __strftime_l strftime_l
-+# define __strtod_l strtod_l
-+# define __strtof_l strtof_l
-+# define __strtold_l strtold_l
-+# define __strxfrm_l strxfrm_l
-+# define __newlocale newlocale
-+# define __freelocale freelocale
-+# define __duplocale duplocale
-+# define __uselocale uselocale
-+
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+#  define __iswctype_l iswctype_l
-+#  define __towlower_l towlower_l
-+#  define __towupper_l towupper_l
-+#  define __wcscoll_l wcscoll_l
-+#  define __wcsftime_l wcsftime_l
-+#  define __wcsxfrm_l wcsxfrm_l
-+#  define __wctype_l wctype_l
-+# endif
-+
-+#else
-+# define __nl_langinfo_l(N, L)       nl_langinfo((N))
-+# define __strcoll_l(S1, S2, L)      strcoll((S1), (S2))
-+# define __strtod_l(S, E, L)         strtod((S), (E))
-+# define __strtof_l(S, E, L)         strtof((S), (E))
-+# define __strtold_l(S, E, L)        strtold((S), (E))
-+# define __strxfrm_l(S1, S2, N, L)   strxfrm((S1), (S2), (N))
-+# warning should dummy __newlocale check for C|POSIX ?
-+# define __newlocale(a, b, c)        NULL
-+# define __freelocale(a)             ((void)0)
-+# define __duplocale(a)              __c_locale()
-+//# define __uselocale ?
-+//
-+# ifdef _GLIBCXX_USE_WCHAR_T
-+#  define __iswctype_l(C, M, L)       iswctype((C), (M))
-+#  define __towlower_l(C, L)          towlower((C))
-+#  define __towupper_l(C, L)          towupper((C))
-+#  define __wcscoll_l(S1, S2, L)      wcscoll((S1), (S2))
-+//#  define __wcsftime_l(S, M, F, T, L)  wcsftime((S), (M), (F), (T)) 
-+#  define __wcsxfrm_l(S1, S2, N, L)   wcsxfrm((S1), (S2), (N))
-+#  define __wctype_l(S, L)            wctype((S))
-+# endif
-+
- #endif // GLIBC 2.3 and later
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.cc
-@@ -39,20 +39,6 @@
- #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<>
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/collate_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/collate_members.cc
-@@ -36,13 +36,6 @@
- #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
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-@@ -43,10 +43,6 @@
- #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:
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-@@ -41,9 +41,6 @@
- #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
- {
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/time_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.cc
-@@ -40,9 +40,6 @@
- #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
- {
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-@@ -38,13 +38,6 @@
- #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
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.cc
-@@ -39,13 +39,10 @@
- #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)
-+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES)
- #else
--#undef gettext
- #define gettext(msgid) (msgid)
- #endif
- 
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.h
-@@ -36,15 +36,11 @@
- #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)
-+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__
-+#undef textdomain
-+#undef bindtextdomain
-+#define textdomain(D)           ((void)0)
-+#define bindtextdomain(D,P)     ((void)0)
- #endif
- 
-   // Non-virtual member functions.
-@@ -70,7 +66,7 @@ extern "C" char *__bindtextdomain(const 
-     messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, 
- 			   const char* __dir) const
-     { 
--      __bindtextdomain(__s.c_str(), __dir);
-+      bindtextdomain(__s.c_str(), __dir);
-       return this->do_open(__s, __loc); 
-     }
- 
-@@ -90,7 +86,7 @@ extern "C" char *__bindtextdomain(const 
-     { 
-       // No error checking is done, assume the catalog exists and can
-       // be used.
--      __textdomain(__s.c_str());
-+      textdomain(__s.c_str());
-       return 0;
-     }
- 
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/c_locale.h
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.h
-@@ -68,6 +68,7 @@ namespace __gnu_cxx
- {
-   extern "C" __typeof(uselocale) __uselocale;
- }
-+#define __uselocale uselocale
- #endif
- 
- namespace std
diff --git a/patches/gcc-4.2.3/generic/uclibc/204-uclibc-locale-wchar_fix.patch b/patches/gcc-4.2.3/generic/uclibc/204-uclibc-locale-wchar_fix.patch
deleted file mode 100644
index a92cc3e..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/204-uclibc-locale-wchar_fix.patch
+++ /dev/null
@@ -1,57 +0,0 @@
----
- libstdc++-v3/config/locale/uclibc/monetary_members.cc |    4 ++--
- libstdc++-v3/config/locale/uclibc/numeric_members.cc  |   13 +++++++++++++
- 2 files changed, 15 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-@@ -401,7 +401,7 @@ namespace std
- # ifdef __UCLIBC_HAS_XLOCALE__
- 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# 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
-@@ -556,7 +556,7 @@ namespace std
- # ifdef __UCLIBC_HAS_XLOCALE__
- 	  _M_data->_M_decimal_point = __cloc->decimal_point_wc;
- 	  _M_data->_M_thousands_sep = __cloc->thousands_sep_wc;
--# else
-+# 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
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-@@ -127,12 +127,25 @@ namespace std
- 	{
- 	  // Named locale.
- 	  // NB: In the GNU model wchar_t is always 32 bit wide.
-+#ifdef __UCLIBC_MJN3_ONLY__
-+#warning fix this... should be numeric
-+#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 = "";
diff --git a/patches/gcc-4.2.3/generic/uclibc/205-uclibc-locale-update.patch b/patches/gcc-4.2.3/generic/uclibc/205-uclibc-locale-update.patch
deleted file mode 100644
index e0f6d86..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/205-uclibc-locale-update.patch
+++ /dev/null
@@ -1,371 +0,0 @@
----
- libstdc++-v3/config/locale/uclibc/c_locale.cc         |   53 +++++++-----------
- libstdc++-v3/config/locale/uclibc/c_locale.h          |   42 ++++++++------
- libstdc++-v3/config/locale/uclibc/ctype_members.cc    |   41 ++++++++++---
- libstdc++-v3/config/locale/uclibc/messages_members.h  |   13 ++--
- libstdc++-v3/config/locale/uclibc/monetary_members.cc |    7 ++
- libstdc++-v3/config/locale/uclibc/numeric_members.cc  |    5 +
- libstdc++-v3/config/locale/uclibc/time_members.h      |   20 ++++--
- 7 files changed, 109 insertions(+), 72 deletions(-)
-
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.cc
-@@ -46,16 +46,13 @@ namespace std 
-     __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, 
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  float __f = __strtof_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __f;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      char* __sanity;
-+      errno = 0;
-+      float __f = __strtof_l(__s, &__sanity, __cloc);
-+      if (__sanity != __s && errno != ERANGE)
-+	__v = __f;
-+      else
-+	__err |= ios_base::failbit;
-     }
- 
-   template<>
-@@ -63,16 +60,13 @@ namespace std 
-     __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, 
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  double __d = __strtod_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __d;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      char* __sanity;
-+      errno = 0;
-+      double __d = __strtod_l(__s, &__sanity, __cloc);
-+      if (__sanity != __s && errno != ERANGE)
-+	__v = __d;
-+      else
-+	__err |= ios_base::failbit;
-     }
- 
-   template<>
-@@ -80,16 +74,13 @@ namespace std 
-     __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
- 		   const __c_locale& __cloc)
-     {
--      if (!(__err & ios_base::failbit))
--	{
--	  char* __sanity;
--	  errno = 0;
--	  long double __ld = __strtold_l(__s, &__sanity, __cloc);
--          if (__sanity != __s && errno != ERANGE)
--	    __v = __ld;
--	  else
--	    __err |= ios_base::failbit;
--	}
-+      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
-@@ -110,7 +101,7 @@ namespace std 
-   void
-   locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
-   {
--    if (_S_get_c_locale() != __cloc)
-+    if (__cloc && _S_get_c_locale() != __cloc)
-       __freelocale(__cloc); 
-   }
- 
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-@@ -33,9 +33,14 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
- namespace std
-@@ -138,20 +143,34 @@ namespace std
-   ctype<wchar_t>::
-   do_is(mask __m, wchar_t __c) const
-   { 
--    // Highest bitmask in ctype_base == 10, but extra in "C"
--    // library for blank.
-+    // 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;
--    const size_t __bitmasksize = 11; 
--    for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur)
--      if (__m & _M_bit[__bitcur]
--	  && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype))
--	{
--	  __ret = true;
--	  break;
--	}
-+    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
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.h
-@@ -47,18 +47,21 @@
-   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())
-+       _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(_S_clone_c_locale(__cloc)),
--     _M_name_messages(__s)
-+     : facet(__refs), _M_c_locale_messages(NULL), _M_name_messages(NULL)
-      {
--       char* __tmp = new char[std::strlen(__s) + 1];
--       std::strcpy(__tmp, __s);
-+       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>
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-@@ -33,9 +33,14 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -206,7 +211,7 @@ namespace std
- 	  }
- 	break;
-       default:
--	;
-+	__ret = pattern();
-       }
-     return __ret;
-   }
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-@@ -33,9 +33,14 @@
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
- 
-+#include <features.h>
-+#ifdef __UCLIBC_HAS_LOCALE__
- #define _LIBC
- #include <locale>
- #undef _LIBC
-+#else
-+#include <locale>
-+#endif
- #include <bits/c++locale_internal.h>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/time_members.h
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.h
-@@ -37,25 +37,33 @@
-   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_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_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(__s)
-+      _M_name_timepunct(NULL)
-     { 
--      char* __tmp = new char[std::strlen(__s) + 1];
--      std::strcpy(__tmp, __s);
-+      const size_t __len = std::strlen(__s) + 1;
-+      char* __tmp = new char[__len];
-+      std::memcpy(__tmp, __s, __len);
-       _M_name_timepunct = __tmp;
--      _M_initialize_timepunct(__cloc); 
-+
-+      try
-+	{ _M_initialize_timepunct(__cloc); }
-+      catch(...)
-+	{
-+	  delete [] _M_name_timepunct;
-+	  __throw_exception_again;
-+	}
-     }
- 
-   template<typename _CharT>
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/c_locale.h
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/c_locale.h
-@@ -39,21 +39,23 @@
- #pragma GCC system_header
- 
- #include <cstring>              // get std::strlen
--#include <cstdio>               // get std::snprintf or std::sprintf
-+#include <cstdio>               // get std::vsnprintf or std::vsprintf
- #include <clocale>
- #include <langinfo.h>		// For codecvt
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix this
- #endif
--#ifdef __UCLIBC_HAS_LOCALE__
-+#ifdef _GLIBCXX_USE_ICONV
- #include <iconv.h>		// For codecvt using iconv, iconv_t
- #endif
--#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__
--#include <libintl.h> 		// For messages
-+#ifdef HAVE_LIBINTL_H
-+#include <libintl.h>		// For messages
- #endif
-+#include <cstdarg>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning what is _GLIBCXX_C_LOCALE_GNU for
-+// psm: used in os/gnu-linux/ctype_noninline.h
- #endif
- #define _GLIBCXX_C_LOCALE_GNU 1
- 
-@@ -62,7 +64,7 @@
- #endif
- // #define _GLIBCXX_NUM_CATEGORIES 6
- #define _GLIBCXX_NUM_CATEGORIES 0
-- 
-+
- #ifdef __UCLIBC_HAS_XLOCALE__
- namespace __gnu_cxx
- {
-@@ -79,22 +81,24 @@ namespace std
-   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
-+  // Convert numeric value of type double to string and return length of
-+  // string.  If vsnprintf is available use it, otherwise fall back to
-+  // the unsafe vsprintf 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_XCLOCALE__
--		     _Tv __v, const __c_locale& __cloc, int __prec)
-+    inline int
-+    __convert_from_v(const __c_locale&
-+#ifndef __UCLIBC_HAS_XCLOCALE__
-+					__cloc __attribute__ ((__unused__))
-+#endif
-+		     ,
-+		     char* __out,
-+		     const int __size,
-+		     const char* __fmt, ...)
-     {
-+      va_list __args;
-+#ifdef __UCLIBC_HAS_XCLOCALE__
-       __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];
-@@ -103,7 +107,9 @@ namespace std
- # endif
- #endif
- 
--      const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v);
-+      va_start(__args, __fmt);
-+      const int __ret = std::vsnprintf(__out, __size, __fmt, __args);
-+      va_end(__args);
- 
- #ifdef __UCLIBC_HAS_XCLOCALE__
-       __gnu_cxx::__uselocale(__old);
diff --git a/patches/gcc-4.2.3/generic/uclibc/300-libstdc++-pic.patch b/patches/gcc-4.2.3/generic/uclibc/300-libstdc++-pic.patch
deleted file mode 100644
index fc39d4e..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/300-libstdc++-pic.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-# DP: Build and install libstdc++_pic.a library.
-
----
- libstdc++-v3/src/Makefile.am |    6 ++++++
- libstdc++-v3/src/Makefile.in |   10 +++++++++-
- 2 files changed, 15 insertions(+), 1 deletion(-)
-
-Index: gcc-4.2.3/libstdc++-v3/src/Makefile.am
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/src/Makefile.am
-+++ gcc-4.2.3/libstdc++-v3/src/Makefile.am
-@@ -257,6 +257,12 @@ CXXLINK = $(LIBTOOL) --tag CXX --mode=li
- 	  $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -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
-Index: gcc-4.2.3/libstdc++-v3/src/Makefile.in
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/src/Makefile.in
-+++ gcc-4.2.3/libstdc++-v3/src/Makefile.in
-@@ -657,7 +657,7 @@ info-am:
- 
- install-data-am: install-data-local
- 
--install-exec-am: install-toolexeclibLTLIBRARIES
-+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local
- 
- install-info: install-info-am
- 
-@@ -690,6 +690,7 @@ uninstall-am: uninstall-info-am uninstal
- 	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 \
-@@ -799,6 +800,13 @@ build_debug: stamp-debug
- 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 --git a/patches/gcc-4.2.3/generic/uclibc/301-missing-execinfo_h.patch b/patches/gcc-4.2.3/generic/uclibc/301-missing-execinfo_h.patch
deleted file mode 100644
index ca45214..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- boehm-gc/include/gc.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gcc-4.2.3/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.2.3.orig/boehm-gc/include/gc.h
-+++ gcc-4.2.3/boehm-gc/include/gc.h
-@@ -502,7 +502,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_of
- #if defined(__linux__) || defined(__GLIBC__)
- # 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 --git a/patches/gcc-4.2.3/generic/uclibc/302-c99-snprintf.patch b/patches/gcc-4.2.3/generic/uclibc/302-c99-snprintf.patch
deleted file mode 100644
index 3f8d175..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/302-c99-snprintf.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- libstdc++-v3/include/c_std/std_cstdio.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gcc-4.2.3/libstdc++-v3/include/c_std/std_cstdio.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/include/c_std/std_cstdio.h
-+++ gcc-4.2.3/libstdc++-v3/include/c_std/std_cstdio.h
-@@ -144,7 +144,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
- 
- _GLIBCXX_END_NAMESPACE
- 
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/patches/gcc-4.2.3/generic/uclibc/303-c99-complex-ugly-hack.patch b/patches/gcc-4.2.3/generic/uclibc/303-c99-complex-ugly-hack.patch
deleted file mode 100644
index 9db571f..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/303-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- libstdc++-v3/configure |    3 +++
- 1 file changed, 3 insertions(+)
-
-Index: gcc-4.2.3/libstdc++-v3/configure
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/configure
-+++ gcc-4.2.3/libstdc++-v3/configure
-@@ -7514,6 +7514,9 @@ cat confdefs.h >>conftest.$ac_ext
- 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 --git a/patches/gcc-4.2.3/generic/uclibc/304-index_macro.patch b/patches/gcc-4.2.3/generic/uclibc/304-index_macro.patch
deleted file mode 100644
index 5e84bfa..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/304-index_macro.patch
+++ /dev/null
@@ -1,33 +0,0 @@
----
- libstdc++-v3/include/ext/rope       |    3 +++
- libstdc++-v3/include/ext/ropeimpl.h |    3 +++
- 2 files changed, 6 insertions(+)
-
-Index: gcc-4.2.3/libstdc++-v3/include/ext/rope
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/include/ext/rope
-+++ gcc-4.2.3/libstdc++-v3/include/ext/rope
-@@ -58,6 +58,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
-Index: gcc-4.2.3/libstdc++-v3/include/ext/ropeimpl.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/include/ext/ropeimpl.h
-+++ gcc-4.2.3/libstdc++-v3/include/ext/ropeimpl.h
-@@ -54,6 +54,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
- 
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
- 
-   using std::size_t;
diff --git a/patches/gcc-4.2.3/generic/uclibc/305-libmudflap-susv3-legacy.patch b/patches/gcc-4.2.3/generic/uclibc/305-libmudflap-susv3-legacy.patch
deleted file mode 100644
index cbe4a13..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/305-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,53 +0,0 @@
----
- libmudflap/mf-hooks2.c |   10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-Index: gcc-4.2.3/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.2.3.orig/libmudflap/mf-hooks2.c
-+++ gcc-4.2.3/libmudflap/mf-hooks2.c
-@@ -427,7 +427,7 @@ WRAPPER2(void, bzero, void *s, size_t n)
- {
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region");
--  bzero (s, n);
-+  memset (s, 0, n);
- }
- 
- 
-@@ -437,7 +437,7 @@ WRAPPER2(void, bcopy, const void *src, v
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src");
-   MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest");
--  bcopy (src, dest, n);
-+  memmove (dest, src, n);
- }
- 
- 
-@@ -447,7 +447,7 @@ WRAPPER2(int, bcmp, const void *s1, cons
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg");
-   MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg");
--  return bcmp (s1, s2, n);
-+  return n == 0 ? 0 : memcmp (s1, s2, n);
- }
- 
- 
-@@ -456,7 +456,7 @@ WRAPPER2(char *, index, const char *s, i
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region");
--  return index (s, c);
-+  return strchr (s, c);
- }
- 
- 
-@@ -465,7 +465,7 @@ WRAPPER2(char *, rindex, const char *s, 
-   size_t n = strlen (s);
-   TRACE ("%s\n", __PRETTY_FUNCTION__);
-   MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region");
--  return rindex (s, c);
-+  return strrchr (s, c);
- }
- 
- /* XXX:  stpcpy, memccpy */
diff --git a/patches/gcc-4.2.3/generic/uclibc/306-libstdc++-namespace.patch b/patches/gcc-4.2.3/generic/uclibc/306-libstdc++-namespace.patch
deleted file mode 100644
index 6bb6fc7..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/306-libstdc++-namespace.patch
+++ /dev/null
@@ -1,43 +0,0 @@
----
- libstdc++-v3/config/locale/uclibc/messages_members.h |    4 +++-
- libstdc++-v3/config/locale/uclibc/time_members.h     |    4 +++-
- 2 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/messages_members.h
-@@ -32,7 +32,8 @@
- //
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning fix prototypes for *textdomain funcs
- #endif
-@@ -115,3 +116,4 @@
- 	   this->_S_create_c_locale(this->_M_c_locale_messages, __s); 
- 	 }
-      }
-+}
-Index: gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.h
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/config/locale/uclibc/time_members.h
-+++ gcc-4.2.3/libstdc++-v3/config/locale/uclibc/time_members.h
-@@ -33,7 +33,8 @@
- //
- 
- // Written by Benjamin Kosnik <bkoz@redhat.com>
--
-+namespace std
-+{
-   template<typename _CharT>
-     __timepunct<_CharT>::__timepunct(size_t __refs) 
-     : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), 
-@@ -74,3 +75,4 @@
-       delete _M_data; 
-       _S_destroy_c_locale(_M_c_locale_timepunct); 
-     }
-+}
diff --git a/patches/gcc-4.2.3/generic/uclibc/307-locale_facets.patch b/patches/gcc-4.2.3/generic/uclibc/307-locale_facets.patch
deleted file mode 100644
index d7b98c6..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/307-locale_facets.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-This patch fixes a bug into ostream::operator<<(double) due to the wrong size
-passed into the __convert_from_v method. The wrong size is then passed to
-std::snprintf function, that, on uClibc, doens't handle sized 0 buffer.
-
-Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
-
----
- libstdc++-v3/include/bits/locale_facets.tcc |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/libstdc++-v3/include/bits/locale_facets.tcc
-===================================================================
---- gcc-4.2.3.orig/libstdc++-v3/include/bits/locale_facets.tcc
-+++ gcc-4.2.3/libstdc++-v3/include/bits/locale_facets.tcc
-@@ -1145,7 +1145,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
- 	const int __cs_size = __fixed ? __max_exp + __prec + 4
- 	                              : __max_digits * 2 + __prec;
- 	char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
--	__len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, __fbuf, 
-+	__len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, __fbuf, 
- 				      __prec, __v);
- #endif
- 
-@@ -1779,7 +1779,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
-       // max_exponent10 + 1 for the integer part, + 2 for sign and '\0'.
-       const int __cs_size = numeric_limits<long double>::max_exponent10 + 3;
-       char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
--      int __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, "%.*Lf", 
-+      int __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, "%.*Lf", 
- 					0, __units);
- #endif
-       string_type __digits(__len, char_type());
diff --git a/patches/gcc-4.2.3/generic/uclibc/402-libbackend_dep_gcov-iov.h.patch b/patches/gcc-4.2.3/generic/uclibc/402-libbackend_dep_gcov-iov.h.patch
deleted file mode 100644
index e2ba5cb..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/402-libbackend_dep_gcov-iov.h.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- gcc/Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/Makefile.in
-===================================================================
---- gcc-4.2.3.orig/gcc/Makefile.in
-+++ gcc-4.2.3/gcc/Makefile.in
-@@ -2660,7 +2660,7 @@ mips-tdump.o : mips-tdump.c $(CONFIG_H) 
- # FIXME: writing proper dependencies for this is a *LOT* of work.
- libbackend.o : $(OBJS-common:.o=.c) $(out_file) \
-   insn-config.h insn-flags.h insn-codes.h insn-constants.h \
--  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE)
-+  insn-attr.h  $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h
- 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \
- 	  -DTARGET_NAME=\"$(target_noncanonical)\" \
- 	  -DLOCALEDIR=\"$(localedir)\" \
diff --git a/patches/gcc-4.2.3/generic/uclibc/904-flatten-switch-stmt-00.patch b/patches/gcc-4.2.3/generic/uclibc/904-flatten-switch-stmt-00.patch
deleted file mode 100644
index 0057542..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/904-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-Hi,
-
-The attached patch makes sure that we create smaller object code for
-simple switch statements. We just make sure to flatten the switch
-statement into an if-else chain, basically.
-
-This fixes a size-regression as compared to gcc-3.4, as can be seen
-below.
-
-2007-04-15  Bernhard Fischer  <..>
-
-	* stmt.c (expand_case): Do not create a complex binary tree when
-	optimizing for size but rather use the simple ordered list.
-	(emit_case_nodes): do not emit jumps to the default_label when
-	optimizing for size.
-
-Not regtested so far.
-Comments?
-
-Attached is the test switch.c mentioned below.
-
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i  -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done
-$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do
-gcc-$i  -UCHAIN -Os -o switch-$i.o -c switch.c ;done
-
-$ size switch-*.o
-   text	   data	    bss	    dec	    hex	filename
-    169	      0	      0	    169	     a9	switch-2.95.o
-    115	      0	      0	    115	     73	switch-3.3.o
-    103	      0	      0	    103	     67	switch-3.4.o
-    124	      0	      0	    124	     7c	switch-4.0.o
-    124	      0	      0	    124	     7c	switch-4.1.o
-    124	      0	      0	    124	     7c	switch-4.2.orig-HEAD.o
-     95	      0	      0	     95	     5f	switch-4.3-HEAD.o
-    124	      0	      0	    124	     7c	switch-4.3.orig-HEAD.o
-    166	      0	      0	    166	     a6	switch-CHAIN-2.95.o
-    111	      0	      0	    111	     6f	switch-CHAIN-3.3.o
-     95	      0	      0	     95	     5f	switch-CHAIN-3.4.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.0.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.1.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.2.orig-HEAD.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.3-HEAD.o
-     95	      0	      0	     95	     5f	switch-CHAIN-4.3.orig-HEAD.o
-
-
-Content-Type: text/x-diff; charset=us-ascii
-Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff"
-
----
- gcc/stmt.c |    7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-Index: gcc-4.2.3/gcc/stmt.c
-===================================================================
---- gcc-4.2.3.orig/gcc/stmt.c
-+++ gcc-4.2.3/gcc/stmt.c
-@@ -2511,7 +2511,11 @@ expand_case (tree exp)
- 	  use_cost_table
- 	    = (TREE_CODE (orig_type) != ENUMERAL_TYPE
- 	       && estimate_case_costs (case_list));
--	  balance_case_nodes (&case_list, NULL);
-+	  /* When optimizing for size, we want a straight list to avoid
-+	     jumps as much as possible. This basically creates an if-else
-+	     chain.  */
-+	  if (!optimize_size)
-+	    balance_case_nodes (&case_list, NULL);
- 	  emit_case_nodes (index, case_list, default_label, index_type);
- 	  emit_jump (default_label);
- 	}
-@@ -3069,6 +3073,7 @@ emit_case_nodes (rtx index, case_node_pt
- 	    {
- 	      if (!node_has_low_bound (node, index_type))
- 		{
-+		  if (!optimize_size) /* don't jl to the .default_label. */
- 		  emit_cmp_and_jump_insns (index,
- 					   convert_modes
- 					   (mode, imode,
diff --git a/patches/gcc-4.2.3/generic/uclibc/920-soft-float.patch b/patches/gcc-4.2.3/generic/uclibc/920-soft-float.patch
deleted file mode 100644
index af510ac..0000000
--- a/patches/gcc-4.2.3/generic/uclibc/920-soft-float.patch
+++ /dev/null
@@ -1,26 +0,0 @@
----
- gcc/config/rs6000/darwin-ldouble.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.2.3/gcc/config/rs6000/darwin-ldouble.c
-===================================================================
---- gcc-4.2.3.orig/gcc/config/rs6000/darwin-ldouble.c
-+++ gcc-4.2.3/gcc/config/rs6000/darwin-ldouble.c
-@@ -70,6 +70,8 @@ Software Foundation, 51 Franklin Street,
-    but GCC currently generates poor code when a union is used to turn
-    a long double into a pair of doubles.  */
- 
-+#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
-+
- long double __gcc_qadd (double, double, double, double);
- long double __gcc_qsub (double, double, double, double);
- long double __gcc_qmul (double, double, double, double);
-@@ -219,8 +221,6 @@ __gcc_qdiv (double a, double b, double c
-   return z.ldval;
- }
- 
--#if defined (_SOFT_FLOAT) && defined (__LONG_DOUBLE_128__)
--
- long double __gcc_qneg (double, double);
- int __gcc_qeq (double, double, double, double);
- int __gcc_qne (double, double, double, double);