72 files changed, 2605 insertions, 1008 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 958b141c71..fd6d5612a2 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -15,8 +15,8 @@ SRCREV_pn-aircrack-ng ?= "802"
 SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
 SRCREV_pn-assassin ?= "93"
 SRCREV_pn-bfin-uclibc ?= "1857"
-SRCREV_pn-uclibc ?= "21996"
-SRCREV_pn-uclibc-initial ?= "21996"
+SRCREV_pn-uclibc ?= "23129"
+SRCREV_pn-uclibc-initial ?= "23129"
 SRCREV_pn-contact ?= "1410"
 SRCREV_pn-dasher-gpe ?= "1251"
 SRCREV_pn-dbus-c++-native ?= "13131"
diff --git a/packages/gcc/gcc-4.2.4.inc b/packages/gcc/gcc-4.2.4.inc
index 4078009bd5..ccca7705c1 100644
--- a/packages/gcc/gcc-4.2.4.inc
+++ b/packages/gcc/gcc-4.2.4.inc
@@ -68,6 +68,6 @@ FORTRAN = ""
 FORTRAN_linux-gnueabi = ",fortran"
 JAVA = ""
 
-EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libmudflap"
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --enable-libgomp --disable-libmudflap"
 
 ARM_INSTRUCTION_SET = "arm"
diff --git a/packages/gcc/gcc-4.3.1.inc b/packages/gcc/gcc-4.3.1.inc
index b14dd4acf5..f1f29710a3 100644
--- a/packages/gcc/gcc-4.3.1.inc
+++ b/packages/gcc/gcc-4.3.1.inc
@@ -1,4 +1,4 @@
-# No uclibc, armeb and thumb patches - really needs checking 
+# No armeb and thumb patches - really needs checking 
 DEFAULT_PREFERENCE = "-99"
 
 require gcc-common.inc
@@ -24,19 +24,19 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \
 	file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \ 
 	file://debian/pr30961.dpatch;patch=1;pnum=0 \
-#	file://100-uclibc-conf.patch;patch=1 \
-#	file://103-uclibc-conf-noupstream.patch;patch=1 \
-#	file://200-uclibc-locale.patch;patch=1 \
-#	file://203-uclibc-locale-no__x.patch;patch=1 \
-#	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-#	file://205-uclibc-locale-update.patch;patch=1 \
+	file://100-uclibc-conf.patch;patch=1 \
+	file://103-uclibc-conf-noupstream.patch;patch=1 \
+	file://200-uclibc-locale.patch;patch=1 \
+	file://203-uclibc-locale-no__x.patch;patch=1 \
+	file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+	file://205-uclibc-locale-update.patch;patch=1 \
 	file://301-missing-execinfo_h.patch;patch=1 \
-#	file://302-c99-snprintf.patch;patch=1 \
-#	file://303-c99-complex-ugly-hack.patch;patch=1 \
+	file://302-c99-snprintf.patch;patch=1 \
+	file://303-c99-complex-ugly-hack.patch;patch=1 \
 	file://304-index_macro.patch;patch=1 \
 	file://305-libmudflap-susv3-legacy.patch;patch=1 \
-#	file://306-libstdc++-namespace.patch;patch=1 \
-#	file://307-locale_facets.patch;patch=1 \
+	file://306-libstdc++-namespace.patch;patch=1 \
+	file://307-locale_facets.patch;patch=1 \
 #	file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
 	file://602-sdk-libstdc++-includes.patch;patch=1 \
 	file://740-sh-pr24836.patch;patch=1 \
@@ -48,7 +48,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 #	file://arm-thumb.patch;patch=1 \
 #	file://arm-thumb-cache.patch;patch=1 \
 	file://ldflags.patch;patch=1 \
-	file://zecke-xgcc-cpp.patch;patch=1 \
 	file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
 	file://cache-amnesia.patch;patch=1 \
 	file://gfortran.patch;patch=1 \
@@ -60,6 +59,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
 	file://gcc-release-branch/PR-36500-fix-neon.patch;patch=1 \
 	file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
 	file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
+	file://zecke-xgcc-cpp.patch;patch=1 \
 "
 
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
diff --git a/packages/gcc/gcc-4.3.1/100-uclibc-conf.patch b/packages/gcc/gcc-4.3.1/100-uclibc-conf.patch
index 4243ff7b91..0b799607e8 100644
--- a/packages/gcc/gcc-4.3.1/100-uclibc-conf.patch
+++ b/packages/gcc/gcc-4.3.1/100-uclibc-conf.patch
@@ -1,119 +1,7 @@
---- gcc/libgomp/configure
-+++ gcc/libgomp/configure
-@@ -3771,7 +3771,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/gcc/config/cris/linux.h
-+++ gcc/gcc/config/cris/linux.h
-@@ -74,7 +74,11 @@
- #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"
- 
---- gcc/libstdc++-v3/configure
-+++ gcc/libstdc++-v3/configure
-@@ -4276,7 +4276,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/zlib/configure
-+++ gcc/zlib/configure
-@@ -3422,7 +3422,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libobjc/configure
-+++ gcc/libobjc/configure
-@@ -3309,7 +3309,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libgfortran/configure
-+++ gcc/libgfortran/configure
-@@ -3695,7 +3695,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libmudflap/configure
-+++ gcc/libmudflap/configure
-@@ -5378,7 +5378,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/boehm-gc/configure
-+++ gcc/boehm-gc/configure
-@@ -4316,7 +4316,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libffi/configure
-+++ gcc/libffi/configure
-@@ -3453,7 +3453,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libssp/configure
-+++ gcc/libssp/configure
-@@ -4409,7 +4409,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/contrib/regression/objs-gcc.sh
-+++ gcc/contrib/regression/objs-gcc.sh
+Index: gcc-4.3.1/contrib/regression/objs-gcc.sh
+===================================================================
+--- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh	2007-12-24 15:18:57.000000000 -0800
++++ gcc-4.3.1/contrib/regression/objs-gcc.sh	2008-08-16 01:15:12.000000000 -0700
 @@ -105,6 +105,10 @@
   then
    make all-gdb all-dejagnu all-ld || exit 1
@@ -125,61 +13,10 @@
  elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
    make bootstrap || exit 1
    make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
- 
- # 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 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   version_type=linux
-   need_lib_prefix=no
-   need_version=no
---- gcc/libjava/classpath/configure
-+++ gcc/libjava/classpath/configure
-@@ -4665,7 +4665,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libjava/configure
-+++ gcc/libjava/configure
-@@ -5212,7 +5212,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/libtool.m4
-+++ gcc/libtool.m4
-@@ -739,7 +739,7 @@
-   ;;
- 
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
-   lt_cv_deplibs_check_method=pass_all
-   ;;
- 
---- gcc/ltconfig
-+++ gcc/ltconfig
+Index: gcc-4.3.1/libjava/classpath/ltconfig
+===================================================================
+--- gcc-4.3.1.orig/libjava/classpath/ltconfig	2007-06-03 16:18:43.000000000 -0700
++++ gcc-4.3.1/libjava/classpath/ltconfig	2008-08-16 01:15:12.000000000 -0700
 @@ -603,7 +603,7 @@
  
  # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
diff --git a/packages/gcc/gcc-4.3.1/200-uclibc-locale.patch b/packages/gcc/gcc-4.3.1/200-uclibc-locale.patch
index ea21388b75..398f7a4436 100644
--- a/packages/gcc/gcc-4.3.1/200-uclibc-locale.patch
+++ b/packages/gcc/gcc-4.3.1/200-uclibc-locale.patch
@@ -1,6 +1,8 @@
---- gcc/libstdc++-v3/acinclude.m4
-+++ gcc/libstdc++-v3/acinclude.m4
-@@ -1369,7 +1369,7 @@
+Index: gcc-4.3.1/libstdc++-v3/acinclude.m4
+===================================================================
+--- gcc-4.3.1.orig/libstdc++-v3/acinclude.m4	2008-04-25 09:52:57.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/acinclude.m4	2008-08-19 01:15:23.000000000 -0700
+@@ -1349,7 +1349,7 @@
  AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
    GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
      [use MODEL for target locale package],
@@ -9,7 +11,7 @@
  
    # 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
-@@ -1385,6 +1385,9 @@
+@@ -1370,6 +1370,9 @@
    # Default to "generic".
    if test $enable_clocale_flag = auto; then
      case ${target_os} in
@@ -17,9 +19,9 @@
 +        enable_clocale_flag=uclibc
 +        ;;
        linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
-         AC_EGREP_CPP([_GLIBCXX_ok], [
-         #include <features.h>
-@@ -1528,6 +1531,40 @@
+         enable_clocale_flag=gnu	
+         ;;
+@@ -1541,6 +1544,40 @@
        CTIME_CC=config/locale/generic/time_members.cc
        CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
        ;;
@@ -60,8 +62,10 @@
    esac
  
    # This is where the testsuite looks for locale catalogs, using the
---- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h	2008-08-19 01:38:05.000000000 -0700
 @@ -0,0 +1,63 @@
 +// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
 +
@@ -102,7 +106,7 @@
 +#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;
@@ -123,11 +127,13 @@
 +extern "C" __typeof(wcsftime_l) __wcsftime_l;
 +extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
 +extern "C" __typeof(wctype_l) __wctype_l;
-+#endif 
++#endif
 +
 +#endif // GLIBC 2.3 and later
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc	2008-08-19 01:38:05.000000000 -0700
 @@ -0,0 +1,160 @@
 +// Wrapper for underlying C-language localization -*- C++ -*-
 +
@@ -184,11 +190,11 @@
 +#define __duplocale(a)              __c_locale()
 +#endif
 +
-+namespace std 
++namespace std
 +{
 +  template<>
 +    void
-+    __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, 
++    __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
 +		   const __c_locale& __cloc)
 +    {
 +      if (!(__err & ios_base::failbit))
@@ -205,7 +211,7 @@
 +
 +  template<>
 +    void
-+    __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, 
++    __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
 +		   const __c_locale& __cloc)
 +    {
 +      if (!(__err & ios_base::failbit))
@@ -238,7 +244,7 @@
 +    }
 +
 +  void
-+  locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s, 
++  locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
 +				    __c_locale __old)
 +  {
 +    __cloc = __newlocale(1 << LC_ALL, __s, __old);
@@ -251,12 +257,12 @@
 +      }
 +#endif
 +  }
-+  
++
 +  void
 +  locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
 +  {
 +    if (_S_get_c_locale() != __cloc)
-+      __freelocale(__cloc); 
++      __freelocale(__cloc);
 +  }
 +
 +  __c_locale
@@ -268,19 +274,19 @@
 +{
 +  const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
 +    {
-+      "LC_CTYPE", 
++      "LC_CTYPE",
 +      "LC_NUMERIC",
-+      "LC_TIME", 
-+      "LC_COLLATE", 
++      "LC_TIME",
++      "LC_COLLATE",
 +      "LC_MONETARY",
-+      "LC_MESSAGES", 
++      "LC_MESSAGES",
 +#if _GLIBCXX_NUM_CATEGORIES != 0
-+      "LC_PAPER", 
-+      "LC_NAME", 
++      "LC_PAPER",
++      "LC_NAME",
 +      "LC_ADDRESS",
-+      "LC_TELEPHONE", 
-+      "LC_MEASUREMENT", 
-+      "LC_IDENTIFICATION" 
++      "LC_TELEPHONE",
++      "LC_MEASUREMENT",
++      "LC_IDENTIFICATION"
 +#endif
 +    };
 +}
@@ -289,8 +295,10 @@
 +{
 +  const char* const* const locale::_S_categories = __gnu_cxx::category_names;
 +}  // namespace std
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h	2008-08-19 01:38:05.000000000 -0700
 @@ -0,0 +1,117 @@
 +// Wrapper for underlying C-language localization -*- C++ -*-
 +
@@ -356,7 +364,7 @@
 +#endif
 +// #define _GLIBCXX_NUM_CATEGORIES 6
 +#define _GLIBCXX_NUM_CATEGORIES 0
-+ 
++
 +#ifdef __UCLIBC_HAS_XLOCALE__
 +namespace __gnu_cxx
 +{
@@ -378,7 +386,7 @@
 +  // be avoided.
 +  template<typename _Tv>
 +    int
-+    __convert_from_v(char* __out, 
++    __convert_from_v(char* __out,
 +		     const int __size __attribute__ ((__unused__)),
 +		     const char* __fmt,
 +#ifdef __UCLIBC_HAS_XCLOCALE__
@@ -409,9 +417,11 @@
 +}
 +
 +#endif
---- gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc</