All of lore.kernel.org
 help / color / mirror / Atom feed
* [CONSOLIDATED PULL 00/17] Misc Fixes & Updates
@ 2012-06-22 22:00 Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 01/17] cml1.bbclass: Only delay exit if the command fails Saul Wold
                   ` (18 more replies)
  0 siblings, 19 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

Richard,

I have build and done simple testing on these changes

Thanks
	Sau!


The following changes since commit e2cc4a44d510e0d473d15f207c1c886db6a5ccf7:

  [PATCH] guile: fix compilation on MIPS/PPC (2012-06-21 13:41:12 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/stage
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Andrea Adami (1):
  mtd-utils: do not stage headers in sysroot

Darren Hart (1):
  cml1.bbclass: Only delay exit if the command fails

Kang Kai (1):
  runqemu-internal: qemu fails to run on ext2 image

Khem Raj (8):
  gcc-4.6: Retire into toochain-layer
  eglibc-2.13: Retire into toolchain layer
  gcc: Remove csl gcc recipes
  kconfig-frontends: New recipe
  uclibc: Fix packaging to match the new package order
  qemu.inc: Fix packageconfig options
  qemu-git: Move to tip of git
  qemu_git: set empty PACKAGECONFIG

Paul Gortmaker (1):
  linux-firmware: update to main repo on kernel.org

Richard Purdie (1):
  bitbake.conf/abi_version.conf: Update to use BasicHash signature
    generator

Saul Wold (1):
  distrodata: Fix missed VARIABLE name change

Scott Garman (2):
  gzip: upgrade to 1.5
  sudo: upgrade to 1.8.5p2

Valentin Popa (1):
  gpgme: updated to 1.3.2

 meta/classes/cml1.bbclass                          |    2 +-
 meta/classes/distrodata.bbclass                    |    2 +-
 meta/conf/abi_version.conf                         |    2 +-
 meta/conf/bitbake.conf                             |    2 +-
 .../eglibc/cross-localedef-native_2.13.bb          |   43 -
 .../eglibc/eglibc-2.13/IO-acquire-lock-fix.patch   |   17 -
 .../eglibc-2.13/armv4-eabi-compile-fix.patch       |   25 -
 .../eglibc-svn-arm-lowlevellock-include-tls.patch  |   21 -
 .../eglibc/eglibc-2.13/generate-supported.mk       |   11 -
 .../eglibc/eglibc-2.13/ld-search-order.patch       |   56 -
 .../eglibc/eglibc-2.13/mips-rld-map-check.patch    |   26 -
 .../eglibc/eglibc-2.13/multilib_readlib.patch      |   17 -
 .../recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch |  538 ----
 .../eglibc/eglibc-2.13/stack-protector-test.patch  |   35 -
 .../eglibc-2.13/use-sysroot-cxx-headers.patch      |   36 -
 meta/recipes-core/eglibc/eglibc-initial_2.13.bb    |    6 -
 meta/recipes-core/eglibc/eglibc-locale_2.13.bb     |    1 -
 meta/recipes-core/eglibc/eglibc_2.13.bb            |  218 --
 meta/recipes-core/uclibc/uclibc.inc                |   28 +-
 meta/recipes-devtools/gcc/gcc-4.6.inc              |  119 -
 .../gcc/gcc-4.6/100-uclibc-conf.patch              |   39 -
 .../gcc/gcc-4.6/103-uclibc-conf-noupstream.patch   |   17 -
 .../gcc/gcc-4.6/200-uclibc-locale.patch            | 2842 --------------------
 .../gcc/gcc-4.6/203-uclibc-locale-no__x.patch      |  235 --
 .../gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch  |   54 -
 .../gcc/gcc-4.6/205-uclibc-locale-update.patch     |  521 ----
 .../gcc/gcc-4.6/301-missing-execinfo_h.patch       |   15 -
 .../gcc/gcc-4.6/302-c99-snprintf.patch             |   15 -
 .../gcc/gcc-4.6/303-c99-complex-ugly-hack.patch    |   16 -
 .../gcc/gcc-4.6/304-index_macro.patch              |   30 -
 .../gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch  |   51 -
 .../gcc/gcc-4.6/306-libstdc++-namespace.patch      |   40 -
 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch  |   68 -
 .../gcc/gcc-4.6/740-sh-pr24836.patch               |   31 -
 .../gcc/gcc-4.6/800-arm-bigendian.patch            |   36 -
 .../gcc/gcc-4.6/904-flatten-switch-stmt-00.patch   |   76 -
 .../gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch          |   25 -
 .../GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch       |  186 --
 .../gcc/gcc-4.6/arm-nolibfloat.patch               |   26 -
 .../gcc/gcc-4.6/arm-softfloat.patch                |   18 -
 .../gcc/gcc-4.6/cache-amnesia.patch                |   33 -
 .../gcc/gcc-4.6/cpp-honour-sysroot.patch           |   40 -
 .../gcc/gcc-4.6/disable_relax_pic_calls_flag.patch |   48 -
 .../gcc/gcc-4.6/fix-for-ice-50099.patch            |   49 -
 .../gcc/gcc-4.6/fortran-cross-compile-hack.patch   |   32 -
 .../gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch  |   33 -
 .../gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch      |  116 -
 .../gcc/gcc-4.6/gcc-argument-list-too-long.patch   |   33 -
 .../gcc/gcc-4.6/gcc-arm-set-cost.patch             |   35 -
 .../gcc/gcc-4.6/gcc-flags-for-build.patch          |  189 --
 .../gcc/gcc-4.6/gcc-poison-dir-extend.patch        |   27 -
 .../gcc-4.6/gcc-poison-system-directories.patch    |  223 --
 .../gcc-uclibc-locale-ctype_touplow_t.patch        |   72 -
 .../gcc/gcc-4.6/gcc-with-linker-hash-style.patch   |  196 --
 .../gcc/gcc-4.6/mips64-default-n64.patch           |   32 -
 .../gcc/gcc-4.6/optional_libstdc.patch             |   86 -
 .../gcc/gcc-4.6/powerpc-e5500.patch                |  465 ----
 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch    |   72 -
 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch    |  393 ---
 meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch    |   64 -
 .../gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch |   80 -
 .../gcc/gcc-4.6/zecke-xgcc-cpp.patch               |   30 -
 .../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb |   23 -
 meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb |    2 -
 .../gcc/gcc-cross-initial_csl-arm-2008q1.bb        |   10 -
 .../gcc/gcc-cross-intermediate_4.6.bb              |    3 -
 .../gcc/gcc-cross-intermediate_csl-arm-2008q1.bb   |   10 -
 meta/recipes-devtools/gcc/gcc-cross-kernel.inc     |   19 -
 meta/recipes-devtools/gcc/gcc-cross_4.6.bb         |    8 -
 .../gcc/gcc-cross_csl-arm-2008q1.bb                |   24 -
 .../gcc/gcc-crosssdk-initial_4.6.bb                |    2 -
 .../gcc/gcc-crosssdk-intermediate_4.6.bb           |    3 -
 meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb      |    2 -
 meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc   |   22 -
 meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc   |   53 -
 .../gcc/gcc-csl-arm/arm-nolibfloat.patch           |   25 -
 .../gcc/gcc-csl-arm/arm-softfloat.patch            |   17 -
 .../gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch |   13 -
 .../gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch   |   30 -
 .../gcc/gcc-csl-arm/gcc-configure-no-fortran.patch | 1076 --------
 .../gcc/gcc-csl-arm/gcc-new-makeinfo.patch         |   36 -
 .../gcc/gcc-csl-arm/gcc41-configure.in.patch       |   24 -
 .../gcc/gcc-csl-arm/gcc_optab_arm.patch            |   97 -
 .../gcc/gcc-csl-arm/gfortran.patch                 |   42 -
 .../gcc/gcc-csl-arm/zecke-no-host-includes.patch   |   33 -
 .../gcc/gcc-csl-arm/zecke-xgcc-cpp.patch           |   17 -
 meta/recipes-devtools/gcc/gcc-runtime_4.6.bb       |    8 -
 meta/recipes-devtools/gcc/gcc_4.6.bb               |    5 -
 meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb    |    3 -
 meta/recipes-devtools/gcc/libgcc_4.6.bb            |   71 -
 .../kconfig-frontends/kconfig-frontends_3.4.bb     |   28 +
 meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb       |    6 +-
 .../recipes-devtools/qemu/qemu-git/powerpc_rom.bin |  Bin 0 -> 4096 bytes
 meta/recipes-devtools/qemu/qemu.inc                |    2 +-
 meta/recipes-devtools/qemu/qemu_git.bb             |   19 +-
 meta/recipes-extended/gzip/gzip.inc                |    7 +-
 meta/recipes-extended/gzip/gzip_1.4.bb             |   10 -
 meta/recipes-extended/gzip/gzip_1.5.bb             |   10 +
 meta/recipes-extended/sudo/sudo.inc                |    2 +-
 .../sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb}      |    6 +-
 .../linux-firmware/linux-firmware_git.bb           |   10 +-
 .../disable_gpgconf_check.patch                    |    0
 .../gpgme/{gpgme_1.3.1.bb => gpgme_1.3.2.bb}       |    8 +-
 scripts/runqemu-internal                           |    2 +-
 104 files changed, 84 insertions(+), 9598 deletions(-)
 delete mode 100644 meta/recipes-core/eglibc/cross-localedef-native_2.13.bb
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/multilib_readlib.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/use-sysroot-cxx-headers.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-initial_2.13.bb
 delete mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb
 delete mode 100644 meta/recipes-core/eglibc/eglibc_2.13.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/100-uclibc-conf.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/103-uclibc-conf-noupstream.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/200-uclibc-locale.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/203-uclibc-locale-no__x.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/205-uclibc-locale-update.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/301-missing-execinfo_h.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/302-c99-snprintf.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/303-c99-complex-ugly-hack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/304-index_macro.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/306-libstdc++-namespace.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/740-sh-pr24836.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/800-arm-bigendian.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/904-flatten-switch-stmt-00.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/arm-nolibfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/arm-softfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/cache-amnesia.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/disable_relax_pic_calls_flag.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fortran-cross-compile-hack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-dir-extend.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-uclibc-locale-ctype_touplow_t.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/zecke-xgcc-cpp.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-intermediate_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-kernel.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
 delete mode 100644 meta/recipes-devtools/gcc/libgcc_4.6.bb
 create mode 100644 meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.4.bb
 create mode 100644 meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin
 delete mode 100644 meta/recipes-extended/gzip/gzip_1.4.bb
 create mode 100644 meta/recipes-extended/gzip/gzip_1.5.bb
 rename meta/recipes-extended/sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb} (83%)
 rename meta/recipes-support/gpgme/{gpgme-1.3.1 => gpgme-1.3.2}/disable_gpgconf_check.patch (100%)
 rename meta/recipes-support/gpgme/{gpgme_1.3.1.bb => gpgme_1.3.2.bb} (83%)

-- 
1.7.7.6




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 01/17] cml1.bbclass: Only delay exit if the command fails
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 02/17] runqemu-internal: qemu fails to run on ext2 image Saul Wold
                   ` (17 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Darren Hart <dvhart@linux.intel.com>

Rather than pause for 5 seconds, test the return code of the command and
require user input before exiting on failure. This avoids pausing after
successful command execution as well as possibly not waiting long enough
if the user happens to be doing something else for 5 seconds.

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
---
 meta/classes/cml1.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass
index fd80c18..67f17ad 100644
--- a/meta/classes/cml1.bbclass
+++ b/meta/classes/cml1.bbclass
@@ -20,7 +20,7 @@ python do_menuconfig() {
         except OSError:
             mtime = 0
 
-        oe_terminal("${SHELL} -c \"make menuconfig; echo 'Pausing for 5 seconds'; sleep 5\"", '${PN} Configuration', d)
+        oe_terminal("${SHELL} -c \"make menuconfig; if [ $? -ne 0 ]; then echo 'Command failed.'; echo -n 'Press any key to continue... '; read r; fi\"", '${PN} Configuration', d)
 
         # FIXME this check can be removed when the minimum bitbake version has been bumped
         if hasattr(bb.build, 'write_taint'):
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 02/17] runqemu-internal: qemu fails to run on ext2 image
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 01/17] cml1.bbclass: Only delay exit if the command fails Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 03/17] mtd-utils: do not stage headers in sysroot Saul Wold
                   ` (16 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Kang Kai <kai.kang@windriver.com>

[Yocto 2579]

When set DISTRO to poky-tiny, only ext2 image is created. But
runqemu-internal doesn't set QEMUOPTIONS for ext2 image that make qemu
fail to boot.

Fix it for qemux86 arch since poky-tiny can only build for qemux86 now.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 scripts/runqemu-internal |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index c8e3186..041464d 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -319,7 +319,7 @@ fi
 if [ "$MACHINE" = "qemux86" ]; then
     QEMU=qemu
     QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware -enable-gl"
-    if [ "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
+    if [ "$FSTYPE" = "ext2" -o "$FSTYPE" = "ext3" -o "$FSTYPE" = "btrfs" ]; then
         KERNCMDLINE="vga=0 root=/dev/hda rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
         QEMUOPTIONS="$QEMU_NETWORK_CMD -hda $ROOTFS $QEMU_UI_OPTIONS"
     fi
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 03/17] mtd-utils: do not stage headers in sysroot
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 01/17] cml1.bbclass: Only delay exit if the command fails Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 02/17] runqemu-internal: qemu fails to run on ext2 image Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 04/17] gpgme: updated to 1.3.2 Saul Wold
                   ` (15 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Andrea Adami <andrea.adami@gmail.com>

* Headers are included in the package for compatibility
* but have not yet been synched with linux 3.0
* The actual issue was that ubi-user.h in sysroot
* was overwritten by the older version.
* Unfortunately one ioctl was renamed:
* http://lists.infradead.org/pipermail/linux-mtd/
* 2011-March/034419.html
* Note: the recipe will still use its own older header,
* following upstream.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
---
 meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb b/meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb
index daa3554..1a9d4d3 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb
@@ -11,16 +11,12 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=ca39eb1d98e736
 
 S = "${WORKDIR}/git/"
 
-PR = "r0"
+PR = "r1"
 
 EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
 
 do_install () {
 	oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
-	install -d ${D}${includedir}/mtd/
-	for f in ${S}/include/mtd/*.h; do
-		install -m 0644 $f ${D}${includedir}/mtd/
-	done
 }
 
 PARALLEL_MAKE = ""
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 04/17] gpgme: updated to 1.3.2
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (2 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 03/17] mtd-utils: do not stage headers in sysroot Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 05/17] gcc-4.6: Retire into toochain-layer Saul Wold
                   ` (14 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Valentin Popa <valentin.popa@intel.com>

Licence update: the same licence and new copyright years added

Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
 .../disable_gpgconf_check.patch                    |    0
 .../gpgme/{gpgme_1.3.1.bb => gpgme_1.3.2.bb}       |    8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-support/gpgme/{gpgme-1.3.1 => gpgme-1.3.2}/disable_gpgconf_check.patch (100%)
 rename meta/recipes-support/gpgme/{gpgme_1.3.1.bb => gpgme_1.3.2.bb} (83%)

diff --git a/meta/recipes-support/gpgme/gpgme-1.3.1/disable_gpgconf_check.patch b/meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch
similarity index 100%
rename from meta/recipes-support/gpgme/gpgme-1.3.1/disable_gpgconf_check.patch
rename to meta/recipes-support/gpgme/gpgme-1.3.2/disable_gpgconf_check.patch
diff --git a/meta/recipes-support/gpgme/gpgme_1.3.1.bb b/meta/recipes-support/gpgme/gpgme_1.3.2.bb
similarity index 83%
rename from meta/recipes-support/gpgme/gpgme_1.3.1.bb
rename to meta/recipes-support/gpgme/gpgme_1.3.2.bb
index 949a24c..b3c1d46 100644
--- a/meta/recipes-support/gpgme/gpgme_1.3.1.bb
+++ b/meta/recipes-support/gpgme/gpgme_1.3.2.bb
@@ -5,19 +5,19 @@ BUGTRACKER = "https://bugs.g10code.com/gnupg/index"
 LICENSE = "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
                     file://COPYING.LESSER;md5=bbb461211a33b134d42ed5ee802b37ff \
-                    file://src/gpgme.h.in;endline=23;md5=942b47052c0674c6a3b9b9e6127628a4 \
+                    file://src/gpgme.h.in;endline=23;md5=00846fee29ec2a6f5c808bfe7fc24e65 \
                     file://src/engine.h;endline=22;md5=e96acfaab1cff82dd8fbefddd2f5c436"
 
 SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.bz2 \
            file://disable_gpgconf_check.patch"
 
-SRC_URI[md5sum] = "90afa8436ce2b2683c001c824bd22601"
-SRC_URI[sha256sum] = "15ef27a875ae0d79d7446fd931deda11438e724ffbeac74449ed19cba23df4d4"
+SRC_URI[md5sum] = "326fe97077141713f0930aa87949a287"
+SRC_URI[sha256sum] = "cfd235663f1d1adc97abb38dd5e6d093bb7e155580f171f9ba0158feab69f875"
 DEPENDS = "libgpg-error libassuan ${PTH}"
 PTH_libc-uclibc = "npth"
 PTH = "pth"
 
-PR = "r3"
+PR = "r0"
 
 EXTRA_OECONF = "--with-pth=${STAGING_DIR_HOST} --without-pth-test \
                 --with-gpg=${bindir}/gpg --without-gpgsm"
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 05/17] gcc-4.6: Retire into toochain-layer
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (3 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 04/17] gpgme: updated to 1.3.2 Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 06/17] eglibc-2.13: Retire into toolchain layer Saul Wold
                   ` (13 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Khem Raj <raj.khem@gmail.com>

If anyone wants it add toolchain-layer from meta-openembedded
repo to your setup

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/gcc/gcc-4.6.inc              |  119 -
 .../gcc/gcc-4.6/100-uclibc-conf.patch              |   39 -
 .../gcc/gcc-4.6/103-uclibc-conf-noupstream.patch   |   17 -
 .../gcc/gcc-4.6/200-uclibc-locale.patch            | 2842 --------------------
 .../gcc/gcc-4.6/203-uclibc-locale-no__x.patch      |  235 --
 .../gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch  |   54 -
 .../gcc/gcc-4.6/205-uclibc-locale-update.patch     |  521 ----
 .../gcc/gcc-4.6/301-missing-execinfo_h.patch       |   15 -
 .../gcc/gcc-4.6/302-c99-snprintf.patch             |   15 -
 .../gcc/gcc-4.6/303-c99-complex-ugly-hack.patch    |   16 -
 .../gcc/gcc-4.6/304-index_macro.patch              |   30 -
 .../gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch  |   51 -
 .../gcc/gcc-4.6/306-libstdc++-namespace.patch      |   40 -
 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch  |   68 -
 .../gcc/gcc-4.6/740-sh-pr24836.patch               |   31 -
 .../gcc/gcc-4.6/800-arm-bigendian.patch            |   36 -
 .../gcc/gcc-4.6/904-flatten-switch-stmt-00.patch   |   76 -
 .../gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch          |   25 -
 .../GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch       |  186 --
 .../gcc/gcc-4.6/arm-nolibfloat.patch               |   26 -
 .../gcc/gcc-4.6/arm-softfloat.patch                |   18 -
 .../gcc/gcc-4.6/cache-amnesia.patch                |   33 -
 .../gcc/gcc-4.6/cpp-honour-sysroot.patch           |   40 -
 .../gcc/gcc-4.6/disable_relax_pic_calls_flag.patch |   48 -
 .../gcc/gcc-4.6/fix-for-ice-50099.patch            |   49 -
 .../gcc/gcc-4.6/fortran-cross-compile-hack.patch   |   32 -
 .../gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch  |   33 -
 .../gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch      |  116 -
 .../gcc/gcc-4.6/gcc-argument-list-too-long.patch   |   33 -
 .../gcc/gcc-4.6/gcc-arm-set-cost.patch             |   35 -
 .../gcc/gcc-4.6/gcc-flags-for-build.patch          |  189 --
 .../gcc/gcc-4.6/gcc-poison-dir-extend.patch        |   27 -
 .../gcc-4.6/gcc-poison-system-directories.patch    |  223 --
 .../gcc-uclibc-locale-ctype_touplow_t.patch        |   72 -
 .../gcc/gcc-4.6/gcc-with-linker-hash-style.patch   |  196 --
 .../gcc/gcc-4.6/mips64-default-n64.patch           |   32 -
 .../gcc/gcc-4.6/optional_libstdc.patch             |   86 -
 .../gcc/gcc-4.6/powerpc-e5500.patch                |  465 ----
 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch    |   72 -
 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch    |  393 ---
 meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch    |   64 -
 .../gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch |   80 -
 .../gcc/gcc-4.6/zecke-xgcc-cpp.patch               |   30 -
 .../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb |   23 -
 meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb |    2 -
 .../gcc/gcc-cross-intermediate_4.6.bb              |    3 -
 meta/recipes-devtools/gcc/gcc-cross_4.6.bb         |    8 -
 .../gcc/gcc-crosssdk-initial_4.6.bb                |    2 -
 .../gcc/gcc-crosssdk-intermediate_4.6.bb           |    3 -
 meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb      |    2 -
 meta/recipes-devtools/gcc/gcc-runtime_4.6.bb       |    8 -
 meta/recipes-devtools/gcc/gcc_4.6.bb               |    5 -
 meta/recipes-devtools/gcc/libgcc_4.6.bb            |   71 -
 53 files changed, 0 insertions(+), 6935 deletions(-)
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/100-uclibc-conf.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/103-uclibc-conf-noupstream.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/200-uclibc-locale.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/203-uclibc-locale-no__x.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/205-uclibc-locale-update.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/301-missing-execinfo_h.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/302-c99-snprintf.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/303-c99-complex-ugly-hack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/304-index_macro.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/306-libstdc++-namespace.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/740-sh-pr24836.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/800-arm-bigendian.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/904-flatten-switch-stmt-00.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/arm-nolibfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/arm-softfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/cache-amnesia.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/disable_relax_pic_calls_flag.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fortran-cross-compile-hack.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-dir-extend.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-uclibc-locale-ctype_touplow_t.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/zecke-xgcc-cpp.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-intermediate_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc_4.6.bb
 delete mode 100644 meta/recipes-devtools/gcc/libgcc_4.6.bb

diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
deleted file mode 100644
index 03d8871..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ /dev/null
@@ -1,119 +0,0 @@
-require gcc-common.inc
-
-PR = "r27"
-
-# Third digit in PV should be incremented after a minor release
-# happens from this branch on gcc e.g. currently its 4.6.0
-# when 4.6.1 is releases and we bump SRCREV beyond the release
-# on branch then PV should be incremented to 4.6.1+svnr${SRCPV}
-# to reflect that change
-
-PV = "4.6.3+svnr${SRCPV}"
-
-# BINV should be incremented after updating to a revision
-# after a minor gcc release (e.g. 4.6.1 or 4.6.2) has been made
-# the value will be minor-release+1 e.g. if current minor release was
-# 4.6.1 then the value below will have 2 which will mean 4.6.2
-# which will be next minor release and so on.
-
-BINV = "4.6.4"
-
-SRCREV = "184847"
-BRANCH = "gcc-4_6-branch"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/gcc-4.6' ], d)}"
-
-DEPENDS =+ "mpfr gmp libmpc"
-NATIVEDEPS = "mpfr-native gmp-native libmpc-native zlib-native"
-
-LICENSE="GPL-3.0-with-GCC-exception & GPLv3"
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
-                   file://COPYING3;md5=d32239bcb673463ab874e80d47fae504 \
-                   file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 \
-                   file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1 \
-		   file://COPYING.RUNTIME;md5=fe60d87048567d4fe8c8a0ed2448bcc8"
-
-SRC_URI = "svn://gcc.gnu.org/svn/gcc/branches;module=${BRANCH};proto=http \
-	   file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch \
-	   file://100-uclibc-conf.patch \
-           file://gcc-uclibc-locale-ctype_touplow_t.patch \
-	   file://cache-amnesia.patch \
-	   file://gcc-flags-for-build.patch \
-           file://103-uclibc-conf-noupstream.patch  \
-           file://200-uclibc-locale.patch  \
-           file://203-uclibc-locale-no__x.patch; \
-           file://204-uclibc-locale-wchar_fix.patch; \
-           file://205-uclibc-locale-update.patch; \
-           file://301-missing-execinfo_h.patch  \
-           file://302-c99-snprintf.patch  \
-           file://303-c99-complex-ugly-hack.patch  \
-           file://304-index_macro.patch  \
-           file://305-libmudflap-susv3-legacy.patch  \
-           file://306-libstdc++-namespace.patch  \
-           file://740-sh-pr24836.patch  \
-           file://800-arm-bigendian.patch  \
-           file://904-flatten-switch-stmt-00.patch  \
-           file://arm-nolibfloat.patch  \
-           file://arm-softfloat.patch \
-           file://zecke-xgcc-cpp.patch \
-           file://gcc-poison-system-directories.patch \
-           file://gcc-poison-dir-extend.patch \
-           file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch \
-	   file://64bithack.patch \
-	   file://optional_libstdc.patch \
-	   file://disable_relax_pic_calls_flag.patch \
-	   file://COLLECT_GCC_OPTIONS.patch \
-           file://use-defaults.h-and-t-oe-in-B.patch \
-	   file://powerpc-e5500.patch \
-           file://fix-for-ice-50099.patch \
-	   file://gcc-with-linker-hash-style.patch \
-	   file://pr46934.patch \
-	   file://pr32219.patch \
-	   file://pr47551.patch \
-	   file://gcc-arm-set-cost.patch \
-	   file://GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch \
-	   file://fortran-cross-compile-hack.patch \
-	   file://cpp-honour-sysroot.patch \
-	   file://mips64-default-n64.patch \
-	   file://gcc-argument-list-too-long.patch \
-	  "
-
-SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch "
-
-#S = "${WORKDIR}/${BRANCH}"
-S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/${BRANCH}"
-B = "${WORKDIR}/${BRANCH}/build.${HOST_SYS}.${TARGET_SYS}"
-
-# Language Overrides
-FORTRAN = ""
-JAVA = ""
-
-EXTRA_OECONF_BASE = " --enable-lto \
-			--enable-libssp \
-			--disable-bootstrap \
-			--disable-libgomp \
-			--disable-libmudflap \
-			--with-system-zlib \
-			--with-linker-hash-style=${LINKER_HASH_STYLE} \
-			--with-ppl=no \
-			--with-cloog=no \
-			--enable-cheaders=c_global "
-
-EXTRA_OECONF_INITIAL = "--disable-libmudflap \
-			--disable-libgomp \
-			--disable-libssp \
-			--disable-libquadmath \
-			--with-system-zlib \
-			--disable-lto \
-			--disable-plugin \
-			--enable-decimal-float=no"
-
-EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap \
-				--disable-libgomp \
-				--disable-libquadmath \
-				--with-system-zlib \
-				--disable-lto \
-				--disable-plugin \
-				--disable-libssp"
-
-EXTRA_OECONF_append_libc-uclibc = " --disable-decimal-float "
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/100-uclibc-conf.patch b/meta/recipes-devtools/gcc/gcc-4.6/100-uclibc-conf.patch
deleted file mode 100644
index b2981e0..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/100-uclibc-conf.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/contrib/regression/objs-gcc.sh
-===================================================================
---- gcc-4.6.0.orig/contrib/regression/objs-gcc.sh
-+++ gcc-4.6.0/contrib/regression/objs-gcc.sh
-@@ -106,6 +106,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.6.0/libjava/classpath/ltconfig
-===================================================================
---- gcc-4.6.0.orig/libjava/classpath/ltconfig
-+++ gcc-4.6.0/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
- 
-@@ -1247,7 +1247,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/meta/recipes-devtools/gcc/gcc-4.6/103-uclibc-conf-noupstream.patch b/meta/recipes-devtools/gcc/gcc-4.6/103-uclibc-conf-noupstream.patch
deleted file mode 100644
index 22c6580..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/103-uclibc-conf-noupstream.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-
-Corrects sub machine arch corectly
-
-Index: gcc-4.6.0/gcc/config.gcc
-===================================================================
---- gcc-4.6.0.orig/gcc/config.gcc
-+++ gcc-4.6.0/gcc/config.gcc
-@@ -2316,7 +2316,7 @@ score-*-elf)
-         ;;
- sh-*-elf* | sh[12346l]*-*-elf* | \
- sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \
--  sh-*-linux* | sh[2346lbe]*-*-linux* | \
-+  sh*-*-linux* | sh[2346lbe]*-*-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/meta/recipes-devtools/gcc/gcc-4.6/200-uclibc-locale.patch b/meta/recipes-devtools/gcc/gcc-4.6/200-uclibc-locale.patch
deleted file mode 100644
index b8ea78d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/200-uclibc-locale.patch
+++ /dev/null
@@ -1,2842 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/libstdc++-v3/acinclude.m4
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/acinclude.m4
-+++ gcc-4.6.0/libstdc++-v3/acinclude.m4
-@@ -1753,7 +1753,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
-@@ -1774,6 +1774,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
- 	;;
-@@ -1915,6 +1918,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.6.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-@@ -0,0 +1,308 @@
-+// 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 <cstdlib>  // For MB_CUR_MAX
-+#include <climits>  // For MB_LEN_MAX
-+#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.6.0/libstdc++-v3/config/locale/uclibc/collate_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/messages_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/time_members.cc
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/time_members.h
-===================================================================
---- /dev/null
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/configure
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/configure
-+++ gcc-4.6.0/libstdc++-v3/configure
-@@ -15642,7 +15642,7 @@ $as_echo "stdio" >&6; }
- if test "${enable_clocale+set}" = set; then :
-   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) ;;
-        *) as_fn_error "Unknown argument to enable/disable clocale" "$LINENO" 5 ;;
- 	  	        esac
- 
-@@ -15674,6 +15674,9 @@ fi
-   # 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
- 	;;
-@@ -15907,6 +15910,76 @@ $as_echo "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
-@@ -16957,6 +17030,7 @@ rm -f core conftest.err conftest.$ac_obj
- 
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
-+#line 17016 "configure"
- #include <wctype.h>
- int
- main ()
-@@ -64172,7 +64246,6 @@ $as_echo_n "checking for shared libgcc..
- fi
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--
- int
- main ()
- {
-Index: gcc-4.6.0/libstdc++-v3/include/c_compatibility/wchar.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/include/c_compatibility/wchar.h
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/include/c_std/cwchar
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/include/c_std/cwchar
-+++ gcc-4.6.0/libstdc++-v3/include/c_std/cwchar
-@@ -177,7 +177,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-   using ::wcscoll;
-   using ::wcscpy;
-   using ::wcscspn;
-+#if _GLIBCXX_HAVE_WCSFTIME
-   using ::wcsftime;
-+#endif
-   using ::wcslen;
-   using ::wcsncat;
-   using ::wcsncmp;
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/203-uclibc-locale-no__x.patch b/meta/recipes-devtools/gcc/gcc-4.6/203-uclibc-locale-no__x.patch
deleted file mode 100644
index c602e91..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/203-uclibc-locale-no__x.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/collate_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/time_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/time_members.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/messages_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.h
-+++ gcc-4.6.0/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/meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch b/meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch
deleted file mode 100644
index 896d2a5..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc-4.6.0/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/meta/recipes-devtools/gcc/gcc-4.6/205-uclibc-locale-update.patch b/meta/recipes-devtools/gcc/gcc-4.6/205-uclibc-locale-update.patch
deleted file mode 100644
index 743017b..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/205-uclibc-locale-update.patch
+++ /dev/null
@@ -1,521 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/c_locale.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc
-+++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/c_locale.cc
-@@ -39,23 +39,20 @@
- #include <langinfo.h>
- #include <bits/c++locale_internal.h>
- 
--namespace std
--{
-+_GLIBCXX_BEGIN_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;
--	}
-+      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,17 +101,18 @@ 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);
-   }
- 
-   __c_locale
-   locale::facet::_S_clone_c_locale(__c_locale& __cloc)
-   { return __duplocale(__cloc); }
--} // namespace std
- 
--namespace __gnu_cxx
--{
-+_GLIBCXX_END_NAMESPACE
-+
-+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx)
-+
-   const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
-     {
-       "LC_CTYPE",
-@@ -138,9 +130,11 @@ namespace __gnu_cxx
-       "LC_IDENTIFICATION"
- #endif
-     };
--}
- 
--namespace std
--{
-+_GLIBCXX_END_NAMESPACE
-+
-+_GLIBCXX_BEGIN_NAMESPACE(std)
-+
-   const char* const* const locale::_S_categories = __gnu_cxx::category_names;
--}  // namespace std
-+
-+_GLIBCXX_END_NAMESPACE
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-+++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-@@ -33,16 +33,20 @@
- 
- // 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
--{
-+_GLIBCXX_BEGIN_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)
-     {
-@@ -57,6 +61,8 @@ namespace std
- #endif
- 	}
-     }
-+    ctype_byname<char>::~ctype_byname()
-+    { }
- 
- #ifdef _GLIBCXX_USE_WCHAR_T
-   ctype<wchar_t>::__wmask_type
-@@ -138,17 +144,33 @@ 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;
-   }
- 
-@@ -290,4 +312,5 @@ namespace std
- #endif
-   }
- #endif //  _GLIBCXX_USE_WCHAR_T
--}
-+
-+_GLIBCXX_END_NAMESPACE
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/messages_members.h
-@@ -53,12 +53,16 @@
-   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.6.0/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc-4.6.0/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;
-   }
-@@ -390,7 +395,9 @@ namespace std
- 	  __c_locale __old = __uselocale(__cloc);
- #else
- 	  // Switch to named locale so that mbsrtowcs will work.
--	  char* __old = strdup(setlocale(LC_ALL, NULL));
-+  	  char* __old = setlocale(LC_ALL, NULL);
-+          const size_t __llen = strlen(__old) + 1;
-+          char* __sav = new char[__llen];
- 	  setlocale(LC_ALL, __name);
- #endif
- 
-@@ -477,8 +484,8 @@ namespace std
- #ifdef __UCLIBC_HAS_XLOCALE__
- 	      __uselocale(__old);
- #else
--	      setlocale(LC_ALL, __old);
--	      free(__old);
-+	      setlocale(LC_ALL, __sav);
-+	      delete [] __sav;
- #endif
- 	      __throw_exception_again;
- 	    }
-@@ -498,8 +505,8 @@ namespace std
- #ifdef __UCLIBC_HAS_XLOCALE__
- 	  __uselocale(__old);
- #else
--	  setlocale(LC_ALL, __old);
--	  free(__old);
-+	  setlocale(LC_ALL, __sav);
-+	  delete [] __sav;
- #endif
- 	}
-     }
-@@ -545,8 +552,11 @@ namespace std
- 	  __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);
-+          char* __old = setlocale(LC_ALL, NULL);
-+          const size_t __llen = strlen(__old) + 1;
-+          char* __sav = new char[__llen];
-+          memcpy(__sav, __old, __llen);
-+          setlocale(LC_ALL, __name);
- #endif
- 
- #ifdef __UCLIBC_MJN3_ONLY__
-@@ -633,8 +643,8 @@ namespace std
- #ifdef __UCLIBC_HAS_XLOCALE__
- 	      __uselocale(__old);
- #else
--	      setlocale(LC_ALL, __old);
--	      free(__old);
-+	      setlocale(LC_ALL, __sav);
-+	      delete [] __sav;
- #endif
-               __throw_exception_again;
- 	    }
-@@ -653,8 +663,8 @@ namespace std
- #ifdef __UCLIBC_HAS_XLOCALE__
- 	  __uselocale(__old);
- #else
--	  setlocale(LC_ALL, __old);
--	  free(__old);
-+	  setlocale(LC_ALL, __sav);
-+	  delete [] __sav;
- #endif
- 	}
-     }
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc-4.6.0/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.6.0/libstdc++-v3/config/locale/uclibc/time_members.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/time_members.h
-+++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/time_members.h
-@@ -50,12 +50,21 @@
-     __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.6.0/libstdc++-v3/config/locale/uclibc/c_locale.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/c_locale.h
-+++ gcc-4.6.0/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
- 
-@@ -78,23 +80,25 @@ namespace std
- #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
-+  // 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);
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/time_members.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/time_members.cc
-+++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/time_members.cc
-@@ -53,11 +53,14 @@ namespace std
-       const size_t __len = __strftime_l(__s, __maxlen, __format, __tm,
- 					_M_c_locale_timepunct);
- #else
--      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      char* __old = setlocale(LC_ALL, NULL);
-+      const size_t __llen = strlen(__old) + 1;
-+      char* __sav = new char[__llen];
-+      memcpy(__sav, __old, __llen);
-       setlocale(LC_ALL, _M_name_timepunct);
-       const size_t __len = strftime(__s, __maxlen, __format, __tm);
--      setlocale(LC_ALL, __old);
--      free(__old);
-+      setlocale(LC_ALL, __sav);
-+      delete [] __sav;
- #endif
-       // Make sure __s is null terminated.
-       if (__len == 0)
-@@ -207,11 +210,14 @@ namespace std
-       const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm,
- 					_M_c_locale_timepunct);
- #else
--      char* __old = strdup(setlocale(LC_ALL, NULL));
-+      char* __old = setlocale(LC_ALL, NULL);
-+      const size_t __llen = strlen(__old) + 1;
-+      char* __sav = new char[__llen];
-+      memcpy(__sav, __old, __llen);
-       setlocale(LC_ALL, _M_name_timepunct);
-       const size_t __len = wcsftime(__s, __maxlen, __format, __tm);
--      setlocale(LC_ALL, __old);
--      free(__old);
-+      setlocale(LC_ALL, __sav);
-+      delete [] __sav;
- #endif
-       // Make sure __s is null terminated.
-       if (__len == 0)
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-+++ gcc-4.6.0/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-@@ -31,6 +31,9 @@
- 
- #include <bits/c++config.h>
- #include <clocale>
-+#include <cstdlib>
-+#include <cstring>
-+#include <cstddef>
- 
- #ifdef __UCLIBC_MJN3_ONLY__
- #warning clean this up
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/301-missing-execinfo_h.patch b/meta/recipes-devtools/gcc/gcc-4.6/301-missing-execinfo_h.patch
deleted file mode 100644
index 9589822..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/301-missing-execinfo_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/boehm-gc/include/gc.h
-===================================================================
---- gcc-4.6.0.orig/boehm-gc/include/gc.h
-+++ gcc-4.6.0/boehm-gc/include/gc.h
-@@ -503,7 +503,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/meta/recipes-devtools/gcc/gcc-4.6/302-c99-snprintf.patch b/meta/recipes-devtools/gcc/gcc-4.6/302-c99-snprintf.patch
deleted file mode 100644
index f02c98d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/302-c99-snprintf.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/libstdc++-v3/include/c_std/cstdio
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/include/c_std/cstdio
-+++ gcc-4.6.0/libstdc++-v3/include/c_std/cstdio
-@@ -136,7 +136,7 @@ namespace std
-   using ::vsprintf;
- } // namespace std
- 
--#if _GLIBCXX_USE_C99
-+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__)
- 
- #undef snprintf
- #undef vfscanf
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/303-c99-complex-ugly-hack.patch b/meta/recipes-devtools/gcc/gcc-4.6/303-c99-complex-ugly-hack.patch
deleted file mode 100644
index db594cb..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/303-c99-complex-ugly-hack.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: gcc-4.6.0/libstdc++-v3/configure
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/configure
-+++ gcc-4.6.0/libstdc++-v3/configure
-@@ -18302,6 +18302,9 @@ $as_echo_n "checking for ISO C99 support
-     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* 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/meta/recipes-devtools/gcc/gcc-4.6/304-index_macro.patch b/meta/recipes-devtools/gcc/gcc-4.6/304-index_macro.patch
deleted file mode 100644
index f103765..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/304-index_macro.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/libstdc++-v3/include/ext/rope
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/include/ext/rope
-+++ gcc-4.6.0/libstdc++-v3/include/ext/rope
-@@ -54,6 +54,9 @@
- #include <bits/gthr.h>
- #include <tr1/functional>
- 
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- # ifdef __GC
- #   define __GC_CONST const
- # else
-Index: gcc-4.6.0/libstdc++-v3/include/ext/ropeimpl.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/include/ext/ropeimpl.h
-+++ gcc-4.6.0/libstdc++-v3/include/ext/ropeimpl.h
-@@ -49,6 +49,9 @@
- #include <ext/memory> // For uninitialized_copy_n
- #include <ext/numeric> // For power
- 
-+/* cope w/ index defined as macro, SuSv3 proposal */
-+#undef index
-+
- namespace __gnu_cxx _GLIBCXX_VISIBILITY(default)
- {
- _GLIBCXX_BEGIN_NAMESPACE_VERSION
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch b/meta/recipes-devtools/gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch
deleted file mode 100644
index 8d9a4d8..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: gcc-4.6.0/libmudflap/mf-hooks2.c
-===================================================================
---- gcc-4.6.0.orig/libmudflap/mf-hooks2.c
-+++ gcc-4.6.0/libmudflap/mf-hooks2.c
-@@ -421,7 +421,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);
- }
- 
- 
-@@ -431,7 +431,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);
- }
- 
- 
-@@ -441,7 +441,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);
- }
- 
- 
-@@ -450,7 +450,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);
- }
- 
- 
-@@ -459,7 +459,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/meta/recipes-devtools/gcc/gcc-4.6/306-libstdc++-namespace.patch b/meta/recipes-devtools/gcc/gcc-4.6/306-libstdc++-namespace.patch
deleted file mode 100644
index e99bf96..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/306-libstdc++-namespace.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/messages_members.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc-4.6.0/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
-@@ -116,3 +117,4 @@
- 	   this->_S_create_c_locale(this->_M_c_locale_messages, __s);
- 	 }
-      }
-+}
-Index: gcc-4.6.0/libstdc++-v3/config/locale/uclibc/time_members.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/uclibc/time_members.h
-+++ gcc-4.6.0/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),
-@@ -75,3 +76,4 @@
-       delete _M_data;
-       _S_destroy_c_locale(_M_c_locale_timepunct);
-     }
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch b/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
deleted file mode 100644
index d35753a..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-GCC has internal multilib handling code but it assumes a very specific rigid directory
-layout. The build system implementation of multilib layout is very generic and allows
-complete customisation of the library directories.
-
-This patch is a partial solution to allow any custom directories to be passed into gcc
-and handled correctly. It forces gcc to use the base_libdir (which is the current 
-directory, "."). We need to do this for each multilib that is configured as we don't
-know which compiler options may be being passed into the compiler. Since we have a compiler
-per mulitlib at this point that isn't an issue.
-
-The one problem is the target compiler is only going to work for the default multlilib at
-this point. Ideally we'd figure out which multilibs were being enabled with which paths
-and be able to patch these entries with a complete set of correct paths but this we
-don't have such code at this point. This is something the target gcc recipe should do 
-and override these platform defaults in its build config.
-
-RP 15/8/11
-
-Index: gcc-4_6-branch/gcc/config/i386/t-linux64
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/i386/t-linux64	2011-06-23 15:15:29.000000000 +0100
-+++ gcc-4_6-branch/gcc/config/i386/t-linux64	2011-08-15 13:09:03.772415848 +0100
-@@ -24,8 +24,8 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
- 
- MULTILIB_OPTIONS = m64/m32
--MULTILIB_DIRNAMES = 64 32 
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_DIRNAMES = . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
- 
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
-Index: gcc-4_6-branch/gcc/config/mips/t-linux64
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/mips/t-linux64	2011-08-15 13:06:13.732415763 +0100
-+++ gcc-4_6-branch/gcc/config/mips/t-linux64	2011-08-15 13:09:11.452419446 +0100
-@@ -17,8 +17,8 @@
- # <http://www.gnu.org/licenses/>.
- 
- MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
--MULTILIB_DIRNAMES = n32 32 64
--MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
-+MULTILIB_DIRNAMES = . . .
-+MULTILIB_OSDIRNAMES = ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
- 
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
- 
-Index: gcc-4_6-branch/gcc/config/rs6000/t-linux64
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/rs6000/t-linux64	2011-08-15 13:06:25.272415822 +0100
-+++ gcc-4_6-branch/gcc/config/rs6000/t-linux64	2011-08-15 13:09:21.062415878 +0100
-@@ -32,11 +32,11 @@
- # MULTILIB_OSDIRNAMES according to what is found on the target.
- 
- MULTILIB_OPTIONS        = m64/m32 msoft-float
--MULTILIB_DIRNAMES       = 64 32 nof
-+MULTILIB_DIRNAMES       = . . .
- MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
- MULTILIB_EXCEPTIONS     = m64/msoft-float
- MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
--MULTILIB_OSDIRNAMES	= ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
-+MULTILIB_OSDIRNAMES	= ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir)) ../$(shell basename $(base_libdir))
- MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
- 
- softfp_wrap_start := '\#ifndef __powerpc64__'
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/740-sh-pr24836.patch b/meta/recipes-devtools/gcc/gcc-4.6/740-sh-pr24836.patch
deleted file mode 100644
index bc4ea5d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/740-sh-pr24836.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Upstream-Status: Pending
-
-http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836
-
-Index: gcc-4.6.0/gcc/configure.ac
-===================================================================
---- gcc-4.6.0.orig/gcc/configure.ac
-+++ gcc-4.6.0/gcc/configure.ac
-@@ -2926,7 +2926,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.6.0/gcc/configure
-===================================================================
---- gcc-4.6.0.orig/gcc/configure
-+++ gcc-4.6.0/gcc/configure
-@@ -22756,7 +22756,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/meta/recipes-devtools/gcc/gcc-4.6/800-arm-bigendian.patch b/meta/recipes-devtools/gcc/gcc-4.6/800-arm-bigendian.patch
deleted file mode 100644
index 8c8046d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/800-arm-bigendian.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status: Pending
-
-By Lennert Buytenhek <buytenh@wantstofly.org>
-Adds support for arm*b-linux* big-endian ARM targets
-
-See http://gcc.gnu.org/PR16350
-
-Index: gcc-4.6.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.6.0/gcc/config/arm/linux-elf.h
-@@ -51,7 +51,7 @@
- 
- #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
-Index: gcc-4.6.0/gcc/config.gcc
-===================================================================
---- gcc-4.6.0.orig/gcc/config.gcc
-+++ gcc-4.6.0/gcc/config.gcc
-@@ -822,6 +822,11 @@ arm*-*-linux*)			# ARM GNU/Linux with EL
- 	esac
- 	tmake_file="${tmake_file} t-linux arm/t-arm"
- 	case ${target} in
-+	arm*b-*)
-+		tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1"
-+		;;
-+	esac
-+	case ${target} in
- 	arm*-*-linux-*eabi)
- 	    tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h"
- 	    tm_file="$tm_file ../../libgcc/config/arm/bpabi-lib.h"
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/904-flatten-switch-stmt-00.patch b/meta/recipes-devtools/gcc/gcc-4.6/904-flatten-switch-stmt-00.patch
deleted file mode 100644
index ce3e6b5..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/904-flatten-switch-stmt-00.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Upstream-Status: Pending
-
-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"
-
-Index: gcc-4.6.0/gcc/stmt.c
-===================================================================
---- gcc-4.6.0.orig/gcc/stmt.c
-+++ gcc-4.6.0/gcc/stmt.c
-@@ -2478,7 +2478,11 @@ expand_case (gimple stmt)
- 	     default code is emitted.  */
- 
- 	  use_cost_table = 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);
- 	  if (default_label)
- 	    emit_jump (default_label);
-@@ -3046,6 +3050,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/meta/recipes-devtools/gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch b/meta/recipes-devtools/gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch
deleted file mode 100644
index 38856c2..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-#This patck added --sysroot into COLLECT_GCC_OPTIONS which is used to
-#invoke collect2.
-
-Index: gcc-4.6.0/gcc/gcc.c
-===================================================================
---- gcc-4.6.0.orig/gcc/gcc.c
-+++ gcc-4.6.0/gcc/gcc.c
-@@ -3948,6 +3948,15 @@ set_collect_gcc_options (void)
- 		sizeof ("COLLECT_GCC_OPTIONS=") - 1);
- 
-   first_time = TRUE;
-+#ifdef HAVE_LD_SYSROOT
-+  if (target_system_root_changed && target_system_root)
-+    {
-+      obstack_grow (&collect_obstack, "'--sysroot=", sizeof("'--sysroot=")-1);
-+      obstack_grow (&collect_obstack, target_system_root,strlen(target_system_root));
-+      obstack_grow (&collect_obstack, "'", 1);
-+      first_time = FALSE;
-+    }
-+#endif
-   for (i = 0; (int) i < n_switches; i++)
-     {
-       const char *const *args;
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch b/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
deleted file mode 100644
index 575e0e4..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-source: http://patchwork.ozlabs.org/patch/129800/
-Upstream-Status: Submitted
-
-ChangeLog
-        * Makefile.in (gcc_gxx_include_dir_add_sysroot): New.
-          (PREPROCESSOR_DEFINES): Define GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT.
-
-        * cppdefault.c (cpp_include_defaults): replace hard coded "1" with
-          GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT for "add_sysroot" field.
-
-        * configure.ac (AC_SUBST): Add gcc_gxx_include_dir_add_sysroot to
-          control whether sysroot should be prepended to gxx include dir.
-
-        * configure: Regenerate.
-
-Hi, this is a follow up for issue "http://codereview.appspot.com/4641076".
-
-The rationale for the patch copied from previous thread:
-=======================================
-The setup:
-
-Configuring a toolchain targeting x86-64 GNU Linux (Ubuntu Lucid), as a
-cross-compiler.  Using a sysroot to provide the Lucid headers+libraries,
-with the sysroot path being within the GCC install tree.  Want to use the
-Lucid system libstdc++ and headers, which means that I'm not
-building/installing libstdc++-v3.
-
-So, configuring with:
-  --with-sysroot="$SYSROOT"
-  --disable-libstdc++-v3 \
-  --with-gxx-include-dir="$SYSROOT/usr/include/c++/4.4" \
-(among other options).
-
-Hoping to support two usage models with this configuration, w.r.t. use of
-the sysroot:
-
-(1) somebody installs the sysroot in the normal location relative to the
-GCC install, and relocates the whole bundle (sysroot+GCC).  This works
-great AFAICT, GCC finds its includes (including the C++ includes) thanks
-to the add_standard_paths iprefix handling.
-
-(2) somebody installs the sysroot in a non-standard location, and uses
---sysroot to try to access it.  This works fine for the C headers, but
-doesn't work.
-
-For the C headers, add_standard_paths prepends the sysroot location to
-the /usr/include path (since that's what's specified in cppdefault.c for
-that path).  It doesn't do the same for the C++ include path, though
-(again, as specified in cppdefault.c).
-
-add_standard_paths doesn't attempt to relocate built-in include paths that
-start with the compiled-in sysroot location (e.g., the g++ include dir, in
-this case).  This isn't surprising really: normally you either prepend the
-sysroot location or you don't (as specified by cppdefault.c); none of the
-built-in paths normally *start* with the sysroot location and need to be
-relocated.  However, in this odd-ball case of trying to use the C++ headers
-from the sysroot, one of the paths *does* need to be relocated in this way.
-===========================
-Index: gcc-4_6-branch/gcc/Makefile.in
-===================================================================
---- gcc-4_6-branch.orig/gcc/Makefile.in	2012-03-04 09:33:36.000000000 -0800
-+++ gcc-4_6-branch/gcc/Makefile.in	2012-03-04 09:41:06.858672113 -0800
-@@ -587,6 +587,7 @@
- build_tooldir = $(exec_prefix)/$(target_noncanonical)
- # Directory in which the compiler finds target-independent g++ includes.
- gcc_gxx_include_dir = @gcc_gxx_include_dir@
-+gcc_gxx_include_dir_add_sysroot = @gcc_gxx_include_dir_add_sysroot@
- # Directory to search for site-specific includes.
- local_includedir = $(local_prefix)/include
- includedir = $(prefix)/include
-@@ -3964,6 +3965,7 @@
-   -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
-   -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \
-   -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
-+  -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \
-   -DGPLUSPLUS_TOOL_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/$(target_noncanonical)\" \
-   -DGPLUSPLUS_BACKWARD_INCLUDE_DIR=\"$(gcc_gxx_include_dir)/backward\" \
-   -DLOCAL_INCLUDE_DIR=\"$(local_includedir)\" \
-Index: gcc-4_6-branch/gcc/configure.ac
-===================================================================
---- gcc-4_6-branch.orig/gcc/configure.ac	2012-03-04 09:33:36.000000000 -0800
-+++ gcc-4_6-branch/gcc/configure.ac	2012-03-04 09:41:06.862671939 -0800
-@@ -144,6 +144,15 @@
-   fi
- fi
- 
-+gcc_gxx_include_dir_add_sysroot=0
-+if test "${with_sysroot+set}" = set; then :
-+  gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
-+  if test "${gcc_gxx_without_sysroot}"; then :
-+    gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
-+    gcc_gxx_include_dir_add_sysroot=1
-+  fi
-+fi
-+
- AC_ARG_WITH(cpp_install_dir,
- [  --with-cpp-install-dir=DIR
-                           install the user visible C preprocessor in DIR
-@@ -4727,6 +4736,7 @@
- AC_SUBST(float_h_file)
- AC_SUBST(gcc_config_arguments)
- AC_SUBST(gcc_gxx_include_dir)
-+AC_SUBST(gcc_gxx_include_dir_add_sysroot)
- AC_SUBST(host_exeext)
- AC_SUBST(host_xm_file_list)
- AC_SUBST(host_xm_include_list)
-Index: gcc-4_6-branch/gcc/cppdefault.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/cppdefault.c	2012-03-03 01:03:17.000000000 -0800
-+++ gcc-4_6-branch/gcc/cppdefault.c	2012-03-04 09:41:06.862671939 -0800
-@@ -48,15 +48,18 @@
- = {
- #ifdef GPLUSPLUS_INCLUDE_DIR
-     /* Pick up GNU C++ generic include files.  */
--    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 0, 0 },
-+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1,
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
- #endif
- #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
-     /* Pick up GNU C++ target-dependent include files.  */
--    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 0, 1 },
-+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1,
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 },
- #endif
- #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
-     /* Pick up GNU C++ backward and deprecated include files.  */
--    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 0, 0 },
-+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1,
-+      GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 },
- #endif
- #ifdef GCC_INCLUDE_DIR
-     /* This is the dir for gcc's private headers.  */
-Index: gcc-4_6-branch/gcc/configure
-===================================================================
---- gcc-4_6-branch.orig/gcc/configure	2012-03-04 09:33:36.000000000 -0800
-+++ gcc-4_6-branch/gcc/configure	2012-03-04 09:41:12.462671816 -0800
-@@ -636,6 +636,7 @@
- host_xm_include_list
- host_xm_file_list
- host_exeext
-+gcc_gxx_include_dir_add_sysroot
- gcc_gxx_include_dir
- gcc_config_arguments
- float_h_file
-@@ -3313,6 +3314,15 @@
-   fi
- fi
- 
-+gcc_gxx_include_dir_add_sysroot=0
-+if test "${with_sysroot+set}" = set; then :
-+  gcc_gxx_without_sysroot=`expr "${gcc_gxx_include_dir}" : "${with_sysroot}"'\(.*\)'`
-+  if test "${gcc_gxx_without_sysroot}"; then :
-+    gcc_gxx_include_dir="${gcc_gxx_without_sysroot}"
-+    gcc_gxx_include_dir_add_sysroot=1
-+  fi
-+fi
-+
- 
- # Check whether --with-cpp_install_dir was given.
- if test "${with_cpp_install_dir+set}" = set; then :
-@@ -17504,7 +17514,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17507 "configure"
-+#line 17517 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -17610,7 +17620,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17613 "configure"
-+#line 17623 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -26141,6 +26151,7 @@
- 
- 
- 
-+
- 
- 
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-4.6/arm-nolibfloat.patch
deleted file mode 100644
index 59a9ec3..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/arm-nolibfloat.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream-Status: Pending
-
-# Dimitry Andric <dimitry@andric.com>, 2004-05-01
-#
-# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
-#   anymore.  (The required functions are now in libgcc.)
-# 
-# Fixes errors like
-# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat
-# collect2: ld returned 1 exit status
-# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1
-# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat
-
-Index: gcc-4.6.0/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.6.0.orig/gcc/config/arm/linux-elf.h
-+++ gcc-4.6.0/gcc/config/arm/linux-elf.h
-@@ -60,7 +60,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"
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/arm-softfloat.patch b/meta/recipes-devtools/gcc/gcc-4.6/arm-softfloat.patch
deleted file mode 100644
index 01bf80d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/arm-softfloat.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.6.0.orig/gcc/config/arm/t-linux
-+++ gcc-4.6.0/gcc/config/arm/t-linux
-@@ -23,7 +23,10 @@ TARGET_LIBGCC2_CFLAGS = -fomit-frame-poi
- 
- LIB1ASMSRC = arm/lib1funcs.asm
- LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \
--	_arm_addsubdf3 _arm_addsubsf3
-+    _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \
-+    _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \
-+    _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundisf _floatundidf
-+#	_arm_addsubdf3 _arm_addsubsf3
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/cache-amnesia.patch b/meta/recipes-devtools/gcc/gcc-4.6/cache-amnesia.patch
deleted file mode 100644
index 72ead31..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/cache-amnesia.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
----
- gcc/configure    |    2 +-
- gcc/configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.6.0/gcc/configure
-===================================================================
---- gcc-4.6.0.orig/gcc/configure
-+++ gcc-4.6.0/gcc/configure
-@@ -10898,7 +10898,7 @@ else
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
- 	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
--	${realsrcdir}/configure \
-+	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- 		--enable-languages=${enable_languages-all} \
- 		--target=$target_alias --host=$build_alias --build=$build_alias
- 	CFLAGS="${saved_CFLAGS}"
-Index: gcc-4.6.0/gcc/configure.ac
-===================================================================
---- gcc-4.6.0.orig/gcc/configure.ac
-+++ gcc-4.6.0/gcc/configure.ac
-@@ -1435,7 +1435,7 @@ else
- 	saved_CFLAGS="${CFLAGS}"
- 	CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
- 	LDFLAGS="${LDFLAGS_FOR_BUILD}" \
--	${realsrcdir}/configure \
-+	CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
- 		--enable-languages=${enable_languages-all} \
- 		--target=$target_alias --host=$build_alias --build=$build_alias
- 	CFLAGS="${saved_CFLAGS}"
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch b/meta/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch
deleted file mode 100644
index 7310677..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Currently, if the gcc toolchain is relocated and installed from sstate, then you try and compile
-preprocessed source (.i or .ii files), the compiler will try and access the builtin sysroot location 
-rather than the --sysroot option specified on the commandline. If access to that directory is 
-permission denied (unreadable), gcc will error.
-
-This happens when ccache is in use due to the fact it uses preprocessed source files.
-
-The fix below adds %I to the cpp-output spec macro so the default substitutions for -iprefix, 
--isystem, -isysroot happen and the correct sysroot is used.
-
-[YOCTO #2074]
-
-Upstream-Status: Pending
-
-RP 2012/04/13
-
-Index: gcc-4_6-branch/gcc/gcc.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/gcc.c	2012-04-13 12:24:37.939671140 +0000
-+++ gcc-4_6-branch/gcc/gcc.c	2012-04-13 12:24:54.439670688 +0000
-@@ -953,7 +953,7 @@
-                     %W{o*:--output-pch=%*}}%V}}}}}}", 0, 0, 0},
-   {".i", "@cpp-output", 0, 0, 0},
-   {"@cpp-output",
--   "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-+   "%{!M:%{!MM:%{!E:cc1 -fpreprocessed %i %I %(cc1_options) %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
-   {".s", "@assembler", 0, 0, 0},
-   {"@assembler",
-    "%{!M:%{!MM:%{!E:%{!S:as %(asm_debug) %(asm_options) %i %A }}}}", 0, 0, 0},
-Index: gcc-4_6-branch/gcc/cp/lang-specs.h
-===================================================================
---- gcc-4_6-branch.orig/gcc/cp/lang-specs.h	2012-04-13 12:25:01.019670594 +0000
-+++ gcc-4_6-branch/gcc/cp/lang-specs.h	2012-04-13 12:25:07.567670180 +0000
-@@ -64,5 +64,5 @@
-   {".ii", "@c++-cpp-output", 0, 0, 0},
-   {"@c++-cpp-output",
-    "%{!M:%{!MM:%{!E:\
--    cc1plus -fpreprocessed %i %(cc1_options) %2\
-+    cc1plus -fpreprocessed %i %I %(cc1_options) %2\
-     %{!fsyntax-only:%(invoke_as)}}}}", 0, 0, 0},
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/disable_relax_pic_calls_flag.patch b/meta/recipes-devtools/gcc/gcc-4.6/disable_relax_pic_calls_flag.patch
deleted file mode 100644
index 22c106d..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/disable_relax_pic_calls_flag.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-GCC: disable MASK_RELAX_PIC_CALLS bit
-
-The new feature added after 4.3.3
-"http://www.pubbs.net/200909/gcc/94048-patch-add-support-for-rmipsjalr.html"
-will cause cc1plus eat up all the system memory when build webkit-gtk.
-The function mips_get_pic_call_symbol keeps on recursively calling itself.
-Disable this feature to walk aside the bug.
-
-Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
-
-Index: gcc-4.6.0/gcc/configure
-===================================================================
---- gcc-4.6.0.orig/gcc/configure
-+++ gcc-4.6.0/gcc/configure
-@@ -24887,13 +24887,6 @@ $as_echo_n "checking assembler and linke
-         rm -f conftest.*
-       fi
-     fi
--    if test $gcc_cv_as_ld_jalr_reloc = yes; then
--      if test x$target_cpu_default = x; then
--        target_cpu_default=MASK_RELAX_PIC_CALLS
--      else
--        target_cpu_default="($target_cpu_default)|MASK_RELAX_PIC_CALLS"
--      fi
--    fi
-     { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_as_ld_jalr_reloc" >&5
- $as_echo "$gcc_cv_as_ld_jalr_reloc" >&6; }
- 
-Index: gcc-4.6.0/gcc/configure.ac
-===================================================================
---- gcc-4.6.0.orig/gcc/configure.ac
-+++ gcc-4.6.0/gcc/configure.ac
-@@ -3764,13 +3764,6 @@ x:
-         rm -f conftest.*
-       fi
-     fi
--    if test $gcc_cv_as_ld_jalr_reloc = yes; then
--      if test x$target_cpu_default = x; then
--        target_cpu_default=MASK_RELAX_PIC_CALLS
--      else
--        target_cpu_default="($target_cpu_default)|MASK_RELAX_PIC_CALLS"
--      fi
--    fi
-     AC_MSG_RESULT($gcc_cv_as_ld_jalr_reloc)
- 
-     AC_CACHE_CHECK([linker for .eh_frame personality relaxation],
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch b/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
deleted file mode 100644
index 57b03d2..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-
-This patch address an issue with the compiler generating an ICE
-during compliation of lttng-ust.
-
-http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50099
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <khem.raj@gmail.com>
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: gcc/config/arm/arm.md
-===================================================================
---- gcc-4.6.0/gcc/config/arm/arm.md	(revision 178135)
-+++ gcc-4.6.0/gcc/config/arm/arm.md	(working copy)
-@@ -4217,6 +4217,7 @@ (define_split
-   "TARGET_32BIT"
-   [(set (match_dup 0) (ashiftrt:SI (match_dup 1) (const_int 31)))]
- {
-+  rtx srcop = operands[1];
-   rtx lo_part = gen_lowpart (SImode, operands[0]);
-   enum machine_mode src_mode = GET_MODE (operands[1]);
- 
-@@ -4224,14 +4225,21 @@ (define_split
-       && !reg_overlap_mentioned_p (operands[0], operands[1]))
-     emit_clobber (operands[0]);
- 
-+  if (TARGET_ARM && src_mode == QImode
-+      && !arm_reg_or_extendqisi_mem_op (srcop, QImode))
-+    {
-+      rtx dest = gen_lowpart (QImode, lo_part);
-+      emit_move_insn (dest, srcop);
-+      srcop = dest;
-+    }
-   if (!REG_P (lo_part) || src_mode != SImode
--      || !rtx_equal_p (lo_part, operands[1]))
-+      || !rtx_equal_p (lo_part, srcop))
-     {
-       if (src_mode == SImode)
--        emit_move_insn (lo_part, operands[1]);
-+        emit_move_insn (lo_part, srcop);
-       else
-         emit_insn (gen_rtx_SET (VOIDmode, lo_part,
--				gen_rtx_SIGN_EXTEND (SImode, operands[1])));
-+				gen_rtx_SIGN_EXTEND (SImode, srcop)));
-       operands[1] = lo_part;
-     }
-   operands[0] = gen_highpart (SImode, operands[0]);
-
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/fortran-cross-compile-hack.patch b/meta/recipes-devtools/gcc/gcc-4.6/fortran-cross-compile-hack.patch
deleted file mode 100644
index 5a89559..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/fortran-cross-compile-hack.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-* Fortran would have searched for arm-angstrom-gnueabi-gfortran but would have used
-  used gfortan. For gcc_4.2.2.bb we want to use the gfortran compiler from our cross
-  directory.
-
-Index: gcc-4.5+svnr155514/libgfortran/configure
-===================================================================
---- gcc-4.5+svnr155514.orig/libgfortran/configure	2009-12-29 22:02:01.000000000 -0800
-+++ gcc-4.5+svnr155514/libgfortran/configure	2009-12-30 08:12:40.889091657 -0800
-@@ -11655,7 +11655,7 @@ CC="$lt_save_CC"
- 
- # We need gfortran to compile parts of the library
- #AC_PROG_FC(gfortran)
--FC="$GFORTRAN"
-+#FC="$GFORTRAN"
- ac_ext=${ac_fc_srcext-f}
- ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5'
- ac_link='$FC -o conftest$ac_exeext $FCFLAGS $LDFLAGS $ac_fcflags_srcext conftest.$ac_ext $LIBS >&5'
-Index: gcc-4.5+svnr155514/libgfortran/configure.ac
-===================================================================
---- gcc-4.5+svnr155514.orig/libgfortran/configure.ac	2009-12-29 22:02:01.000000000 -0800
-+++ gcc-4.5+svnr155514/libgfortran/configure.ac	2009-12-30 08:12:13.453094218 -0800
-@@ -187,7 +187,7 @@ AC_SUBST(enable_static)
- 
- # We need gfortran to compile parts of the library
- #AC_PROG_FC(gfortran)
--FC="$GFORTRAN"
-+#FC="$GFORTRAN"
- AC_PROG_FC(gfortran)
- 
- # extra LD Flags which are required for targets
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
deleted file mode 100644
index ce82740..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
----
- configure    |    2 +-
- configure.ac |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: gcc-4.6.0/configure.ac
-===================================================================
---- gcc-4.6.0.orig/configure.ac
-+++ gcc-4.6.0/configure.ac
-@@ -3073,7 +3073,7 @@ fi
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache ${target_configargs}"
- 
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
-  *" newlib "*)
-   case " $target_configargs " in
-Index: gcc-4.6.0/configure
-===================================================================
---- gcc-4.6.0.orig/configure
-+++ gcc-4.6.0/configure
-@@ -7594,7 +7594,7 @@ fi
- # for target_alias and gcc doesn't manage it consistently.
- target_configargs="--cache-file=./config.cache ${target_configargs}"
- 
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
-  *" newlib "*)
-   case " $target_configargs " in
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
deleted file mode 100644
index 6d02f71..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Upstream-Status: Pending
-
-Before committing, I noticed that PR/32161 was marked as a dup of PR/32009, but my previous patch did not fix it.
-
-This alternative patch is better because it lets you just use CFLAGS_FOR_TARGET to set the compilation flags for libgcc. Since bootstrapped target libraries are never compiled with the native compiler, it makes little sense to use different flags for stage1 and later stages. And it also makes little sense to use a different variable than CFLAGS_FOR_TARGET.
-
-Other changes I had to do include:
-
-- moving the creation of default CFLAGS_FOR_TARGET from Makefile.am to configure.ac, because otherwise the BOOT_CFLAGS are substituted into CFLAGS_FOR_TARGET (which is "-O2 -g $(CFLAGS)") via $(CFLAGS). It is also cleaner this way though.
-
-- passing the right CFLAGS to configure scripts as exported environment variables
-
-I also stopped passing LIBCFLAGS to configure scripts since they are unused in the whole src tree. And I updated the documentation as H-P reminded me to do.
-
-Bootstrapped/regtested i686-pc-linux-gnu, will commit to 4.4 shortly. Ok for 4.3?
-
-Paolo
-
-2008-02-19  Paolo Bonzini  <bonzini@gnu.org>
-
-        PR bootstrap/32009
-        PR bootstrap/32161
-
-	* configure.ac (CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Compute here.
-	* configure: Regenerate.
-
-	* Makefile.def: Define stage_libcflags for all bootstrap stages.
-	* Makefile.tpl (BOOT_LIBCFLAGS, STAGE2_LIBCFLAGS, STAGE3_LIBCFLAGS,
-	STAGE4_LIBCFLAGS): New.
-	(CFLAGS_FOR_TARGET, CXXFLAGS_FOR_TARGET): Subst from autoconf, without
-	$(SYSROOT_CFLAGS_FOR_TARGET) and $(DEBUG_PREFIX_CFLAGS_FOR_TARGET).
-	(BASE_TARGET_EXPORTS): Append them here to C{,XX}FLAGS.
-	(EXTRA_TARGET_FLAGS): Append them here to {LIB,}C{,XX}FLAGS.
-	(configure-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags
-	for target modules.  Don't export LIBCFLAGS.
-	(all-stage[+id+]-[+prefix+][+module+]): Pass stage_libcflags; pass
-	$(BASE_FLAGS_TO_PASS) where [+args+] was passed, and [+args+] after
-	the overridden CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
-	(invocations of `all'): Replace $(TARGET_FLAGS_TO_PASS) with
-	$(EXTRA_TARGET_FLAGS), $(FLAGS_TO_PASS) with $(EXTRA_HOST_FLAGS).
-	* Makefile.in: Regenerate.
-
-config:
-2008-02-19  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/32009
-	* mh-ppc-darwin (BOOT_CFLAGS): Reenable.
-
-gcc:
-2008-02-19  Paolo Bonzini  <bonzini@gnu.org>
-
-	PR bootstrap/32009
-	* doc/install.texi: Correct references to CFLAGS, replacing them
-	with BOOT_CFLAGS.  Document flags used during bootstrap for
-	target libraries.
-
-
----
- Makefile.def           |   25 
- Makefile.in            | 1845 ++++++++++++++++++++++++++++++-------------------
- Makefile.tpl           |   91 +-
- config/mh-ppc-darwin   |    3 
- configure              |   36 
- configure.ac           |   32 
- gcc/Makefile.in        |    2 
- gcc/configure          |    6 
- gcc/configure.ac       |    3 
- gcc/doc/install.texi   |   56 -
- libiberty/Makefile.in  |  162 ++--
- libiberty/configure    |   46 -
- libiberty/configure.ac |   43 -
- 13 files changed, 1454 insertions(+), 896 deletions(-)
-
-Index: gcc-4.6.0/configure
-===================================================================
---- gcc-4.6.0.orig/configure
-+++ gcc-4.6.0/configure
-@@ -6785,6 +6785,38 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; the
- fi
- 
- 
-+# During gcc bootstrap, if we use some random cc for stage1 then CFLAGS
-+# might be empty or "-g".  We don't require a C++ compiler, so CXXFLAGS
-+# might also be empty (or "-g", if a non-GCC C++ compiler is in the path).
-+# We want to ensure that TARGET libraries (which we know are built with
-+# gcc) are built with "-O2 -g", so include those options when setting
-+# CFLAGS_FOR_TARGET and CXXFLAGS_FOR_TARGET.
-+if test "x$CFLAGS_FOR_TARGET" = x; then
-+  CFLAGS_FOR_TARGET=$CFLAGS
-+  case " $CFLAGS " in
-+    *" -O2 "*) ;;
-+    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
-+  esac
-+  case " $CFLAGS " in
-+    *" -g "* | *" -g3 "*) ;;
-+    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
-+  esac
-+fi
-+
-+
-+if test "x$CXXFLAGS_FOR_TARGET" = x; then
-+  CXXFLAGS_FOR_TARGET=$CXXFLAGS
-+  case " $CXXFLAGS " in
-+    *" -O2 "*) ;;
-+    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
-+  esac
-+  case " $CXXFLAGS " in
-+    *" -g "* | *" -g3 "*) ;;
-+    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
-+  esac
-+fi
-+
-+
- # Handle --with-headers=XXX.  If the value is not "yes", the contents of
- # the named directory are copied to $(tooldir)/sys-include.
- if test x"${with_headers}" != x && test x"${with_headers}" != xno ; then
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch
deleted file mode 100644
index 70d3c53..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-There would be an "Argument list too long" error when the
-build directory is longer than 200, this is caused by:
-
-headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u`
-
-The PLUGIN_HEADERS is too long before sort, so the "echo" can't handle
-it, use the $(sort list) of GNU make which can handle the too long list
-would fix the problem, the header would be short enough after sorted.
-The "tr ' ' '\012'" was used for translating the space to "\n", the
-$(sort list) doesn't need this.
-
-Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-
-Upstream-Status: Pending
----
- gcc/Makefile.in |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -4553,7 +4553,7 @@ install-plugin: installdirs lang.install-plugin s-header-vars install-gengtype
- # We keep the directory structure for files in config or c-family and .def
- # files. All other files are flattened to a single directory.
- 	$(mkinstalldirs) $(DESTDIR)$(plugin_includedir)
--	headers=`echo $(PLUGIN_HEADERS) | tr ' ' '\012' | sort -u`; \
-+	headers="$(sort $(PLUGIN_HEADERS))"; \
- 	srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`; \
- 	for file in $$headers; do \
- 	  if [ -f $$file ] ; then \
--- 
-1.7.10.2
-
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
deleted file mode 100644
index 4419a20..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Upstream-Status:Backport
-2011-08-18  Richard Sandiford  <richard.sandiford@linaro.org>
-
- 	gcc/
- 	Backport from mainline:
- 
-	2011-08-18  Richard Sandiford  <richard.sandiford@linaro.org>
-
-	* config/arm/arm.c (arm_rtx_costs_1): Don't modify the costs of SET.
-	(arm_size_rtx_costs): Likewise.
-
-=== modified file 'gcc/config/arm/arm.c'
---- old/gcc/config/arm/arm.c	2011-08-12 08:08:31 +0000
-+++ new/gcc/config/arm/arm.c	2011-08-18 13:53:37 +0000
-@@ -7464,6 +7464,9 @@
- 	*total = COSTS_N_INSNS (4);
-       return true;
- 
-+    case SET:
-+      return false;
-+
-     default:
-       *total = COSTS_N_INSNS (4);
-       return false;
-@@ -7811,6 +7814,9 @@
-       *total = COSTS_N_INSNS (1) + 1;
-       return true;
- 
-+    case SET:
-+      return false;
-+
-     default:
-       if (mode != VOIDmode)
- 	*total = COSTS_N_INSNS (ARM_NUM_REGS (mode));
-
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch
deleted file mode 100644
index 5eaeb05..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4_6-branch/Makefile.def
-===================================================================
---- gcc-4_6-branch.orig/Makefile.def	2012-03-03 01:08:03.000000000 -0800
-+++ gcc-4_6-branch/Makefile.def	2012-03-04 09:19:02.430607447 -0800
-@@ -242,6 +242,7 @@
- flags_to_pass = { flag= BISON ; };
- flags_to_pass = { flag= CC_FOR_BUILD ; };
- flags_to_pass = { flag= CFLAGS_FOR_BUILD ; };
-+flags_to_pass = { flag= CPPFLAGS_FOR_BUILD ; };
- flags_to_pass = { flag= CXX_FOR_BUILD ; };
- flags_to_pass = { flag= EXPECT ; };
- flags_to_pass = { flag= FLEX ; };
-Index: gcc-4_6-branch/gcc/Makefile.in
-===================================================================
---- gcc-4_6-branch.orig/gcc/Makefile.in	2012-03-03 01:03:17.000000000 -0800
-+++ gcc-4_6-branch/gcc/Makefile.in	2012-03-04 09:19:02.430607447 -0800
-@@ -770,7 +770,7 @@
- 
- # Native linker and preprocessor flags.  For x-fragment overrides.
- BUILD_LDFLAGS=@BUILD_LDFLAGS@
--BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
-+BUILD_CPPFLAGS=$(INCLUDES) @BUILD_CPPFLAGS@ $(X_CPPFLAGS)
- 
- # Actual name to use when installing a native compiler.
- GCC_INSTALL_NAME := $(shell echo gcc|sed '$(program_transform_name)')
-Index: gcc-4_6-branch/gcc/configure.ac
-===================================================================
---- gcc-4_6-branch.orig/gcc/configure.ac	2012-03-03 01:17:45.000000000 -0800
-+++ gcc-4_6-branch/gcc/configure.ac	2012-03-04 09:19:02.430607447 -0800
-@@ -1774,16 +1774,18 @@
- # Also, we cannot run fixincludes.
- 
- # These are the normal (build=host) settings:
--CC_FOR_BUILD='$(CC)'		AC_SUBST(CC_FOR_BUILD)
--BUILD_CFLAGS='$(ALL_CFLAGS)'	AC_SUBST(BUILD_CFLAGS)
--BUILD_LDFLAGS='$(LDFLAGS)'	AC_SUBST(BUILD_LDFLAGS)
--STMP_FIXINC=stmp-fixinc		AC_SUBST(STMP_FIXINC)
-+CC_FOR_BUILD='$(CC)'			AC_SUBST(CC_FOR_BUILD)
-+BUILD_CFLAGS='$(ALL_CFLAGS)'		AC_SUBST(BUILD_CFLAGS)
-+BUILD_LDFLAGS='$(LDFLAGS)'		AC_SUBST(BUILD_LDFLAGS)
-+BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'	AC_SUBST(BUILD_CPPFLAGS)
-+STMP_FIXINC=stmp-fixinc			AC_SUBST(STMP_FIXINC)
- 
- # And these apply if build != host, or we are generating coverage data
- if test x$build != x$host || test "x$coverage_flags" != x
- then
-     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
-     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
-+    BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
- fi
- 
- # Expand extra_headers to include complete path.
-Index: gcc-4_6-branch/Makefile.in
-===================================================================
---- gcc-4_6-branch.orig/Makefile.in	2012-03-03 01:08:03.000000000 -0800
-+++ gcc-4_6-branch/Makefile.in	2012-03-04 09:19:02.446607448 -0800
-@@ -338,6 +338,7 @@
- AS_FOR_BUILD = @AS_FOR_BUILD@
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
- CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
- CXX_FOR_BUILD = @CXX_FOR_BUILD@
- DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-@@ -691,6 +692,7 @@
- 	"BISON=$(BISON)" \
- 	"CC_FOR_BUILD=$(CC_FOR_BUILD)" \
- 	"CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
-+	"CPPFLAGS_FOR_BUILD=$(CPPFLAGS_FOR_BUILD)" \
- 	"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
- 	"EXPECT=$(EXPECT)" \
- 	"FLEX=$(FLEX)" \
-Index: gcc-4_6-branch/gcc/configure
-===================================================================
---- gcc-4_6-branch.orig/gcc/configure	2012-03-03 01:17:45.000000000 -0800
-+++ gcc-4_6-branch/gcc/configure	2012-03-04 09:19:15.638608087 -0800
-@@ -703,6 +703,7 @@
- LIBTOOL
- collect2
- STMP_FIXINC
-+BUILD_CPPFLAGS
- BUILD_LDFLAGS
- BUILD_CFLAGS
- CC_FOR_BUILD
-@@ -4842,7 +4843,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_cv_cc_gcc_supports_ada" >&5
- $as_echo "$acx_cv_cc_gcc_supports_ada" >&6; }
- 
--if test x$GNATBIND != xno && test x$GNATMAKE != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
-+if test "x$GNATBIND" != xno && test "x$GNATMAKE" != xno && test x$acx_cv_cc_gcc_supports_ada != xno; then
-   have_gnat=yes
- else
-   have_gnat=no
-@@ -11372,6 +11373,7 @@
- CC_FOR_BUILD='$(CC)'
- BUILD_CFLAGS='$(ALL_CFLAGS)'
- BUILD_LDFLAGS='$(LDFLAGS)'
-+BUILD_CPPFLAGS='$(ALL_CPPFLAGS)'
- STMP_FIXINC=stmp-fixinc
- 
- # And these apply if build != host, or we are generating coverage data
-@@ -11379,6 +11381,7 @@
- then
-     BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
-     BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
-+    BUILD_CPPFLAGS='$(CPPFLAGS_FOR_BUILD)'
- fi
- 
- # Expand extra_headers to include complete path.
-@@ -17495,7 +17498,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17498 "configure"
-+#line 17501 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -17601,7 +17604,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17604 "configure"
-+#line 17607 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-Index: gcc-4_6-branch/Makefile.tpl
-===================================================================
---- gcc-4_6-branch.orig/Makefile.tpl	2012-03-03 01:08:03.000000000 -0800
-+++ gcc-4_6-branch/Makefile.tpl	2012-03-04 09:19:02.454607448 -0800
-@@ -341,6 +341,7 @@
- AS_FOR_BUILD = @AS_FOR_BUILD@
- CC_FOR_BUILD = @CC_FOR_BUILD@
- CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
-+CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
- CXXFLAGS_FOR_BUILD = @CXXFLAGS_FOR_BUILD@
- CXX_FOR_BUILD = @CXX_FOR_BUILD@
- DLLTOOL_FOR_BUILD = @DLLTOOL_FOR_BUILD@
-Index: gcc-4_6-branch/configure.ac
-===================================================================
---- gcc-4_6-branch.orig/configure.ac	2012-03-03 01:17:45.000000000 -0800
-+++ gcc-4_6-branch/configure.ac	2012-03-04 09:19:02.454607448 -0800
-@@ -3123,6 +3123,7 @@
- # our build compiler if desired.
- if test x"${build}" = x"${host}" ; then
-   CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+  CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
-   CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
-   LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
- fi
-@@ -3189,6 +3190,7 @@
- AC_SUBST(AS_FOR_BUILD)
- AC_SUBST(CC_FOR_BUILD)
- AC_SUBST(CFLAGS_FOR_BUILD)
-+AC_SUBST(CPPFLAGS_FOR_BUILD)
- AC_SUBST(CXXFLAGS_FOR_BUILD)
- AC_SUBST(CXX_FOR_BUILD)
- AC_SUBST(DLLTOOL_FOR_BUILD)
-Index: gcc-4_6-branch/configure
-===================================================================
---- gcc-4_6-branch.orig/configure	2012-03-03 01:17:45.000000000 -0800
-+++ gcc-4_6-branch/configure	2012-03-04 09:19:02.458607448 -0800
-@@ -617,6 +617,7 @@
- DLLTOOL_FOR_BUILD
- CXX_FOR_BUILD
- CXXFLAGS_FOR_BUILD
-+CPPFLAGS_FOR_BUILD
- CFLAGS_FOR_BUILD
- CC_FOR_BUILD
- AS_FOR_BUILD
-@@ -7644,6 +7645,7 @@
- # our build compiler if desired.
- if test x"${build}" = x"${host}" ; then
-   CFLAGS_FOR_BUILD=${CFLAGS_FOR_BUILD-${CFLAGS}}
-+  CPPFLAGS_FOR_BUILD=${CPPFLAGS_FOR_BUILD-${CPPFLAGS}}
-   CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}}
-   LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}}
- fi
-@@ -7709,6 +7711,7 @@
- 
- 
- 
-+
- 
- 
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-dir-extend.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-dir-extend.patch
deleted file mode 100644
index 35170e2..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-dir-extend.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Pending
-
-Add /sw/include and /opt/include based on the original
-zecke-no-host-includes.patch patch.  The original patch checked for
-/usr/include, /sw/include and /opt/include and then triggered a failure and
-aborted.
-
-Instead, we add the two missing items to the current scan.  If the user
-wants this to be a failure, they can add "-Werror=poison-system-directories".
-
-Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-
-Index: gcc-4.6.0/gcc/incpath.c
-===================================================================
---- gcc-4.6.0.orig/gcc/incpath.c
-+++ gcc-4.6.0/gcc/incpath.c
-@@ -363,7 +363,9 @@ merge_include_chains (const char *sysroo
-          {
-           if ((!strncmp (p->name, "/usr/include", 12))
-               || (!strncmp (p->name, "/usr/local/include", 18))
--              || (!strncmp (p->name, "/usr/X11R6/include", 18)))
-+              || (!strncmp (p->name, "/usr/X11R6/include", 18))
-+              || (!strncmp (p->name, "/sw/include", 11))
-+              || (!strncmp (p->name, "/opt/include", 12)))
-             warning (OPT_Wpoison_system_directories,
-                      "include location \"%s\" is unsafe for "
-                      "cross-compilation",
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch
deleted file mode 100644
index a44e86c..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch
+++ /dev/null
@@ -1,223 +0,0 @@
-Upstream-Status: Inappropriate [distribution: codesourcery]
-
-       gcc/
-       2008-07-02  Joseph Myers  <joseph@codesourcery.com>
-       * c-incpath.c: Include toplev.h.
-       (merge_include_chains): Use warning instead of cpp_error for
-       system directory poisoning diagnostic.
-       * Makefile.in (c-incpath.o): Depend on toplev.h.
-       * gcc.c (LINK_COMMAND_SPEC): Pass
-       --error-poison-system-directories if
-       -Werror=poison-system-directories.
-
-       2007-06-13  Joseph Myers  <joseph@codesourcery.com>
-       * common.opt (--Wno-poison-system-directories): New.
-       * doc/invoke.texi (-Wno-poison-system-directories): Document.
-       * c-incpath.c: Include flags.h.
-       (merge_include_chains): Check flag_poison_system_directories.
-       * gcc.c (LINK_COMMAND_SPEC): Pass --no-poison-system-directories
-       to linker if -Wno-poison-system-directories.
-       * Makefile.in (c-incpath.o): Depend on $(FLAGS_H).
-
-       2007-03-20  Daniel Jacobowitz  <dan@codesourcery.com>
-                   Joseph Myers  <joseph@codesourcery.com>
-       * configure.ac (--enable-poison-system-directories): New option.
-       * configure, config.in: Regenerate.
-       * c-incpath.c (merge_include_chains): If
-       ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of
-       /usr/include, /usr/local/include or /usr/X11R6/include.
-
-Index: gcc-4_6-branch/gcc/common.opt
-===================================================================
---- gcc-4_6-branch.orig/gcc/common.opt	2012-03-03 01:03:17.000000000 -0800
-+++ gcc-4_6-branch/gcc/common.opt	2012-03-04 09:24:54.410624483 -0800
-@@ -567,6 +567,10 @@
- Common Var(warn_padded) Warning
- Warn when padding is required to align structure members
- 
-+Wpoison-system-directories
-+Common Var(flag_poison_system_directories) Init(1) Warning
-+Warn for -I and -L options using system directories if cross compiling
-+
- Wshadow
- Common Var(warn_shadow) Warning
- Warn when one local variable shadows another
-Index: gcc-4_6-branch/gcc/config.in
-===================================================================
---- gcc-4_6-branch.orig/gcc/config.in	2012-03-03 01:03:17.000000000 -0800
-+++ gcc-4_6-branch/gcc/config.in	2012-03-04 09:24:54.410624483 -0800
-@@ -144,6 +144,12 @@
- #endif
- 
- 
-+/* Define to warn for use of native system header directories */
-+#ifndef USED_FOR_TARGET
-+#undef ENABLE_POISON_SYSTEM_DIRECTORIES
-+#endif
-+
-+
- /* Define if you want all operations on RTL (the basic data structure of the
-    optimizer and back end) to be checked for dynamic type safety at runtime.
-    This is quite expensive. */
-Index: gcc-4_6-branch/gcc/configure.ac
-===================================================================
---- gcc-4_6-branch.orig/gcc/configure.ac	2012-03-04 09:22:07.000000000 -0800
-+++ gcc-4_6-branch/gcc/configure.ac	2012-03-04 09:24:54.410624483 -0800
-@@ -4692,6 +4692,16 @@
- fi)
- AC_SUBST(slibdir)
- 
-+AC_ARG_ENABLE([poison-system-directories],
-+             AS_HELP_STRING([--enable-poison-system-directories],
-+                            [warn for use of native system header directories]),,
-+             [enable_poison_system_directories=no])
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
-+           [1],
-+           [Define to warn for use of native system header directories])
-+fi
-+
- # Substitute configuration variables
- AC_SUBST(subdirs)
- AC_SUBST(srcdir)
-Index: gcc-4_6-branch/gcc/doc/invoke.texi
-===================================================================
---- gcc-4_6-branch.orig/gcc/doc/invoke.texi	2012-03-03 00:46:39.000000000 -0800
-+++ gcc-4_6-branch/gcc/doc/invoke.texi	2012-03-04 09:24:54.414624482 -0800
-@@ -257,6 +257,7 @@
- -Woverlength-strings  -Wpacked  -Wpacked-bitfield-compat  -Wpadded @gol
- -Wparentheses  -Wpedantic-ms-format -Wno-pedantic-ms-format @gol
- -Wpointer-arith  -Wno-pointer-to-int-cast @gol
-+-Wno-poison-system-directories @gol
- -Wredundant-decls @gol
- -Wreturn-type  -Wsequence-point  -Wshadow @gol
- -Wsign-compare  -Wsign-conversion  -Wstack-protector @gol
-@@ -3782,6 +3783,14 @@
-  for most targets, it is made up of code and thus requires the stack
-  to be made executable in order for the program to work properly.
- 
-+@item -Wno-poison-system-directories
-+@opindex Wno-poison-system-directories
-+Do not warn for @option{-I} or @option{-L} options using system
-+directories such as @file{/usr/include} when cross compiling.  This
-+option is intended for use in chroot environments when such
-+directories contain the correct headers and libraries for the target
-+system rather than the host.
-+
- @item -Wfloat-equal
- @opindex Wfloat-equal
- @opindex Wno-float-equal
-Index: gcc-4_6-branch/gcc/gcc.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/gcc.c	2012-03-03 01:03:17.000000000 -0800
-+++ gcc-4_6-branch/gcc/gcc.c	2012-03-04 09:24:54.418624482 -0800
-@@ -659,6 +659,8 @@
-     %{flto} %{flto=*} %l " LINK_PIE_SPEC \
-    "%X %{o*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\
-+    %{Wno-poison-system-directories:--no-poison-system-directories}\
-+    %{Werror=poison-system-directories:--error-poison-system-directories}\
-     %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
-     %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\
-     %(mflib) " STACK_SPLIT_SPEC "\
-Index: gcc-4_6-branch/gcc/incpath.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/incpath.c	2012-03-03 01:03:17.000000000 -0800
-+++ gcc-4_6-branch/gcc/incpath.c	2012-03-04 09:24:54.418624482 -0800
-@@ -353,6 +353,24 @@
- 	}
-       fprintf (stderr, _("End of search list.\n"));
-     }
-+
-+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
-+  if (flag_poison_system_directories)
-+    {
-+       struct cpp_dir *p;
-+
-+       for (p = heads[QUOTE]; p; p = p->next)
-+         {
-+          if ((!strncmp (p->name, "/usr/include", 12))
-+              || (!strncmp (p->name, "/usr/local/include", 18))
-+              || (!strncmp (p->name, "/usr/X11R6/include", 18)))
-+            warning (OPT_Wpoison_system_directories,
-+                     "include location \"%s\" is unsafe for "
-+                     "cross-compilation",
-+                     p->name);
-+         }
-+    }
-+#endif
- }
- 
- /* Use given -I paths for #include "..." but not #include <...>, and
-Index: gcc-4_6-branch/gcc/Makefile.in
-===================================================================
---- gcc-4_6-branch.orig/gcc/Makefile.in	2012-03-04 09:22:05.000000000 -0800
-+++ gcc-4_6-branch/gcc/Makefile.in	2012-03-04 09:24:54.418624482 -0800
-@@ -2179,7 +2179,7 @@
- 
- incpath.o: incpath.c incpath.h $(CONFIG_H) $(SYSTEM_H) $(CPPLIB_H) \
- 		intl.h prefix.h coretypes.h $(TM_H) cppdefault.h $(TARGET_H) \
--		$(MACHMODE_H)
-+		$(MACHMODE_H) $(FLAGS_H) toplev.h
- 
- prefix.o: prefix.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) prefix.h \
- 	Makefile $(BASEVER)
-Index: gcc-4_6-branch/gcc/configure
-===================================================================
---- gcc-4_6-branch.orig/gcc/configure	2012-03-04 09:22:07.000000000 -0800
-+++ gcc-4_6-branch/gcc/configure	2012-03-04 09:25:31.502626277 -0800
-@@ -912,6 +912,7 @@
- enable_maintainer_mode
- enable_version_specific_runtime_libs
- with_slibdir
-+enable_poison_system_directories
- enable_plugin
- enable_libquadmath_support
- '
-@@ -1623,6 +1624,8 @@
-   --enable-version-specific-runtime-libs
-                           specify that runtime libraries should be
-                           installed in a compiler-specific directory
-+  --enable-poison-system-directories
-+                          warn for use of native system header directories
-   --enable-plugin         enable plugin support
-   --disable-libquadmath-support
-                           disable libquadmath support for Fortran
-@@ -17498,7 +17501,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17501 "configure"
-+#line 17504 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -17604,7 +17607,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17607 "configure"
-+#line 17610 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -26125,6 +26128,19 @@
- 
- 
- 
-+# Check whether --enable-poison-system-directories was given.
-+if test "${enable_poison_system_directories+set}" = set; then :
-+  enableval=$enable_poison_system_directories;
-+else
-+  enable_poison_system_directories=no
-+fi
-+
-+if test "x${enable_poison_system_directories}" = "xyes"; then
-+
-+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
-+
-+fi
-+
- # Substitute configuration variables
- 
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-uclibc-locale-ctype_touplow_t.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-uclibc-locale-ctype_touplow_t.patch
deleted file mode 100644
index 1648b3b..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-uclibc-locale-ctype_touplow_t.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.6.0/libstdc++-v3/config/locale/generic/c_locale.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/generic/c_locale.h
-+++ gcc-4.6.0/libstdc++-v3/config/locale/generic/c_locale.h
-@@ -41,13 +41,22 @@
- 
- #include <clocale>
- 
-+#ifdef __UCLIBC__
-+#include <features.h>
-+#include <ctype.h>
-+#endif
-+
- #define _GLIBCXX_NUM_CATEGORIES 0
- 
- namespace std _GLIBCXX_VISIBILITY(default)
- {
- _GLIBCXX_BEGIN_NAMESPACE_VERSION
- 
-+#ifdef __UCLIBC__
-+  typedef __ctype_touplow_t*	__c_locale;
-+#else
-   typedef int*			__c_locale;
-+#endif
- 
-   // Convert numeric value of type double and long double to string and
-   // return length of string.  If vsnprintf is available use it, otherwise
-Index: gcc-4.6.0/libstdc++-v3/config/os/gnu-linux/ctype_base.h
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/os/gnu-linux/ctype_base.h
-+++ gcc-4.6.0/libstdc++-v3/config/os/gnu-linux/ctype_base.h
-@@ -34,6 +34,11 @@
- 
- // Information as gleaned from /usr/include/ctype.h
- 
-+#ifdef __UCLIBC__
-+#include <features.h>
-+#include <ctype.h>
-+#endif
-+
- namespace std _GLIBCXX_VISIBILITY(default)
- {
- _GLIBCXX_BEGIN_NAMESPACE_VERSION
-@@ -42,7 +47,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
-   struct ctype_base
-   {
-     // Non-standard typedefs.
-+#ifdef __UCLIBC__
-+    typedef const __ctype_touplow_t*	__to_type;
-+#else
-     typedef const int* 		__to_type;
-+#endif
- 
-     // NB: Offsets into ctype<char>::_M_table force a particular size
-     // on the mask type. Because of this, we don't use an enum.
-Index: gcc-4.6.0/libstdc++-v3/config/locale/generic/c_locale.cc
-===================================================================
---- gcc-4.6.0.orig/libstdc++-v3/config/locale/generic/c_locale.cc
-+++ gcc-4.6.0/libstdc++-v3/config/locale/generic/c_locale.cc
-@@ -264,5 +264,10 @@ _GLIBCXX_END_NAMESPACE_VERSION
- #ifdef _GLIBCXX_LONG_DOUBLE_COMPAT
- #define _GLIBCXX_LDBL_COMPAT(dbl, ldbl) \
-   extern "C" void ldbl (void) __attribute__ ((alias (#dbl)))
-+#ifdef __UCLIBC__
-+// This is because __c_locale is of type __ctype_touplow_t* which is short on uclibc. for glibc its int*
-+_GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPs, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPs);
-+#else
- _GLIBCXX_LDBL_COMPAT(_ZSt14__convert_to_vIdEvPKcRT_RSt12_Ios_IostateRKPi, _ZSt14__convert_to_vIeEvPKcRT_RSt12_Ios_IostateRKPi);
-+#endif
- #endif // _GLIBCXX_LONG_DOUBLE_COMPAT
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch b/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
deleted file mode 100644
index 94b61cd..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-commit 3cb9bbfa927aa187048534f9069202c017a78e38
-Author: ppluzhnikov <ppluzhnikov@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date:   Wed May 11 18:28:14 2011 +0000
-
-    2011-05-11  Satoru Takabayashi  <satorux@google.com>
-    	    Paul Pluzhnikov  <ppluzhnikov@google.com>
-    
-    	* gcc/doc/install.texi (Configuration): Document
-    	--with-linker-hash-style.
-    	* gcc/gcc.c (init_spec): Handle LINKER_HASH_STYLE.
-    	* gcc/config.in: Add LINKER_HASH_STYLE.
-    	* gcc/configure.ac: Add --with-linker-hash-style.
-    	* gcc/configure: Regenerate.
-    
-    
-    
-    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@173668 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Index: gcc-4_6-branch/gcc/config.in
-===================================================================
---- gcc-4_6-branch.orig/gcc/config.in	2012-03-04 09:30:04.000000000 -0800
-+++ gcc-4_6-branch/gcc/config.in	2012-03-04 09:32:30.878646575 -0800
-@@ -1583,6 +1583,12 @@
- #endif
- 
- 
-+/* The linker hash style */
-+#ifndef USED_FOR_TARGET
-+#undef LINKER_HASH_STYLE
-+#endif
-+
-+
- /* Define to the name of the LTO plugin DSO that must be passed to the
-    linker's -plugin=LIB option. */
- #ifndef USED_FOR_TARGET
-Index: gcc-4_6-branch/gcc/configure
-===================================================================
---- gcc-4_6-branch.orig/gcc/configure	2012-03-04 09:30:05.000000000 -0800
-+++ gcc-4_6-branch/gcc/configure	2012-03-04 09:32:39.918647011 -0800
-@@ -915,6 +915,7 @@
- enable_poison_system_directories
- enable_plugin
- enable_libquadmath_support
-+with_linker_hash_style
- '
-       ac_precious_vars='build_alias
- host_alias
-@@ -1667,6 +1668,8 @@
-                           with the compiler
-   --with-system-zlib      use installed libz
-   --with-slibdir=DIR      shared libraries in DIR [LIBDIR]
-+  --with-linker-hash-style={sysv,gnu,both}
-+                          specify the linker hash style
- 
- Some influential environment variables:
-   CC          C compiler command
-@@ -17501,7 +17504,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17504 "configure"
-+#line 17507 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -17607,7 +17610,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
--#line 17610 "configure"
-+#line 17613 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -26432,6 +26435,36 @@
- fi
- 
- 
-+# Specify what hash style to use by default.
-+
-+# Check whether --with-linker-hash-style was given.
-+if test "${with_linker_hash_style+set}" = set; then :
-+  withval=$with_linker_hash_style; case x"$withval" in
-+   xsysv)
-+     LINKER_HASH_STYLE=sysv
-+     ;;
-+   xgnu)
-+     LINKER_HASH_STYLE=gnu
-+     ;;
-+   xboth)
-+     LINKER_HASH_STYLE=both
-+     ;;
-+   *)
-+     as_fn_error "$withval is an invalid option to --with-linker-hash-style" "$LINENO" 5
-+     ;;
-+ esac
-+else
-+  LINKER_HASH_STYLE=''
-+fi
-+
-+if test x"${LINKER_HASH_STYLE}" != x; then
-+
-+cat >>confdefs.h <<_ACEOF
-+#define LINKER_HASH_STYLE "$LINKER_HASH_STYLE"
-+_ACEOF
-+
-+fi
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
- 
-Index: gcc-4_6-branch/gcc/configure.ac
-===================================================================
---- gcc-4_6-branch.orig/gcc/configure.ac	2012-03-04 09:30:05.000000000 -0800
-+++ gcc-4_6-branch/gcc/configure.ac	2012-03-04 09:32:30.890646574 -0800
-@@ -4905,6 +4905,30 @@
- fi
- 
- 
-+# Specify what hash style to use by default.
-+AC_ARG_WITH([linker-hash-style],
-+[AC_HELP_STRING([--with-linker-hash-style={sysv,gnu,both}],
-+                [specify the linker hash style])],
-+[case x"$withval" in
-+   xsysv)
-+     LINKER_HASH_STYLE=sysv
-+     ;;
-+   xgnu)
-+     LINKER_HASH_STYLE=gnu
-+     ;;
-+   xboth)
-+     LINKER_HASH_STYLE=both
-+     ;;
-+   *)
-+     AC_MSG_ERROR([$withval is an invalid option to --with-linker-hash-style])
-+     ;;
-+ esac],
-+[LINKER_HASH_STYLE=''])
-+if test x"${LINKER_HASH_STYLE}" != x; then
-+  AC_DEFINE_UNQUOTED(LINKER_HASH_STYLE, "$LINKER_HASH_STYLE",
-+                                         [The linker hash style])
-+fi
-+
- # Configure the subdirectories
- # AC_CONFIG_SUBDIRS($subdirs)
- 
-Index: gcc-4_6-branch/gcc/doc/install.texi
-===================================================================
---- gcc-4_6-branch.orig/gcc/doc/install.texi	2012-03-03 00:46:39.000000000 -0800
-+++ gcc-4_6-branch/gcc/doc/install.texi	2012-03-04 09:32:30.894646574 -0800
-@@ -1665,6 +1665,11 @@
- support @option{--build-id} option, a warning is issued and the
- @option{--enable-linker-build-id} option is ignored.  The default is off.
- 
-+@item --with-linker-hash-style=@var{choice}
-+Tells GCC to pass @option{--hash-style=@var{choice}} option to the
-+linker for all final links. @var{choice} can be one of
-+@samp{sysv}, @samp{gnu}, and @samp{both} where @samp{sysv} is the default.
-+
- @item --enable-gnu-unique-object
- @itemx --disable-gnu-unique-object
- Tells GCC to use the gnu_unique_object relocation for C++ template
-Index: gcc-4_6-branch/gcc/gcc.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/gcc.c	2012-03-04 09:30:04.000000000 -0800
-+++ gcc-4_6-branch/gcc/gcc.c	2012-03-04 09:32:30.894646574 -0800
-@@ -1427,7 +1427,8 @@
-   }
- #endif
- 
--#if defined LINK_EH_SPEC || defined LINK_BUILDID_SPEC
-+#if defined LINK_EH_SPEC || defined LINK_BUILDID_SPEC || \
-+    defined LINKER_HASH_STYLE
- # ifdef LINK_BUILDID_SPEC
-   /* Prepend LINK_BUILDID_SPEC to whatever link_spec we had before.  */
-   obstack_grow (&obstack, LINK_BUILDID_SPEC, sizeof(LINK_BUILDID_SPEC) - 1);
-@@ -1436,6 +1437,16 @@
-   /* Prepend LINK_EH_SPEC to whatever link_spec we had before.  */
-   obstack_grow (&obstack, LINK_EH_SPEC, sizeof(LINK_EH_SPEC) - 1);
- # endif
-+# ifdef LINKER_HASH_STYLE
-+  /* Prepend --hash-style=LINKER_HASH_STYLE to whatever link_spec we had
-+     before.  */
-+  {
-+    static const char hash_style[] = "--hash-style=";
-+    obstack_grow (&obstack, hash_style, sizeof(hash_style) - 1);
-+    obstack_grow (&obstack, LINKER_HASH_STYLE, sizeof(LINKER_HASH_STYLE) - 1);
-+    obstack_1grow (&obstack, ' ');
-+  }
-+# endif
-   obstack_grow0 (&obstack, link_spec, strlen (link_spec));
-   link_spec = XOBFINISH (&obstack, const char *);
- #endif
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch b/meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch
deleted file mode 100644
index bf930ec..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-MIPS64 defaults to n32 ABI, this patch makes it
-so that it defaults to N64 ABI
-
-Upstream-Status: Inappropriate [OE config specific]
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Index: gcc-4_6-branch/gcc/config.gcc
-===================================================================
---- gcc-4_6-branch.orig/gcc/config.gcc	2012-04-22 19:12:12.431061229 -0700
-+++ gcc-4_6-branch/gcc/config.gcc	2012-04-22 19:13:36.307065289 -0700
-@@ -1882,7 +1882,7 @@
- mips64*-*-linux* | mipsisa64*-*-linux*)
- 	tm_file="dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h ${tm_file} mips/linux.h mips/linux64.h"
- 	tmake_file="${tmake_file} mips/t-linux64 mips/t-libgcc-mips16"
--	tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_N32"
-+	tm_defines="${tm_defines} MIPS_ABI_DEFAULT=ABI_64"
- 	case ${target} in
- 		mips64el-st-linux-gnu)
- 			tm_file="${tm_file} mips/st.h"
-Index: gcc-4_6-branch/gcc/config/mips/linux64.h
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/mips/linux64.h	2012-04-22 19:10:59.743057711 -0700
-+++ gcc-4_6-branch/gcc/config/mips/linux64.h	2012-04-22 19:11:56.919060479 -0700
-@@ -26,7 +26,7 @@
-   BASE_DRIVER_SELF_SPECS, \
-   LINUX_DRIVER_SELF_SPECS \
-   " %{!EB:%{!EL:%(endian_spec)}}" \
--  " %{!mabi=*: -mabi=n32}"
-+  " %{!mabi=*: -mabi=64}"
- 
- #undef LIB_SPEC
- #define LIB_SPEC "\
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch b/meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch
deleted file mode 100644
index fe157a8..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-gcc-runtime builds libstdc++ separately from gcc-cross-*. Its configure tests using g++ 
-will not run correctly since by default the linker will try to link against libstdc++
-which shouldn't exist yet. We need an option to disable -lstdc++
-option whilst leaving -lc, -lgcc and other automatic library dependencies added by gcc 
-driver. This patch adds such an option which only disables the -lstdc++.
-
-A "standard" gcc build uses xgcc and hence avoids this. We should ask upstream how to 
-do this officially, the likely answer is don't build libstdc++ separately.
-
-RP 29/6/10
-
-Index: gcc-4.6.0/gcc/cp/g++spec.c
-===================================================================
---- gcc-4.6.0.orig/gcc/cp/g++spec.c
-+++ gcc-4.6.0/gcc/cp/g++spec.c
-@@ -127,6 +127,7 @@ lang_specific_driver (struct cl_decoded_
-       switch (decoded_options[i].opt_index)
- 	{
- 	case OPT_nostdlib:
-+	case OPT_nostdlib__:
- 	case OPT_nodefaultlibs:
- 	  library = -1;
- 	  break;
-Index: gcc-4.6.0/gcc/doc/invoke.texi
-===================================================================
---- gcc-4.6.0.orig/gcc/doc/invoke.texi
-+++ gcc-4.6.0/gcc/doc/invoke.texi
-@@ -193,7 +193,7 @@ in the following sections.
- -fno-pretty-templates @gol
- -frepo  -fno-rtti  -fstats  -ftemplate-depth=@var{n} @gol
- -fno-threadsafe-statics -fuse-cxa-atexit  -fno-weak  -nostdinc++ @gol
---fno-default-inline  -fvisibility-inlines-hidden @gol
-+-nostdlib++ -fno-default-inline  -fvisibility-inlines-hidden @gol
- -fvisibility-ms-compat @gol
- -Wabi  -Wconversion-null  -Wctor-dtor-privacy @gol
- -Wnoexcept -Wnon-virtual-dtor  -Wreorder @gol
-@@ -431,7 +431,7 @@ Objective-C and Objective-C++ Dialects}.
- @gccoptlist{@var{object-file-name}  -l@var{library} @gol
- -nostartfiles  -nodefaultlibs  -nostdlib -pie -rdynamic @gol
- -s  -static  -static-libgcc  -static-libstdc++ -shared  @gol
---shared-libgcc  -symbolic @gol
-+-shared-libgcc  -symbolic -nostdlib++ @gol
- -T @var{script}  -Wl,@var{option}  -Xlinker @var{option} @gol
- -u @var{symbol}}
- 
-@@ -9069,6 +9069,11 @@ These entries are usually resolved by en
- libc.  These entry points should be supplied through some other
- mechanism when this option is specified.
- 
-+@item -nostdlib++
-+@opindex nostdlib++
-+Do not use the standard system C++ runtime libraries when linking.
-+Only the libraries you specify will be passed to the linker.
-+
- @cindex @option{-lgcc}, use with @option{-nostdlib}
- @cindex @option{-nostdlib} and unresolved references
- @cindex unresolved references and @option{-nostdlib}
-Index: gcc-4.6.0/gcc/c-family/c.opt
-===================================================================
---- gcc-4.6.0.orig/gcc/c-family/c.opt
-+++ gcc-4.6.0/gcc/c-family/c.opt
-@@ -1111,6 +1111,10 @@ nostdinc++
- C++ ObjC++
- Do not search standard system include directories for C++
- 
-+nostdlib++
-+Driver
-+Do not link standard C++ runtime library
-+
- o
- C ObjC C++ ObjC++ Joined Separate
- ; Documented in common.opt
-Index: gcc-4.6.0/gcc/gcc.c
-===================================================================
---- gcc-4.6.0.orig/gcc/gcc.c
-+++ gcc-4.6.0/gcc/gcc.c
-@@ -666,6 +666,7 @@ proper position among the other output f
-     %(mflib) " STACK_SPLIT_SPEC "\
-     %{fprofile-arcs|fprofile-generate*|coverage:-lgcov}\
-     %{!nostdlib:%{!nodefaultlibs:%(link_ssp) %(link_gcc_c_sequence)}}\
-+    %{!nostdlib++:}\
-     %{!nostdlib:%{!nostartfiles:%E}} %{T*} }}}}}}"
- #endif
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch b/meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch
deleted file mode 100644
index 1f478f3..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch
+++ /dev/null
@@ -1,465 +0,0 @@
-Upstream-Status: Pending
-
-Implements basic e5500 enablement in gcc, with a scheduler, -mcpu
-flag, etc...
-
-Also splits the masks for popcntb, popcntd, and cmpb. Originally those
-masks would also control other instructions that e5500 does not
-support (so, we either get none or all).
-
-For the lack of means to do tests, those instructions were never
-enabled until now. The new instructions enabled with this patch are:
-popcntb, popcntw, popcntd, bpermd, prtyw, prtyd, cmpb, ldbrx, and
-stdbrx.
-
-Signed-off-by: Edmar Wienskoski <edmar@freescale.com>
-Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
-
-Index: gcc-4_6-branch/gcc/config.gcc
-===================================================================
---- gcc-4_6-branch.orig/gcc/config.gcc
-+++ gcc-4_6-branch/gcc/config.gcc
-@@ -395,7 +395,7 @@ powerpc*-*-*)
- 	extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h"
- 	need_64bit_hwint=yes
- 	case x$with_cpu in
--	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell|xa2|xe500mc64)
-+	    xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[34567]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500)
- 		cpu_is_64bit=yes
- 		;;
- 	esac
-@@ -3493,7 +3493,7 @@ case "${target}" in
- 			| 401 | 403 | 405 | 405fp | 440 | 440fp | 464 | 464fp \
- 			| 476 | 476fp | 505 | 601 | 602 | 603 | 603e | ec603e \
- 			| 604 | 604e | 620 | 630 | 740 | 750 | 7400 | 7450 \
--			| a2 | e300c[23] | 854[08] | e500mc | e500mc64 | titan\
-+			| a2 | e300c[23] | 854[08] | e500mc | e500mc64 | e5500 | titan\
- 			| 801 | 821 | 823 | 860 | 970 | G3 | G4 | G5 | cell)
- 				# OK
- 				;;
-Index: gcc-4_6-branch/gcc/config/rs6000/e5500.md
-===================================================================
---- /dev/null
-+++ gcc-4_6-branch/gcc/config/rs6000/e5500.md
-@@ -0,0 +1,176 @@
-+;; Pipeline description for Freescale PowerPC e5500 core.
-+;;   Copyright (C) 2011 Free Software Foundation, Inc.
-+;;   Contributed by Edmar Wienskoski (edmar@freescale.com)
-+;;
-+;; 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 3, 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 COPYING3.  If not see
-+;; <http://www.gnu.org/licenses/>.
-+;;
-+;; e5500 64-bit SFX(2), CFX, LSU, FPU, BU
-+;; Max issue 3 insns/clock cycle (includes 1 branch)
-+
-+(define_automaton "e5500_most,e5500_long")
-+(define_cpu_unit "e5500_decode_0,e5500_decode_1" "e5500_most")
-+
-+;; SFX.
-+(define_cpu_unit "e5500_sfx_0,e5500_sfx_1" "e5500_most")
-+
-+;; CFX.
-+(define_cpu_unit "e5500_cfx_stage0,e5500_cfx_stage1" "e5500_most")
-+
-+;; Non-pipelined division.
-+(define_cpu_unit "e5500_cfx_div" "e5500_long")
-+
-+;; LSU.
-+(define_cpu_unit "e5500_lsu" "e5500_most")
-+
-+;; FPU.
-+(define_cpu_unit "e5500_fpu" "e5500_long")
-+
-+;; BU.
-+(define_cpu_unit "e5500_bu" "e5500_most")
-+
-+;; The following units are used to make the automata deterministic.
-+(define_cpu_unit "present_e5500_decode_0" "e5500_most")
-+(define_cpu_unit "present_e5500_sfx_0" "e5500_most")
-+(presence_set "present_e5500_decode_0" "e5500_decode_0")
-+(presence_set "present_e5500_sfx_0" "e5500_sfx_0")
-+
-+;; Some useful abbreviations.
-+(define_reservation "e5500_decode"
-+    "e5500_decode_0|e5500_decode_1+present_e5500_decode_0")
-+(define_reservation "e5500_sfx"
-+   "e5500_sfx_0|e5500_sfx_1+present_e5500_sfx_0")
-+
-+;; SFX.
-+(define_insn_reservation "e5500_sfx" 1
-+  (and (eq_attr "type" "integer,insert_word,insert_dword,delayed_compare,\
-+	shift,cntlz,exts")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_sfx")
-+
-+(define_insn_reservation "e5500_sfx2" 2
-+  (and (eq_attr "type" "cmp,compare,fast_compare,trap")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_sfx")
-+
-+(define_insn_reservation "e5500_delayed" 2
-+  (and (eq_attr "type" "var_shift_rotate,var_delayed_compare,popcnt")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_sfx*2")
-+
-+(define_insn_reservation "e5500_two" 2
-+  (and (eq_attr "type" "two")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_decode+e5500_sfx,e5500_sfx")
-+
-+(define_insn_reservation "e5500_three" 3
-+  (and (eq_attr "type" "three")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,(e5500_decode+e5500_sfx)*2,e5500_sfx")
-+
-+;; SFX - Mfcr.
-+(define_insn_reservation "e5500_mfcr" 4
-+  (and (eq_attr "type" "mfcr")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_sfx_0*4")
-+
-+;; SFX - Mtcrf.
-+(define_insn_reservation "e5500_mtcrf" 1
-+  (and (eq_attr "type" "mtcr")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_sfx_0")
-+
-+;; SFX - Mtjmpr.
-+(define_insn_reservation "e5500_mtjmpr" 1
-+  (and (eq_attr "type" "mtjmpr,mfjmpr")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_sfx")
-+
-+;; CFX - Multiply.
-+(define_insn_reservation "e5500_multiply" 4
-+  (and (eq_attr "type" "imul")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_cfx_stage0,e5500_cfx_stage1")
-+
-+(define_insn_reservation "e5500_multiply_i" 5
-+  (and (eq_attr "type" "imul2,imul3,imul_compare")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_cfx_stage0,\
-+   e5500_cfx_stage0+e5500_cfx_stage1,e5500_cfx_stage1")
-+
-+;; CFX - Divide.
-+(define_insn_reservation "e5500_divide" 16
-+  (and (eq_attr "type" "idiv")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_cfx_stage0+e5500_cfx_div,\
-+   e5500_cfx_div*15")
-+
-+(define_insn_reservation "e5500_divide_d" 26
-+  (and (eq_attr "type" "ldiv")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_cfx_stage0+e5500_cfx_div,\
-+   e5500_cfx_div*25")
-+
-+;; LSU - Loads.
-+(define_insn_reservation "e5500_load" 3
-+  (and (eq_attr "type" "load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u,\
-+			load_l,sync")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_lsu")
-+
-+(define_insn_reservation "e5500_fpload" 4
-+  (and (eq_attr "type" "fpload,fpload_ux,fpload_u")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_lsu")
-+
-+;; LSU - Stores.
-+(define_insn_reservation "e5500_store" 3
-+  (and (eq_attr "type" "store,store_ux,store_u,store_c")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_lsu")
-+
-+(define_insn_reservation "e5500_fpstore" 3
-+  (and (eq_attr "type" "fpstore,fpstore_ux,fpstore_u")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_lsu")
-+
-+;; FP.
-+(define_insn_reservation "e5500_float" 7
-+  (and (eq_attr "type" "fpsimple,fp,fpcompare,dmul")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_fpu")
-+
-+(define_insn_reservation "e5500_sdiv" 20
-+  (and (eq_attr "type" "sdiv")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_fpu*20")
-+
-+(define_insn_reservation "e5500_ddiv" 35
-+  (and (eq_attr "type" "ddiv")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_fpu*35")
-+
-+;; BU.
-+(define_insn_reservation "e5500_branch" 1
-+  (and (eq_attr "type" "jmpreg,branch,isync")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_bu")
-+
-+;; BU - CR logical.
-+(define_insn_reservation "e5500_cr_logical" 1
-+  (and (eq_attr "type" "cr_logical,delayed_cr")
-+       (eq_attr "cpu" "ppce5500"))
-+  "e5500_decode,e5500_bu")
-Index: gcc-4_6-branch/gcc/config/rs6000/rs6000-opts.h
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/rs6000/rs6000-opts.h
-+++ gcc-4_6-branch/gcc/config/rs6000/rs6000-opts.h
-@@ -53,6 +53,7 @@ enum processor_type
-    PROCESSOR_PPCE300C3,
-    PROCESSOR_PPCE500MC,
-    PROCESSOR_PPCE500MC64,
-+   PROCESSOR_PPCE5500,
-    PROCESSOR_POWER4,
-    PROCESSOR_POWER5,
-    PROCESSOR_POWER6,
-Index: gcc-4_6-branch/gcc/config/rs6000/rs6000.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/rs6000/rs6000.c
-+++ gcc-4_6-branch/gcc/config/rs6000/rs6000.c
-@@ -779,6 +779,25 @@ struct processor_costs ppce500mc64_cost 
-   1,			/* prefetch streams /*/
- };
- 
-+/* Instruction costs on PPCE5500 processors.  */
-+static const
-+struct processor_costs ppce5500_cost = {
-+  COSTS_N_INSNS (5),    /* mulsi */
-+  COSTS_N_INSNS (5),    /* mulsi_const */
-+  COSTS_N_INSNS (5),    /* mulsi_const9 */
-+  COSTS_N_INSNS (5),    /* muldi */
-+  COSTS_N_INSNS (14),   /* divsi */
-+  COSTS_N_INSNS (14),   /* divdi */
-+  COSTS_N_INSNS (7),    /* fp */
-+  COSTS_N_INSNS (10),   /* dmul */
-+  COSTS_N_INSNS (36),   /* sdiv */
-+  COSTS_N_INSNS (66),   /* ddiv */
-+  64,			/* cache line size */
-+  32,			/* l1 cache */
-+  128,			/* l2 cache */
-+  1,			/* prefetch streams /*/
-+};
-+
- /* Instruction costs on AppliedMicro Titan processors.  */
- static const
- struct processor_costs titan_cost = {
-@@ -1784,6 +1803,9 @@ static struct rs6000_ptt const processor
-    | MASK_ISEL},
-   {"e500mc64", PROCESSOR_PPCE500MC64, POWERPC_BASE_MASK | MASK_POWERPC64
-    | MASK_PPC_GFXOPT | MASK_ISEL},
-+  {"e5500", PROCESSOR_PPCE5500, POWERPC_BASE_MASK | MASK_POWERPC64
-+   | MASK_PPC_GFXOPT | MASK_ISEL | MASK_CMPB | MASK_POPCNTB
-+   | MASK_POPCNTD},
-   {"860", PROCESSOR_MPCCORE, POWERPC_BASE_MASK | MASK_SOFT_FLOAT},
-   {"970", PROCESSOR_POWER4,
-    POWERPC_7400_MASK | MASK_PPC_GPOPT | MASK_MFCRF | MASK_POWERPC64},
-@@ -2741,7 +2763,8 @@ rs6000_option_override_internal (bool gl
- 		   : PROCESSOR_DEFAULT));
- 
-   if (rs6000_cpu == PROCESSOR_PPCE300C2 || rs6000_cpu == PROCESSOR_PPCE300C3
--      || rs6000_cpu == PROCESSOR_PPCE500MC || rs6000_cpu == PROCESSOR_PPCE500MC64)
-+      || rs6000_cpu == PROCESSOR_PPCE500MC || rs6000_cpu == PROCESSOR_PPCE500MC64
-+      || rs6000_cpu == PROCESSOR_PPCE5500)
-     {
-       if (TARGET_ALTIVEC)
- 	error ("AltiVec not supported in this target");
-@@ -2842,9 +2865,14 @@ rs6000_option_override_internal (bool gl
-      user's opinion, though.  */
-   if (rs6000_block_move_inline_limit == 0
-       && (rs6000_cpu == PROCESSOR_PPCE500MC
--	  || rs6000_cpu == PROCESSOR_PPCE500MC64))
-+	  || rs6000_cpu == PROCESSOR_PPCE500MC64
-+	  || rs6000_cpu == PROCESSOR_PPCE5500))
-     rs6000_block_move_inline_limit = 128;
- 
-+  /* Those machines does not have fsqrt instruction */
-+  if (rs6000_cpu == PROCESSOR_PPCE5500)
-+    target_flags &= ~MASK_PPC_GPOPT;
-+
-   /* store_one_arg depends on expand_block_move to handle at least the
-      size of reg_parm_stack_space.  */
-   if (rs6000_block_move_inline_limit < (TARGET_POWERPC64 ? 64 : 32))
-@@ -2976,7 +3004,8 @@ rs6000_option_override_internal (bool gl
- #endif
- 
-   if (TARGET_E500 || rs6000_cpu == PROCESSOR_PPCE500MC
--      || rs6000_cpu == PROCESSOR_PPCE500MC64)
-+      || rs6000_cpu == PROCESSOR_PPCE500MC64
-+      || rs6000_cpu == PROCESSOR_PPCE5500)
-     {
-       /* The e500 and e500mc do not have string instructions, and we set
- 	 MASK_STRING above when optimizing for size.  */
-@@ -3023,7 +3052,8 @@ rs6000_option_override_internal (bool gl
- 				 || rs6000_cpu == PROCESSOR_POWER6
- 				 || rs6000_cpu == PROCESSOR_POWER7
- 				 || rs6000_cpu == PROCESSOR_PPCE500MC
--				 || rs6000_cpu == PROCESSOR_PPCE500MC64);
-+				 || rs6000_cpu == PROCESSOR_PPCE500MC64
-+				 || rs6000_cpu == PROCESSOR_PPCE5500);
- 
-   /* Allow debug switches to override the above settings.  These are set to -1
-      in rs6000.opt to indicate the user hasn't directly set the switch.  */
-@@ -3245,6 +3275,10 @@ rs6000_option_override_internal (bool gl
- 	rs6000_cost = &ppce500mc64_cost;
- 	break;
- 
-+      case PROCESSOR_PPCE5500:
-+	rs6000_cost = &ppce5500_cost;
-+	break;
-+
-       case PROCESSOR_TITAN:
- 	rs6000_cost = &titan_cost;
- 	break;
-@@ -23227,6 +23261,7 @@ rs6000_adjust_cost (rtx insn, rtx link, 
-                  || rs6000_cpu_attr == CPU_PPC750
-                  || rs6000_cpu_attr == CPU_PPC7400
-                  || rs6000_cpu_attr == CPU_PPC7450
-+                 || rs6000_cpu_attr == CPU_PPCE5500
-                  || rs6000_cpu_attr == CPU_POWER4
-                  || rs6000_cpu_attr == CPU_POWER5
- 		 || rs6000_cpu_attr == CPU_POWER7
-@@ -23771,6 +23806,7 @@ rs6000_issue_rate (void)
-   case CPU_PPCE300C3:
-   case CPU_PPCE500MC:
-   case CPU_PPCE500MC64:
-+  case CPU_PPCE5500:
-   case CPU_TITAN:
-     return 2;
-   case CPU_RIOS2:
-Index: gcc-4_6-branch/gcc/config/rs6000/rs6000.h
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/rs6000/rs6000.h
-+++ gcc-4_6-branch/gcc/config/rs6000/rs6000.h
-@@ -168,6 +168,7 @@
- %{mcpu=e300c3: -me300} \
- %{mcpu=e500mc: -me500mc} \
- %{mcpu=e500mc64: -me500mc64} \
-+%{mcpu=e5500: -me5500} \
- %{maltivec: -maltivec} \
- %{mvsx: -mvsx %{!maltivec: -maltivec} %{!mcpu*: %(asm_cpu_power7)}} \
- -many"
-@@ -477,13 +478,13 @@ extern int rs6000_vector_align[];
- 
- #define TARGET_FCTIDZ	TARGET_FCFID
- #define TARGET_STFIWX	TARGET_PPC_GFXOPT
--#define TARGET_LFIWAX	TARGET_CMPB
--#define TARGET_LFIWZX	TARGET_POPCNTD
--#define TARGET_FCFIDS	TARGET_POPCNTD
--#define TARGET_FCFIDU	TARGET_POPCNTD
--#define TARGET_FCFIDUS	TARGET_POPCNTD
--#define TARGET_FCTIDUZ	TARGET_POPCNTD
--#define TARGET_FCTIWUZ	TARGET_POPCNTD
-+#define TARGET_LFIWAX	(TARGET_CMPB && rs6000_cpu != PROCESSOR_PPCE5500)
-+#define TARGET_LFIWZX	(TARGET_POPCNTD && rs6000_cpu != PROCESSOR_PPCE5500)
-+#define TARGET_FCFIDS	TARGET_LFIWZX
-+#define TARGET_FCFIDU	TARGET_LFIWZX
-+#define TARGET_FCFIDUS	TARGET_LFIWZX
-+#define TARGET_FCTIDUZ	TARGET_LFIWZX
-+#define TARGET_FCTIWUZ	TARGET_LFIWZX
- 
- /* E500 processors only support plain "sync", not lwsync.  */
- #define TARGET_NO_LWSYNC TARGET_E500
-@@ -494,10 +495,12 @@ extern int rs6000_vector_align[];
- 
- #define TARGET_FRE	(TARGET_HARD_FLOAT && TARGET_FPRS \
- 			 && TARGET_DOUBLE_FLOAT \
--			 && (TARGET_POPCNTB || VECTOR_UNIT_VSX_P (DFmode)))
-+			 && (TARGET_POPCNTB || VECTOR_UNIT_VSX_P (DFmode)) \
-+			 && rs6000_cpu != PROCESSOR_PPCE5500)
- 
- #define TARGET_FRSQRTES	(TARGET_HARD_FLOAT && TARGET_POPCNTB \
--			 && TARGET_FPRS && TARGET_SINGLE_FLOAT)
-+			 && TARGET_FPRS && TARGET_SINGLE_FLOAT \
-+			 && rs6000_cpu != PROCESSOR_PPCE5500)
- 
- #define TARGET_FRSQRTE	(TARGET_HARD_FLOAT && TARGET_FPRS \
- 			 && TARGET_DOUBLE_FLOAT \
-Index: gcc-4_6-branch/gcc/config/rs6000/rs6000.md
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/rs6000/rs6000.md
-+++ gcc-4_6-branch/gcc/config/rs6000/rs6000.md
-@@ -126,7 +126,7 @@
- \f
- ;; Define an insn type attribute.  This is used in function unit delay
- ;; computations.
--(define_attr "type" "integer,two,three,load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u,store,store_ux,store_u,fpload,fpload_ux,fpload_u,fpstore,fpstore_ux,fpstore_u,vecload,vecstore,imul,imul2,imul3,lmul,idiv,ldiv,insert_word,branch,cmp,fast_compare,compare,var_delayed_compare,delayed_compare,imul_compare,lmul_compare,fpcompare,cr_logical,delayed_cr,mfcr,mfcrf,mtcr,mfjmpr,mtjmpr,fp,fpsimple,dmul,sdiv,ddiv,ssqrt,dsqrt,jmpreg,brinc,vecsimple,veccomplex,vecdiv,veccmp,veccmpsimple,vecperm,vecfloat,vecfdiv,isync,sync,load_l,store_c,shift,trap,insert_dword,var_shift_rotate,cntlz,exts,mffgpr,mftgpr,isel"
-+(define_attr "type" "integer,two,three,load,load_ext,load_ext_u,load_ext_ux,load_ux,load_u,store,store_ux,store_u,fpload,fpload_ux,fpload_u,fpstore,fpstore_ux,fpstore_u,vecload,vecstore,imul,imul2,imul3,lmul,idiv,ldiv,insert_word,branch,cmp,fast_compare,compare,var_delayed_compare,delayed_compare,imul_compare,lmul_compare,fpcompare,cr_logical,delayed_cr,mfcr,mfcrf,mtcr,mfjmpr,mtjmpr,fp,fpsimple,dmul,sdiv,ddiv,ssqrt,dsqrt,jmpreg,brinc,vecsimple,veccomplex,vecdiv,veccmp,veccmpsimple,vecperm,vecfloat,vecfdiv,isync,sync,load_l,store_c,shift,trap,insert_dword,var_shift_rotate,cntlz,exts,mffgpr,mftgpr,isel,popcnt"
-   (const_string "integer"))
- 
- ;; Define floating point instruction sub-types for use with Xfpu.md
-@@ -148,7 +148,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,ppc476,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,ppce300c2,ppce300c3,ppce500mc,ppce500mc64,power4,power5,power6,power7,cell,ppca2,titan"
-+(define_attr "cpu" "rios1,rios2,rs64a,mpccore,ppc403,ppc405,ppc440,ppc476,ppc601,ppc603,ppc604,ppc604e,ppc620,ppc630,ppc750,ppc7400,ppc7450,ppc8540,ppce300c2,ppce300c3,ppce500mc,ppce500mc64,ppce5500,power4,power5,power6,power7,cell,ppca2,titan"
-   (const (symbol_ref "rs6000_cpu_attr")))
- 
- 
-@@ -176,6 +176,7 @@
- (include "e300c2c3.md")
- (include "e500mc.md")
- (include "e500mc64.md")
-+(include "e5500.md")
- (include "power4.md")
- (include "power5.md")
- (include "power6.md")
-@@ -2302,13 +2303,17 @@
-         (unspec:GPR [(match_operand:GPR 1 "gpc_reg_operand" "r")]
-                      UNSPEC_POPCNTB))]
-   "TARGET_POPCNTB"
--  "popcntb %0,%1")
-+  "popcntb %0,%1"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "popcnt")])
- 
- (define_insn "popcntd<mode>2"
-   [(set (match_operand:GPR 0 "gpc_reg_operand" "=r")
- 	(popcount:GPR (match_operand:GPR 1 "gpc_reg_operand" "r")))]
-   "TARGET_POPCNTD"
--  "popcnt<wd> %0,%1")
-+  "popcnt<wd> %0,%1"
-+  [(set_attr "length" "4")
-+   (set_attr "type" "popcnt")])
- 
- (define_expand "popcount<mode>2"
-   [(set (match_operand:GPR 0 "gpc_reg_operand" "")
-@@ -5957,10 +5962,10 @@
-    && ((TARGET_PPC_GFXOPT
-         && !HONOR_NANS (<MODE>mode)
-         && !HONOR_SIGNED_ZEROS (<MODE>mode))
--       || TARGET_CMPB
-+       || TARGET_LFIWAX
-        || VECTOR_UNIT_VSX_P (<MODE>mode))"
- {
--  if (TARGET_CMPB || VECTOR_UNIT_VSX_P (<MODE>mode))
-+  if (TARGET_LFIWAX || VECTOR_UNIT_VSX_P (<MODE>mode))
-     {
-       emit_insn (gen_copysign<mode>3_fcpsgn (operands[0], operands[1],
- 					     operands[2]));
-@@ -5979,7 +5984,7 @@
- 	(unspec:SFDF [(match_operand:SFDF 1 "gpc_reg_operand" "<rreg2>")
- 		      (match_operand:SFDF 2 "gpc_reg_operand" "<rreg2>")]
- 		     UNSPEC_COPYSIGN))]
--  "TARGET_CMPB && !VECTOR_UNIT_VSX_P (<MODE>mode)"
-+  "TARGET_LFIWAX && !VECTOR_UNIT_VSX_P (<MODE>mode)"
-   "fcpsgn %0,%2,%1"
-   [(set_attr "type" "fp")])
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch b/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
deleted file mode 100644
index c0e3594..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Upstream-Status:Backport
-Hi,
-
-As suggested by richi.
-regtested on i686-linux-gnu with all default languages and no regressions.
-Ok for trunk?
-
-gcc/ChangeLog
-2010-03-15  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
-
-	PR target/32219
-	* varasm.c (default_binds_local_p_1): Weak data is not local.
-
-gcc/testsuite/ChangeLog
-2010-03-15  Bernhard Reutner-Fischer  <aldot@gcc.gnu.org>
-
-	PR target/32219
-	* gcc.dg/visibility-21.c: New test.
-
-Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
----
- gcc/testsuite/gcc.dg/visibility-21.c |   14 ++++++++++++++
- gcc/varasm.c                         |    8 ++++----
- 2 files changed, 18 insertions(+), 4 deletions(-)
- create mode 100644 gcc/testsuite/gcc.dg/visibility-21.c
-
-Index: gcc-4_6-branch/gcc/testsuite/gcc.dg/visibility-21.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc-4_6-branch/gcc/testsuite/gcc.dg/visibility-21.c	2011-10-18 17:11:33.224827436 -0700
-@@ -0,0 +1,14 @@
-+/* PR target/32219 */
-+/* { dg-do run } */
-+/* { dg-require-visibility "" } */
-+/* { dg-options "-fPIC" { target fpic } } */
-+
-+extern void f() __attribute__((weak,visibility("hidden")));
-+extern int puts( char const* );
-+int main()
-+{
-+	if (f)
-+		f();
-+	return 0;
-+}
-+
-Index: gcc-4_6-branch/gcc/varasm.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/varasm.c	2011-09-16 19:58:21.000000000 -0700
-+++ gcc-4_6-branch/gcc/varasm.c	2011-10-18 17:19:06.431074788 -0700
-@@ -6760,6 +6760,10 @@
-   /* Static variables are always local.  */
-   else if (! TREE_PUBLIC (exp))
-     local_p = true;
-+  /* hidden weak can't be overridden by something non-local, all
-+     that is possible is that it is not defined at all. */
-+  else if (DECL_WEAK (exp))
-+    local_p = false;
-   /* A variable is local if the user has said explicitly that it will
-      be.  */
-   else if ((DECL_VISIBILITY_SPECIFIED (exp)
-@@ -6773,11 +6777,6 @@
-      local.  */
-   else if (DECL_VISIBILITY (exp) != VISIBILITY_DEFAULT)
-     local_p = true;
--  /* Default visibility weak data can be overridden by a strong symbol
--     in another module and so are not local.  */
--  else if (DECL_WEAK (exp)
--	   && !resolved_locally)
--    local_p = false;
-   /* If PIC, then assume that any global name can be overridden by
-      symbols resolved from other modules.  */
-   else if (shlib)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch b/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
deleted file mode 100644
index 60b7012..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
+++ /dev/null
@@ -1,393 +0,0 @@
-Upstream-Status:Backport
-2011-09-19  chengbin  <bin.cheng@arm.com>
-
-	Backport r174035 from mainline
-	2011-05-22  Tom de Vries  <tom@codesourcery.com>
-
-	PR middle-end/48689
-	* fold-const.c (fold_checksum_tree): Guard TREE_CHAIN use with
-	CODE_CONTAINS_STRUCT (TS_COMMON).
-
-	Backport r172297 from mainline
-	2011-04-11  Chung-Lin Tang  <cltang@codesourcery.com>
-		Richard Earnshaw  <rearnsha@arm.com>
-
-	PR target/48250
-	* config/arm/arm.c (arm_legitimize_reload_address): Update cases
-	to use sign-magnitude offsets. Reject unsupported unaligned
-	cases. Add detailed description in comments.
-	* config/arm/arm.md (reload_outdf): Disable for ARM mode; change
-	condition from TARGET_32BIT to TARGET_ARM.
-
-	Backport r171978 from mainline
-	2011-04-05  Tom de Vries  <tom@codesourcery.com>
-
-	PR target/43920
-	* config/arm/arm.h (BRANCH_COST): Set to 1 for Thumb-2 when optimizing
-	for size.
-
-	Backport r171632 from mainline
-	2011-03-28  Richard Sandiford  <richard.sandiford@linaro.org>
-
-	* builtins.c (expand_builtin_memset_args): Use gen_int_mode
-	instead of GEN_INT.
-
-	Backport r171379 from mainline
-	2011-03-23  Chung-Lin Tang  <cltang@codesourcery.com>
-
-	PR target/46934
-	* config/arm/arm.md (casesi): Use the gen_int_mode() function
-	to subtract lower bound instead of GEN_INT().
-
-	Backport r171251 from mainline 
-	2011-03-21  Daniel Jacobowitz  <dan@codesourcery.com>
-
-	* config/arm/unwind-arm.c (__gnu_unwind_pr_common): Correct test
-	for barrier handlers.
-
-	Backport r171096 from mainline
-	2011-03-17  Chung-Lin Tang  <cltang@codesourcery.com>
-
-	PR target/43872
-	* config/arm/arm.c (arm_get_frame_offsets): Adjust early
-	return condition with !cfun->calls_alloca.
-
-Index: gcc-4_6-branch/gcc/builtins.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/builtins.c	2011-10-17 17:45:32.050502963 -0700
-+++ gcc-4_6-branch/gcc/builtins.c	2011-10-17 17:46:11.154696878 -0700
-@@ -3972,6 +3972,7 @@
- {
-   tree fndecl, fn;
-   enum built_in_function fcode;
-+  enum machine_mode val_mode;
-   char c;
-   unsigned int dest_align;
-   rtx dest_mem, dest_addr, len_rtx;
-@@ -4006,14 +4007,14 @@
- 
-   len_rtx = expand_normal (len);
-   dest_mem = get_memory_rtx (dest, len);
-+  val_mode = TYPE_MODE (unsigned_char_type_node);
- 
-   if (TREE_CODE (val) != INTEGER_CST)
-     {
-       rtx val_rtx;
- 
-       val_rtx = expand_normal (val);
--      val_rtx = convert_to_mode (TYPE_MODE (unsigned_char_type_node),
--				 val_rtx, 0);
-+      val_rtx = convert_to_mode (val_mode, val_rtx, 0);
- 
-       /* Assume that we can memset by pieces if we can store
-        * the coefficients by pieces (in the required modes).
-@@ -4024,8 +4025,7 @@
- 				  builtin_memset_read_str, &c, dest_align,
- 				  true))
- 	{
--	  val_rtx = force_reg (TYPE_MODE (unsigned_char_type_node),
--			       val_rtx);
-+	  val_rtx = force_reg (val_mode, val_rtx);
- 	  store_by_pieces (dest_mem, tree_low_cst (len, 1),
- 			   builtin_memset_gen_str, val_rtx, dest_align,
- 			   true, 0);
-@@ -4051,7 +4051,8 @@
- 				  true))
- 	store_by_pieces (dest_mem, tree_low_cst (len, 1),
- 			 builtin_memset_read_str, &c, dest_align, true, 0);
--      else if (!set_storage_via_setmem (dest_mem, len_rtx, GEN_INT (c),
-+      else if (!set_storage_via_setmem (dest_mem, len_rtx,
-+					gen_int_mode (c, val_mode),
- 					dest_align, expected_align,
- 					expected_size))
- 	goto do_libcall;
-Index: gcc-4_6-branch/gcc/config/arm/arm.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/arm/arm.c	2011-10-17 17:45:41.914551883 -0700
-+++ gcc-4_6-branch/gcc/config/arm/arm.c	2011-10-17 17:48:35.447412371 -0700
-@@ -6406,23 +6406,126 @@
-       HOST_WIDE_INT val = INTVAL (XEXP (*p, 1));
-       HOST_WIDE_INT low, high;
- 
--      if (mode == DImode || (mode == DFmode && TARGET_SOFT_FLOAT))
--	low = ((val & 0xf) ^ 0x8) - 0x8;
--      else if (TARGET_MAVERICK && TARGET_HARD_FLOAT)
--	/* Need to be careful, -256 is not a valid offset.  */
--	low = val >= 0 ? (val & 0xff) : -((-val) & 0xff);
--      else if (mode == SImode
--	       || (mode == SFmode && TARGET_SOFT_FLOAT)
--	       || ((mode == HImode || mode == QImode) && ! arm_arch4))
--	/* Need to be careful, -4096 is not a valid offset.  */
--	low = val >= 0 ? (val & 0xfff) : -((-val) & 0xfff);
--      else if ((mode == HImode || mode == QImode) && arm_arch4)
--	/* Need to be careful, -256 is not a valid offset.  */
--	low = val >= 0 ? (val & 0xff) : -((-val) & 0xff);
--      else if (GET_MODE_CLASS (mode) == MODE_FLOAT
--	       && TARGET_HARD_FLOAT && TARGET_FPA)
--	/* Need to be careful, -1024 is not a valid offset.  */
--	low = val >= 0 ? (val & 0x3ff) : -((-val) & 0x3ff);
-+      /* Detect coprocessor load/stores.  */
-+      bool coproc_p = ((TARGET_HARD_FLOAT
-+			&& (TARGET_VFP || TARGET_FPA || TARGET_MAVERICK)
-+			&& (mode == SFmode || mode == DFmode
-+			    || (mode == DImode && TARGET_MAVERICK)))
-+		       || (TARGET_REALLY_IWMMXT
-+			   && VALID_IWMMXT_REG_MODE (mode))
-+		       || (TARGET_NEON
-+			   && (VALID_NEON_DREG_MODE (mode)
-+			       || VALID_NEON_QREG_MODE (mode))));
-+
-+      /* For some conditions, bail out when lower two bits are unaligned.  */
-+      if ((val & 0x3) != 0
-+	  /* Coprocessor load/store indexes are 8-bits + '00' appended.  */
-+	  && (coproc_p
-+	      /* For DI, and DF under soft-float: */
-+	      || ((mode == DImode || mode == DFmode)
-+		  /* Without ldrd, we use stm/ldm, which does not
-+		     fair well with unaligned bits.  */
-+		  && (! TARGET_LDRD
-+		      /* Thumb-2 ldrd/strd is [-1020,+1020] in steps of 4.  */
-+		      || TARGET_THUMB2))))
-+	return false;
-+
-+      /* When breaking down a [reg+index] reload address into [(reg+high)+low],
-+	 of which the (reg+high) gets turned into a reload add insn,
-+	 we try to decompose the index into high/low values that can often
-+	 also lead to better reload CSE.
-+	 For example:
-+	         ldr r0, [r2, #4100]  // Offset too large
-+		 ldr r1, [r2, #4104]  // Offset too large
-+
-+	 is best reloaded as:
-+	         add t1, r2, #4096
-+		 ldr r0, [t1, #4]
-+		 add t2, r2, #4096
-+		 ldr r1, [t2, #8]
-+
-+	 which post-reload CSE can simplify in most cases to eliminate the
-+	 second add instruction:
-+	         add t1, r2, #4096
-+		 ldr r0, [t1, #4]
-+		 ldr r1, [t1, #8]
-+
-+	 The idea here is that we want to split out the bits of the constant
-+	 as a mask, rather than as subtracting the maximum offset that the
-+	 respective type of load/store used can handle.
-+
-+	 When encountering negative offsets, we can still utilize it even if
-+	 the overall offset is positive; sometimes this may lead to an immediate
-+	 that can be constructed with fewer instructions.
-+	 For example:
-+	         ldr r0, [r2, #0x3FFFFC]
-+
-+	 This is best reloaded as:
-+	         add t1, r2, #0x400000
-+		 ldr r0, [t1, #-4]
-+
-+	 The trick for spotting this for a load insn with N bits of offset
-+	 (i.e. bits N-1:0) is to look at bit N; if it is set, then chose a
-+	 negative offset that is going to make bit N and all the bits below
-+	 it become zero in the remainder part.
-+
-+	 The SIGN_MAG_LOW_ADDR_BITS macro below implements this, with respect
-+	 to sign-magnitude addressing (i.e. separate +- bit, or 1's complement),
-+	 used in most cases of ARM load/store instructions.  */
-+
-+#define SIGN_MAG_LOW_ADDR_BITS(VAL, N)					\
-+      (((VAL) & ((1 << (N)) - 1))					\
-+       ? (((VAL) & ((1 << ((N) + 1)) - 1)) ^ (1 << (N))) - (1 << (N))	\
-+       : 0)
-+
-+      if (coproc_p)
-+	low = SIGN_MAG_LOW_ADDR_BITS (val, 10);
-+      else if (GET_MODE_SIZE (mode) == 8)
-+	{
-+	  if (TARGET_LDRD)
-+	    low = (TARGET_THUMB2
-+		   ? SIGN_MAG_LOW_ADDR_BITS (val, 10)
-+		   : SIGN_MAG_LOW_ADDR_BITS (val, 8));
-+	  else
-+	    /* For pre-ARMv5TE (without ldrd), we use ldm/stm(db/da/ib)
-+	       to access doublewords. The supported load/store offsets are
-+	       -8, -4, and 4, which we try to produce here.  */
-+	    low = ((val & 0xf) ^ 0x8) - 0x8;
-+	}
-+      else if (GET_MODE_SIZE (mode) < 8)
-+	{
-+	  /* NEON element load/stores do not have an offset.  */
-+	  if (TARGET_NEON_FP16 && mode == HFmode)
-+	    return false;
-+
-+	  if (TARGET_THUMB2)
-+	    {
-+	      /* Thumb-2 has an asymmetrical index range of (-256,4096).
-+		 Try the wider 12-bit range first, and re-try if the result
-+		 is out of range.  */
-+	      low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
-+	      if (low < -255)
-+		low = SIGN_MAG_LOW_ADDR_BITS (val, 8);
-+	    }
-+	  else
-+	    {
-+	      if (mode == HImode || mode == HFmode)
-+		{
-+		  if (arm_arch4)
-+		    low = SIGN_MAG_LOW_ADDR_BITS (val, 8);
-+		  else
-+		    {
-+		      /* The storehi/movhi_bytes fallbacks can use only
-+			 [-4094,+4094] of the full ldrb/strb index range.  */
-+		      low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
-+		      if (low == 4095 || low == -4095)
-+			return false;
-+		    }
-+		}
-+	      else
-+		low = SIGN_MAG_LOW_ADDR_BITS (val, 12);
-+	    }
-+	}
-       else
- 	return false;
- 
-@@ -15415,7 +15518,10 @@
-   offsets->soft_frame = offsets->saved_regs + CALLER_INTERWORKING_SLOT_SIZE;
-   /* A leaf function does not need any stack alignment if it has nothing
-      on the stack.  */
--  if (leaf && frame_size == 0)
-+  if (leaf && frame_size == 0
-+      /* However if it calls alloca(), we have a dynamically allocated
-+	 block of BIGGEST_ALIGNMENT on stack, so still do stack alignment.  */
-+      && ! cfun->calls_alloca)
-     {
-       offsets->outgoing_args = offsets->soft_frame;
-       offsets->locals_base = offsets->soft_frame;
-Index: gcc-4_6-branch/gcc/config/arm/arm.h
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/arm/arm.h	2011-10-17 17:45:41.910551858 -0700
-+++ gcc-4_6-branch/gcc/config/arm/arm.h	2011-10-17 17:48:35.447412371 -0700
-@@ -2041,7 +2041,8 @@
- /* Try to generate sequences that don't involve branches, we can then use
-    conditional instructions */
- #define BRANCH_COST(speed_p, predictable_p) \
--  (TARGET_32BIT ? 4 : (optimize > 0 ? 2 : 0))
-+  (TARGET_32BIT ? (TARGET_THUMB2 && !speed_p ? 1 : 4) \
-+		: (optimize > 0 ? 2 : 0))
- \f
- /* Position Independent Code.  */
- /* We decide which register to use based on the compilation options and
-Index: gcc-4_6-branch/gcc/config/arm/arm.md
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/arm/arm.md	2011-10-17 17:46:11.002696119 -0700
-+++ gcc-4_6-branch/gcc/config/arm/arm.md	2011-10-17 17:46:11.202697111 -0700
-@@ -6187,7 +6187,7 @@
-   [(match_operand:DF 0 "arm_reload_memory_operand" "=o")
-    (match_operand:DF 1 "s_register_operand" "r")
-    (match_operand:SI 2 "s_register_operand" "=&r")]
--  "TARGET_32BIT"
-+  "TARGET_THUMB2"
-   "
-   {
-     enum rtx_code code = GET_CODE (XEXP (operands[0], 0));
-@@ -8359,7 +8359,8 @@
- 	rtx reg = gen_reg_rtx (SImode);
- 
- 	emit_insn (gen_addsi3 (reg, operands[0],
--			       GEN_INT (-INTVAL (operands[1]))));
-+			       gen_int_mode (-INTVAL (operands[1]),
-+			       		     SImode)));
- 	operands[0] = reg;
-       }
- 
-Index: gcc-4_6-branch/gcc/config/arm/unwind-arm.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/config/arm/unwind-arm.c	2011-10-17 17:45:41.390549278 -0700
-+++ gcc-4_6-branch/gcc/config/arm/unwind-arm.c	2011-10-17 17:46:11.000000000 -0700
-@@ -1196,8 +1196,6 @@
- 		  ucbp->barrier_cache.bitpattern[4] = (_uw) &data[1];
- 
- 		  if (data[0] & uint32_highbit)
--		    phase2_call_unexpected_after_unwind = 1;
--		  else
- 		    {
- 		      data += rtti_count + 1;
- 		      /* Setup for entry to the handler.  */
-@@ -1207,6 +1205,8 @@
- 		      _Unwind_SetGR (context, 0, (_uw) ucbp);
- 		      return _URC_INSTALL_CONTEXT;
- 		    }
-+		  else
-+		    phase2_call_unexpected_after_unwind = 1;
- 		}
- 	      if (data[0] & uint32_highbit)
- 		data++;
-Index: gcc-4_6-branch/gcc/fold-const.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/fold-const.c	2011-10-17 17:45:32.050502963 -0700
-+++ gcc-4_6-branch/gcc/fold-const.c	2011-10-17 17:46:11.178696990 -0700
-@@ -13788,7 +13788,8 @@
-   if (TREE_CODE_CLASS (code) != tcc_type
-       && TREE_CODE_CLASS (code) != tcc_declaration
-       && code != TREE_LIST
--      && code != SSA_NAME)
-+      && code != SSA_NAME
-+      && CODE_CONTAINS_STRUCT (code, TS_COMMON))
-     fold_checksum_tree (TREE_CHAIN (expr), ctx, ht);
-   switch (TREE_CODE_CLASS (code))
-     {
-Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr40887.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr40887.c	2011-06-24 08:13:47.000000000 -0700
-+++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr40887.c	2011-10-17 17:46:11.182697014 -0700
-@@ -1,5 +1,6 @@
- /* { dg-options "-O2 -march=armv5te" }  */
- /* { dg-final { scan-assembler "blx" } } */
-+/* { dg-prune-output "switch .* conflicts with" } */
- 
- int (*indirect_func)();
- 
-Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr42575.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr42575.c	2011-06-24 08:13:47.000000000 -0700
-+++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr42575.c	2011-10-17 17:46:11.182697014 -0700
-@@ -1,4 +1,4 @@
--/* { dg-options "-O2 -march=armv7-a" }  */
-+/* { dg-options "-O2" }  */
- /* Make sure RA does good job allocating registers and avoids
-    unnecessary moves.  */
- /* { dg-final { scan-assembler-not "mov" } } */
-Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr43698.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr43698.c	2011-06-24 08:13:47.000000000 -0700
-+++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr43698.c	2011-10-17 17:46:11.182697014 -0700
-@@ -1,5 +1,5 @@
- /* { dg-do run } */
--/* { dg-options "-Os -march=armv7-a" } */
-+/* { dg-options "-Os" } */
- #include <stdint.h>
- #include <stdlib.h>
- 
-Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr44788.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/pr44788.c	2011-06-24 08:13:47.000000000 -0700
-+++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/pr44788.c	2011-10-17 17:46:11.182697014 -0700
-@@ -1,6 +1,6 @@
- /* { dg-do compile } */
- /* { dg-require-effective-target arm_thumb2_ok } */
--/* { dg-options "-Os -fno-strict-aliasing -fPIC -mthumb -march=armv7-a -mfpu=vfp3 -mfloat-abi=softfp" } */
-+/* { dg-options "-Os -fno-strict-aliasing -fPIC -mthumb -mfpu=vfp3 -mfloat-abi=softfp" } */
- 
- void joint_decode(float* mlt_buffer1, int t) {
-     int i;
-Index: gcc-4_6-branch/gcc/testsuite/gcc.target/arm/sync-1.c
-===================================================================
---- gcc-4_6-branch.orig/gcc/testsuite/gcc.target/arm/sync-1.c	2011-06-24 08:13:47.000000000 -0700
-+++ gcc-4_6-branch/gcc/testsuite/gcc.target/arm/sync-1.c	2011-10-17 17:46:11.182697014 -0700
-@@ -1,5 +1,6 @@
--/* { dg-do run } */
--/* { dg-options "-O2 -march=armv7-a" } */
-+
-+/* { dg-do run { target sync_int_long } } */
-+/* { dg-options "-O2" } */
- 
- volatile int mem;
- 
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch b/meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch
deleted file mode 100644
index 2c6bcda..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Upstream-Status:Backport
-2011-02-02  Richard Sandiford  <richard.sandiford@linaro.org>
-
-	gcc/
-	PR target/47551
-	* config/arm/arm.c (coproc_secondary_reload_class): Handle
-	structure modes.  Don't check neon_vector_mem_operand for
-	vector or structure modes.
-
-	gcc/testsuite/
-	PR target/47551
-	* gcc.target/arm/neon-modes-2.c: New test.
-
-=== modified file 'gcc/config/arm/arm.c'
---- old/gcc/config/arm/arm.c	2011-02-21 14:04:51 +0000
-+++ new/gcc/config/arm/arm.c	2011-03-02 11:38:43 +0000
-@@ -9139,11 +9139,14 @@
-       return GENERAL_REGS;
-     }
- 
-+  /* The neon move patterns handle all legitimate vector and struct
-+     addresses.  */
-   if (TARGET_NEON
-+      && MEM_P (x)
-       && (GET_MODE_CLASS (mode) == MODE_VECTOR_INT
--          || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT)
--      && neon_vector_mem_operand (x, 0))
--     return NO_REGS;
-+	  || GET_MODE_CLASS (mode) == MODE_VECTOR_FLOAT
-+	  || VALID_NEON_STRUCT_MODE (mode)))
-+    return NO_REGS;
- 
-   if (arm_coproc_mem_operand (x, wb) || s_register_operand (x, mode))
-     return NO_REGS;
-
-=== added file 'gcc/testsuite/gcc.target/arm/neon-modes-2.c'
---- old/gcc/testsuite/gcc.target/arm/neon-modes-2.c	1970-01-01 00:00:00 +0000
-+++ new/gcc/testsuite/gcc.target/arm/neon-modes-2.c	2011-02-02 10:02:45 +0000
-@@ -0,0 +1,24 @@
-+/* { dg-do compile } */
-+/* { dg-require-effective-target arm_neon_ok } */
-+/* { dg-options "-O1" } */
-+/* { dg-add-options arm_neon } */
-+
-+#include "arm_neon.h"
-+
-+#define SETUP(A) x##A = vld3_u32 (ptr + A * 0x20)
-+#define MODIFY(A) x##A = vld3_lane_u32 (ptr + A * 0x20 + 0x10, x##A, 1)
-+#define STORE(A) vst3_u32 (ptr + A * 0x20, x##A)
-+
-+#define MANY(A) A (0), A (1), A (2), A (3), A (4), A (5)
-+
-+void
-+bar (uint32_t *ptr, int y)
-+{
-+  uint32x2x3_t MANY (SETUP);
-+  int *x = __builtin_alloca (y);
-+  int z[0x1000];
-+  foo (x, z);
-+  MANY (MODIFY);
-+  foo (x, z);
-+  MANY (STORE);
-+}
-
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch b/meta/recipes-devtools/gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch
deleted file mode 100644
index b4351ee..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Upstream-Status: Pending
-
-Use the defaults.h in ${B} instead of ${S}, and t-oe in ${B}, so that
-the source can be shared between gcc-cross-initial,
-gcc-cross-intermediate, gcc-cross, gcc-runtime, and also the sdk build.
----
- gcc/Makefile.in  |    2 +-
- gcc/configure    |    4 ++--
- gcc/configure.ac |    4 ++--
- gcc/mkconfig.sh  |    4 ++--
- 4 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/gcc/Makefile.in b/gcc/Makefile.in
-index 7790915..3a0c34a 100644
---- a/gcc/Makefile.in
-+++ b/gcc/Makefile.in
-@@ -463,7 +463,7 @@ LIMITS_H_TEST = [ -f $(SYSTEM_HEADER_DIR)/limits.h ]
- TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
- 
- xmake_file=@xmake_file@
--tmake_file=@tmake_file@
-+tmake_file=@tmake_file@ ./t-oe
- TM_ENDIAN_CONFIG=@TM_ENDIAN_CONFIG@
- TM_MULTILIB_CONFIG=@TM_MULTILIB_CONFIG@
- TM_MULTILIB_EXCEPTIONS_CONFIG=@TM_MULTILIB_EXCEPTIONS_CONFIG@
-diff --git a/gcc/configure b/gcc/configure
-index 82fa3e4..d4711b5 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -11227,8 +11227,8 @@ for f in $tm_file; do
-        tm_include_list="${tm_include_list} $f"
-        ;;
-     defaults.h )
--       tm_file_list="${tm_file_list} \$(srcdir)/$f"
--       tm_include_list="${tm_include_list} $f"
-+       tm_file_list="${tm_file_list} ./$f"
-+       tm_include_list="${tm_include_list} ./$f"
-        ;;
-     * )
-        tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
-diff --git a/gcc/configure.ac b/gcc/configure.ac
-index 844d8da..a960343 100644
---- a/gcc/configure.ac
-+++ b/gcc/configure.ac
-@@ -1628,8 +1628,8 @@ for f in $tm_file; do
-        tm_include_list="${tm_include_list} $f"
-        ;;
-     defaults.h )
--       tm_file_list="${tm_file_list} \$(srcdir)/$f"
--       tm_include_list="${tm_include_list} $f"
-+       tm_file_list="${tm_file_list} ./$f"
-+       tm_include_list="${tm_include_list} ./$f"
-        ;;
-     * )
-        tm_file_list="${tm_file_list} \$(srcdir)/config/$f"
-diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
-index d56df8c..875d0f1 100644
---- a/gcc/mkconfig.sh
-+++ b/gcc/mkconfig.sh
-@@ -77,7 +77,7 @@ if [ -n "$HEADERS" ]; then
-     if [ $# -ge 1 ]; then
- 	echo '#ifdef IN_GCC' >> ${output}T
- 	for file in "$@"; do
--	    if test x"$file" = x"defaults.h"; then
-+	    if test x"$file" = x"./defaults.h"; then
- 		postpone_defaults_h="yes"
- 	    else
- 		echo "# include \"$file\"" >> ${output}T
-@@ -103,7 +103,7 @@ esac
- 
- # If we postponed including defaults.h, add the #include now.
- if test x"$postpone_defaults_h" = x"yes"; then
--    echo "# include \"defaults.h\"" >> ${output}T
-+    echo "# include \"./defaults.h\"" >> ${output}T
- fi
- 
- # Add multiple inclusion protection guard, part two.
--- 
-1.7.1
-
diff --git a/meta/recipes-devtools/gcc/gcc-4.6/zecke-xgcc-cpp.patch b/meta/recipes-devtools/gcc/gcc-4.6/zecke-xgcc-cpp.patch
deleted file mode 100644
index 6192c48..0000000
--- a/meta/recipes-devtools/gcc/gcc-4.6/zecke-xgcc-cpp.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-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.
-
-Index: gcc-4.6.0/Makefile.in
-===================================================================
---- gcc-4.6.0.orig/Makefile.in
-+++ gcc-4.6.0/Makefile.in
-@@ -270,6 +270,7 @@ BASE_TARGET_EXPORTS = \
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
-+	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
-Index: gcc-4.6.0/Makefile.tpl
-===================================================================
---- gcc-4.6.0.orig/Makefile.tpl
-+++ gcc-4.6.0/Makefile.tpl
-@@ -273,6 +273,7 @@ BASE_TARGET_EXPORTS = \
- 	AR="$(AR_FOR_TARGET)"; export AR; \
- 	AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
- 	CC="$(CC_FOR_TARGET) $(XGCC_FLAGS_FOR_TARGET) $$TFLAGS"; export CC; \
-+	CPP="$(CC_FOR_TARGET) -E"; export CPP; \
- 	CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
- 	CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
deleted file mode 100644
index c32a2b6..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-inherit cross-canadian
-
-require recipes-devtools/gcc/gcc-${PV}.inc
-require gcc-cross-canadian.inc
-require gcc-configure-sdk.inc
-require gcc-package-sdk.inc
-
-DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
-RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
-
-SYSTEMHEADERS = "/usr/include"
-SYSTEMLIBS = "/lib/"
-SYSTEMLIBS1 = "/usr/lib/"
-
-EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
-		--disable-libgomp --disable-libmudflap \
-		--with-mpfr=${STAGING_DIR_HOST}${layout_exec_prefix} \
-		--with-mpc=${STAGING_DIR_HOST}${layout_exec_prefix}"
-
-# to find libmpfr
-# export LD_LIBRARY_PATH = "{STAGING_DIR_HOST}${layout_exec_prefix}"
-
-PARALLEL_MAKE = ""
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb
deleted file mode 100644
index 4c73e5c..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require recipes-devtools/gcc/gcc-cross_${PV}.bb
-require gcc-cross-initial.inc
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.6.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.6.bb
deleted file mode 100644
index 69ae7f7..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_4.6.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require recipes-devtools/gcc/gcc-cross_${PV}.bb
-require gcc-cross-intermediate.inc
-
diff --git a/meta/recipes-devtools/gcc/gcc-cross_4.6.bb b/meta/recipes-devtools/gcc/gcc-cross_4.6.bb
deleted file mode 100644
index 75679d1..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross_4.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require recipes-devtools/gcc/gcc-${PV}.inc
-require gcc-cross4.inc
-
-EXTRA_OECONF += "--disable-libunwind-exceptions \
-                 --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} \
-                 --with-system-zlib "
-
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.bb
deleted file mode 100644
index a499883..0000000
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require recipes-devtools/gcc/gcc-cross-initial_${PV}.bb
-require gcc-crosssdk-initial.inc
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.bb b/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.bb
deleted file mode 100644
index 3820cb6..0000000
--- a/meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require recipes-devtools/gcc/gcc-cross-intermediate_${PV}.bb
-require gcc-crosssdk-intermediate.inc
-EXTRA_OECONF += " --with-headers=${STAGING_DIR_TCBOOTSTRAP}${SYSTEMHEADERS} "
diff --git a/meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb b/meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb
deleted file mode 100644
index 40a6c4f..0000000
--- a/meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb
+++ /dev/null
@@ -1,2 +0,0 @@
-require recipes-devtools/gcc/gcc-cross_${PV}.bb
-require gcc-crosssdk.inc
diff --git a/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb b/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
deleted file mode 100644
index fbaf057..0000000
--- a/meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require recipes-devtools/gcc/gcc-${PV}.inc
-require gcc-configure-runtime.inc
-require gcc-package-runtime.inc
-
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
-
-EXTRA_OECONF += "--disable-libunwind-exceptions"
-EXTRA_OECONF_append_linuxstdbase = " --enable-clocale=gnu"
diff --git a/meta/recipes-devtools/gcc/gcc_4.6.bb b/meta/recipes-devtools/gcc/gcc_4.6.bb
deleted file mode 100644
index 9954375..0000000
--- a/meta/recipes-devtools/gcc/gcc_4.6.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-require recipes-devtools/gcc/gcc-${PV}.inc
-require gcc-configure-target.inc
-require gcc-package-target.inc
-
-ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
deleted file mode 100644
index 8529755..0000000
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ /dev/null
@@ -1,71 +0,0 @@
-require recipes-devtools/gcc/gcc-${PV}.inc
-
-INHIBIT_DEFAULT_DEPS = "1"
-
-DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
-
-PKGSUFFIX = ""
-PKGSUFFIX_virtclass-nativesdk = "-nativesdk"
-
-PACKAGES = "\
-  ${PN} \
-  ${PN}-dev \
-  ${PN}-dbg \
-  libgcov${PKGSUFFIX}-dev \
-  "
-
-FILES_${PN} = "${base_libdir}/libgcc*.so.*"
-FILES_${PN}-dev = " \
-  ${base_libdir}/libgcc*.so \
-  ${libdir}/${TARGET_SYS}/${BINV}/*crt* \
-  ${libdir}/${TARGET_SYS}/${BINV}/libgcc*"
-FILES_libgcov${PKGSUFFIX}-dev = " \
-  ${libdir}/${TARGET_SYS}/${BINV}/libgcov.a \
-  "
-FILES_${PN}-dbg += "${base_libdir}/.debug/"
-
-do_configure () {
-	target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##`
-	install -d ${D}${base_libdir} ${D}${libdir}
-	cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${B}
-	mkdir -p ${B}/${BPN}
-	cd ${B}/${BPN}
-	chmod a+x ${S}/${BPN}/configure
-	${S}/${BPN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
-}
-
-do_compile () {
-	target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
-	cd ${B}/${BPN}
-	oe_runmake MULTIBUILDTOP=${B}/$target/${BPN}/
-}
-
-do_install () {
-	target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
-	cd ${B}/${BPN}
-	oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${BPN}/ install
-
-	# Move libgcc_s into /lib
-	mkdir -p ${D}${base_libdir}
-	if [ -f ${D}${libdir}/nof/libgcc_s.so ]; then
-		mv ${D}${libdir}/nof/libgcc* ${D}${base_libdir}
-	else
-		mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
-	fi
-
-	# install the runtime in /usr/lib/ not in /usr/lib/gcc on target
-	# so that cross-gcc can find it in the sysroot
-
-	mv ${D}${libdir}/gcc/* ${D}${libdir}
-	rm -rf ${D}${libdir}/gcc/
-}
-
-do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package"
-do_package_write_deb[depends] += "virtual/${MLPREFIX}libc:do_package"
-do_package_write_rpm[depends] += "virtual/${MLPREFIX}libc:do_package"
-
-BBCLASSEXTEND = "nativesdk"
-
-INSANE_SKIP_${PN}-dev = "staticdev"
-INSANE_SKIP_libgcov${PKGSUFFIX}-dev = "staticdev"
-
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 06/17] eglibc-2.13: Retire into toolchain layer
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (4 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 05/17] gcc-4.6: Retire into toochain-layer Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 07/17] gcc: Remove csl gcc recipes Saul Wold
                   ` (12 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Khem Raj <raj.khem@gmail.com>

If anyone wants it add toolchain-layer from meta-openembedded
repo to your setup

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../eglibc/cross-localedef-native_2.13.bb          |   43 --
 .../eglibc/eglibc-2.13/IO-acquire-lock-fix.patch   |   17 -
 .../eglibc-2.13/armv4-eabi-compile-fix.patch       |   25 -
 .../eglibc-svn-arm-lowlevellock-include-tls.patch  |   21 -
 .../eglibc/eglibc-2.13/generate-supported.mk       |   11 -
 .../eglibc/eglibc-2.13/ld-search-order.patch       |   56 --
 .../eglibc/eglibc-2.13/mips-rld-map-check.patch    |   26 -
 .../eglibc/eglibc-2.13/multilib_readlib.patch      |   17 -
 .../recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch |  538 --------------------
 .../eglibc/eglibc-2.13/stack-protector-test.patch  |   35 --
 .../eglibc-2.13/use-sysroot-cxx-headers.patch      |   36 --
 meta/recipes-core/eglibc/eglibc-initial_2.13.bb    |    6 -
 meta/recipes-core/eglibc/eglibc-locale_2.13.bb     |    1 -
 meta/recipes-core/eglibc/eglibc_2.13.bb            |  218 --------
 14 files changed, 0 insertions(+), 1050 deletions(-)
 delete mode 100644 meta/recipes-core/eglibc/cross-localedef-native_2.13.bb
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/multilib_readlib.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/use-sysroot-cxx-headers.patch
 delete mode 100644 meta/recipes-core/eglibc/eglibc-initial_2.13.bb
 delete mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb
 delete mode 100644 meta/recipes-core/eglibc/eglibc_2.13.bb

diff --git a/meta/recipes-core/eglibc/cross-localedef-native_2.13.bb b/meta/recipes-core/eglibc/cross-localedef-native_2.13.bb
deleted file mode 100644
index 52759af..0000000
--- a/meta/recipes-core/eglibc/cross-localedef-native_2.13.bb
+++ /dev/null
@@ -1,43 +0,0 @@
-DESCRIPTION = "Cross locale generation tool for eglibc"
-HOMEPAGE = "http://www.eglibc.org/home"
-SECTION = "libs"
-LICENSE = "LGPL"
-
-LIC_DIR = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
-LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=07a394b26e0902b9ffdec03765209770 \
-      file://${LIC_DIR}/COPYING;md5=393a5ca445f6965873eca0259a17f833 \
-      file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
-      file://${LIC_DIR}/COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
-
-
-inherit native
-inherit autotools
-
-PR = "r1"
-SRCREV="11982"
-EGLIBC_BRANCH="eglibc-2_12"
-SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http "
-S = "${WORKDIR}/${EGLIBC_BRANCH}/localedef"
-
-do_unpack_append() {
-	bb.build.exec_func('do_move_ports', d)
-}
-
-do_move_ports() {
-        if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then
-	    rm -rf ${WORKDIR}/libc/ports
-	    mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${WORKDIR}/libc/
-	fi
-}
-
-EXTRA_OECONF = "--with-glibc=${WORKDIR}/${EGLIBC_BRANCH}/libc"
-
-do_configure () {
-	./configure ${EXTRA_OECONF}
-}
-
-
-do_install() {
-	install -d ${D}${bindir} 
-	install -m 0755 ${S}/localedef ${D}${bindir}/cross-localedef
-}
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch b/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch
deleted file mode 100644
index cf58035..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
-
-Upstream-Status: Pending
-
-Index: libc/bits/stdio-lock.h
-===================================================================
---- libc.orig/bits/stdio-lock.h	2009-10-28 14:34:19.000000000 -0700
-+++ libc/bits/stdio-lock.h	2009-10-28 14:34:54.000000000 -0700
-@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _
-   _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp));      \
-   _IO_flockfile (_fp)
- 
-+# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
-+
- # define _IO_release_lock(_fp) \
-   _IO_funlockfile (_fp);						      \
-   _IO_cleanup_region_end (0)
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch b/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch
deleted file mode 100644
index c2407ee..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: http://sourceware.org/bugzilla/show_bug.cgi?id=12097
-Upstream-Status: Submitted
-
-The patch should be merged into glibc-ports
-
--Khem
-Index: libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
-===================================================================
---- libc.orig/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
-+++ libc/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
-@@ -16,6 +16,8 @@
-    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-    02111-1307 USA.  */
- 
-+#if defined(__thumb__)
-+
- #include <sysdep.h>
- 
- /* Out-of-line syscall stub.  We expect the system call number in ip
-@@ -41,3 +43,5 @@ ENTRY (__libc_do_syscall)
- 	pop	{r7, pc}
- 	.fnend
- END (__libc_do_syscall)
-+
-+#endif /* __thumb__ */
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch
deleted file mode 100644
index 4313aa5..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.)
-../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function)
-make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1
-
-Upstream-Status: Pending
-
---- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig
-+++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
-@@ -25,6 +25,7 @@
- #include <atomic.h>
- #include <sysdep.h>
- #include <kernel-features.h>
-+#include <tls.h>
- 
- #define FUTEX_WAIT		0
- #define FUTEX_WAKE		1
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf b/meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf
deleted file mode 100644
index e69de29..0000000
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk b/meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk
deleted file mode 100644
index d2a28c2..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/make
-
-include $(IN)
-
-all:
-	rm -f $(OUT)
-	touch $(OUT)
-	for locale in $(SUPPORTED-LOCALES); do \
-		[ $$locale = true ] && continue; \
-		echo $$locale | sed 's,/, ,' >> $(OUT); \
-	done
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch
deleted file mode 100644
index 40ae6d3..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-The default lib search path order is:
-
-  1) LD_LIBRARY_PATH
-  2) RPATH from the binary
-  3) ld.so.cache
-  4) default search paths embedded in the linker
-
-For nativesdk binaries which are being used alongside binaries on a host system, we 
-need the search paths to firstly search the shipped nativesdk libs but then also
-cover the host system. For example we want the host system's libGL and this may be
-in a non-standard location like /usr/lib/mesa. The only place the location is know 
-about is in the ld.so.cache of the host system.
-
-Since nativesdk has a simple structure and doesn't need to use a cache itself, we 
-repurpose the cache for use as a last resort in finding host system binaries. This 
-means we need to switch the order of 3 and 4 above to make this work effectively.
-
-RP 14/10/2010
-
-Index: libc/elf/dl-load.c
-===================================================================
---- libc.orig/elf/dl-load.c
-+++ libc/elf/dl-load.c
-@@ -2107,6 +2107,15 @@ _dl_map_object (struct link_map *loader,
- 			&loader->l_runpath_dirs, &realname, &fb, loader,
- 			LA_SER_RUNPATH, &found_other_class);
- 
-+      /* try the default path.  */
-+      if (fd == -1
-+	  && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
-+	      || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
-+	  && rtld_search_dirs.dirs != (void *) -1)
-+	fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
-+			&realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
-+
-+      /* Finally try ld.so.cache */
-       if (fd == -1
- 	  && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
- 	      || ! INTUSE(__libc_enable_secure)))
-@@ -2169,14 +2178,6 @@ _dl_map_object (struct link_map *loader,
- 	    }
- 	}
- 
--      /* Finally, try the default path.  */
--      if (fd == -1
--	  && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
--	      || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
--	  && rtld_search_dirs.dirs != (void *) -1)
--	fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
--			&realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
--
-       /* Add another newline when we are tracing the library loading.  */
-       if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0))
- 	_dl_debug_printf ("\n");
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch b/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
deleted file mode 100644
index 9b646fe..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-
-On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
-section if a --version-script sets _RLD_MAP to local. This is apparently
-a binutils bug, but libc shouldn't segfault in this case.
-
-see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
-
-Upstream-Status: Pending
-
-9/19/2010 - added by Qing He <qing.he@intel.com>
-
-
----
-diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
---- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h	2009-05-16 16:36:20.000000000 +0800
-+++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h	2010-09-19 09:11:53.000000000 +0800
-@@ -70,7 +70,8 @@
- /* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
-    with the run-time address of the r_debug structure  */
- #define ELF_MACHINE_DEBUG_SETUP(l,r) \
--do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
-+do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
-+         (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
-        *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
-        (ElfW(Addr)) (r); \
-    } while (0)
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/multilib_readlib.patch b/meta/recipes-core/eglibc/eglibc-2.13/multilib_readlib.patch
deleted file mode 100644
index 1542b1b..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/multilib_readlib.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Replace the OECORE_KNOWN_INTERPRETER_NAMES with the value of 
-variable EGLIBC_KNOWN_INTERPRETER_NAMES.
-
-Lianhao Lu, 08/01/2011
-
---- libc/elf/readlib.c.orig	2011-08-12 17:05:51.864470837 +0800
-+++ libc/elf/readlib.c	2011-08-12 17:06:39.346942074 +0800
-@@ -52,6 +52,7 @@
- #ifdef SYSDEP_KNOWN_INTERPRETER_NAMES
-   SYSDEP_KNOWN_INTERPRETER_NAMES
- #endif
-+  OECORE_KNOWN_INTERPRETER_NAMES
- };
- 
- static struct known_names known_libs[] =
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch b/meta/recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch
deleted file mode 100644
index 203040c..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch
+++ /dev/null
@@ -1,538 +0,0 @@
-Upstream-Status: Pending
-
-2011-03-22  Joseph Myers  <joseph@codesourcery.com>
-
-        Merge from SG++ 2.11:
-
-        2010-10-05  Nathan Froyd  <froydnj@codesourcery.com>
-
-        Issue #9382
-
-        * sysdeps/powerpc/powerpc32/603e/: New directory.
-        * sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/: New directory.
-        * sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/: New directory.
-        * sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/: New directory.
-        * sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c: Update.
-        * sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c: Update.
-        * sysdeps/powerpc/powerpc64/e5500/fpu/Implies: New file.
-
-Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
-===================================================================
---- /dev/null
-+++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
-@@ -0,0 +1,134 @@
-+/* Double-precision floating point square root.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <math.h>
-+#include <math_private.h>
-+#include <fenv_libc.h>
-+#include <inttypes.h>
-+
-+#include <sysdep.h>
-+#include <ldsodefs.h>
-+
-+static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
-+static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-+static const float two108 = 3.245185536584267269e+32;
-+static const float twom54 = 5.551115123125782702e-17;
-+static const float half = 0.5;
-+
-+/* The method is based on the descriptions in:
-+
-+   _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
-+   _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
-+
-+   We find the actual square root and half of its reciprocal
-+   simultaneously.  */
-+
-+#ifdef __STDC__
-+double
-+__ieee754_sqrt (double b)
-+#else
-+double
-+__ieee754_sqrt (b)
-+     double b;
-+#endif
-+{
-+  if (__builtin_expect (b > 0, 1))
-+    {
-+      double y, g, h, d, r;
-+      ieee_double_shape_type u;
-+
-+      if (__builtin_expect (b != a_inf.value, 1))
-+        {
-+          fenv_t fe;
-+
-+          fe = fegetenv_register ();
-+
-+          u.value = b;
-+
-+          relax_fenv_state ();
-+
-+          __asm__ ("frsqrte %[estimate], %[x]\n"
-+                   : [estimate] "=f" (y) : [x] "f" (b));
-+
-+          /* Following Muller et al, page 168, equation 5.20.
-+
-+             h goes to 1/(2*sqrt(b))
-+             g goes to sqrt(b).
-+
-+             We need three iterations to get within 1ulp.  */
-+
-+          /* Indicate that these can be performed prior to the branch.  GCC
-+             insists on sinking them below the branch, however; it seems like
-+             they'd be better before the branch so that we can cover any latency
-+             from storing the argument and loading its high word.  Oh well.  */
-+
-+          g = b * y;
-+          h = 0.5 * y;
-+  
-+          /* Handle small numbers by scaling.  */
-+          if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
-+            return __ieee754_sqrt (b * two108) * twom54;
-+
-+#define FMADD(a_, c_, b_)                                               \
-+          ({ double __r;                                                \
-+          __asm__ ("fmadd %[r], %[a], %[c], %[b]\n"                     \
-+                   : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
-+          __r;})
-+#define FNMSUB(a_, c_, b_)                                          \
-+          ({ double __r;                                                \
-+          __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n"                     \
-+                   : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
-+          __r;})
-+
-+          r = FNMSUB (g, h, half);
-+          g = FMADD (g, r, g);
-+          h = FMADD (h, r, h);
-+
-+          r = FNMSUB (g, h, half);
-+          g = FMADD (g, r, g);
-+          h = FMADD (h, r, h);
-+
-+          r = FNMSUB (g, h, half);
-+          g = FMADD (g, r, g);
-+          h = FMADD (h, r, h);
-+
-+          /* g is now +/- 1ulp, or exactly equal to, the square root of b.  */
-+
-+          /* Final refinement.  */
-+          d = FNMSUB (g, g, b);
-+
-+          fesetenv_register (fe);
-+          return FMADD (d, h, g);
-+        }
-+    }
-+  else if (b < 0)
-+    {
-+      /* For some reason, some PowerPC32 processors don't implement
-+         FE_INVALID_SQRT.  */
-+#ifdef FE_INVALID_SQRT
-+      feraiseexcept (FE_INVALID_SQRT);
-+
-+      fenv_union_t u = { .fenv = fegetenv_register () };
-+      if ((u.l[1] & FE_INVALID) == 0)
-+#endif
-+	feraiseexcept (FE_INVALID);
-+      b = a_nan.value;
-+    }
-+  return f_wash (b);
-+}
-Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
-===================================================================
---- /dev/null
-+++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
-@@ -0,0 +1,101 @@
-+/* Single-precision floating point square root.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <math.h>
-+#include <math_private.h>
-+#include <fenv_libc.h>
-+#include <inttypes.h>
-+
-+#include <sysdep.h>
-+#include <ldsodefs.h>
-+
-+static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
-+static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-+static const float threehalf = 1.5;
-+
-+/* The method is based on the descriptions in:
-+
-+   _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
-+   _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
-+
-+   We find the reciprocal square root and use that to compute the actual
-+   square root.  */
-+
-+#ifdef __STDC__
-+float
-+__ieee754_sqrtf (float b)
-+#else
-+float
-+__ieee754_sqrtf (b)
-+     float b;
-+#endif
-+{
-+  if (__builtin_expect (b > 0, 1))
-+    {
-+#define FMSUB(a_, c_, b_)                                               \
-+      ({ double __r;                                                    \
-+        __asm__ ("fmsub %[r], %[a], %[c], %[b]\n"                       \
-+                 : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
-+        __r;})
-+#define FNMSUB(a_, c_, b_)                                              \
-+      ({ double __r;                                                    \
-+        __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n"                      \
-+                 : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
-+        __r;})
-+
-+      if (__builtin_expect (b != a_inf.value, 1))
-+        {
-+          double y, x;
-+          fenv_t fe;
-+
-+          fe = fegetenv_register ();
-+
-+          relax_fenv_state ();
-+
-+          /* Compute y = 1.5 * b - b.  Uses fewer constants than y = 0.5 * b.  */
-+          y = FMSUB (threehalf, b, b);
-+
-+          /* Initial estimate.  */
-+          __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
-+
-+          /* Iterate.  x_{n+1} = x_n * (1.5 - y * (x_n * x_n)).  */
-+          x = x * FNMSUB (y, x * x, threehalf);
-+          x = x * FNMSUB (y, x * x, threehalf);
-+          x = x * FNMSUB (y, x * x, threehalf);
-+
-+          /* All done.  */
-+          fesetenv_register (fe);
-+          return x * b;
-+        }
-+    }
-+  else if (b < 0)
-+    {
-+      /* For some reason, some PowerPC32 processors don't implement
-+         FE_INVALID_SQRT.  */
-+#ifdef FE_INVALID_SQRT
-+      feraiseexcept (FE_INVALID_SQRT);
-+
-+      fenv_union_t u = { .fenv = fegetenv_register () };
-+      if ((u.l[1] & FE_INVALID) == 0)
-+#endif
-+	feraiseexcept (FE_INVALID);
-+      b = a_nan.value;
-+    }
-+  return f_washf (b);
-+}
-Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
-===================================================================
---- /dev/null
-+++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
-@@ -0,0 +1,134 @@
-+/* Double-precision floating point square root.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <math.h>
-+#include <math_private.h>
-+#include <fenv_libc.h>
-+#include <inttypes.h>
-+
-+#include <sysdep.h>
-+#include <ldsodefs.h>
-+
-+static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
-+static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-+static const float two108 = 3.245185536584267269e+32;
-+static const float twom54 = 5.551115123125782702e-17;
-+static const float half = 0.5;
-+
-+/* The method is based on the descriptions in:
-+
-+   _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
-+   _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
-+
-+   We find the actual square root and half of its reciprocal
-+   simultaneously.  */
-+
-+#ifdef __STDC__
-+double
-+__ieee754_sqrt (double b)
-+#else
-+double
-+__ieee754_sqrt (b)
-+     double b;
-+#endif
-+{
-+  if (__builtin_expect (b > 0, 1))
-+    {
-+      double y, g, h, d, r;
-+      ieee_double_shape_type u;
-+
-+      if (__builtin_expect (b != a_inf.value, 1))
-+        {
-+          fenv_t fe;
-+
-+          fe = fegetenv_register ();
-+
-+          u.value = b;
-+
-+          relax_fenv_state ();
-+
-+          __asm__ ("frsqrte %[estimate], %[x]\n"
-+                   : [estimate] "=f" (y) : [x] "f" (b));
-+
-+          /* Following Muller et al, page 168, equation 5.20.
-+
-+             h goes to 1/(2*sqrt(b))
-+             g goes to sqrt(b).
-+
-+             We need three iterations to get within 1ulp.  */
-+
-+          /* Indicate that these can be performed prior to the branch.  GCC
-+             insists on sinking them below the branch, however; it seems like
-+             they'd be better before the branch so that we can cover any latency
-+             from storing the argument and loading its high word.  Oh well.  */
-+
-+          g = b * y;
-+          h = 0.5 * y;
-+  
-+          /* Handle small numbers by scaling.  */
-+          if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
-+            return __ieee754_sqrt (b * two108) * twom54;
-+
-+#define FMADD(a_, c_, b_)                                               \
-+          ({ double __r;                                                \
-+          __asm__ ("fmadd %[r], %[a], %[c], %[b]\n"                     \
-+                   : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
-+          __r;})
-+#define FNMSUB(a_, c_, b_)                                          \
-+          ({ double __r;                                                \
-+          __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n"                     \
-+                   : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
-+          __r;})
-+
-+          r = FNMSUB (g, h, half);
-+          g = FMADD (g, r, g);
-+          h = FMADD (h, r, h);
-+
-+          r = FNMSUB (g, h, half);
-+          g = FMADD (g, r, g);
-+          h = FMADD (h, r, h);
-+
-+          r = FNMSUB (g, h, half);
-+          g = FMADD (g, r, g);
-+          h = FMADD (h, r, h);
-+
-+          /* g is now +/- 1ulp, or exactly equal to, the square root of b.  */
-+
-+          /* Final refinement.  */
-+          d = FNMSUB (g, g, b);
-+
-+          fesetenv_register (fe);
-+          return FMADD (d, h, g);
-+        }
-+    }
-+  else if (b < 0)
-+    {
-+      /* For some reason, some PowerPC32 processors don't implement
-+         FE_INVALID_SQRT.  */
-+#ifdef FE_INVALID_SQRT
-+      feraiseexcept (FE_INVALID_SQRT);
-+
-+      fenv_union_t u = { .fenv = fegetenv_register () };
-+      if ((u.l[1] & FE_INVALID) == 0)
-+#endif
-+	feraiseexcept (FE_INVALID);
-+      b = a_nan.value;
-+    }
-+  return f_wash (b);
-+}
-Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
-===================================================================
---- /dev/null
-+++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
-@@ -0,0 +1,101 @@
-+/* Single-precision floating point square root.
-+   Copyright (C) 2010 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#include <math.h>
-+#include <math_private.h>
-+#include <fenv_libc.h>
-+#include <inttypes.h>
-+
-+#include <sysdep.h>
-+#include <ldsodefs.h>
-+
-+static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
-+static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
-+static const float threehalf = 1.5;
-+
-+/* The method is based on the descriptions in:
-+
-+   _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
-+   _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
-+
-+   We find the reciprocal square root and use that to compute the actual
-+   square root.  */
-+
-+#ifdef __STDC__
-+float
-+__ieee754_sqrtf (float b)
-+#else
-+float
-+__ieee754_sqrtf (b)
-+     float b;
-+#endif
-+{
-+  if (__builtin_expect (b > 0, 1))
-+    {
-+#define FMSUB(a_, c_, b_)                                               \
-+      ({ double __r;                                                    \
-+        __asm__ ("fmsub %[r], %[a], %[c], %[b]\n"                       \
-+                 : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
-+        __r;})
-+#define FNMSUB(a_, c_, b_)                                              \
-+      ({ double __r;                                                    \
-+        __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n"                      \
-+                 : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
-+        __r;})
-+
-+      if (__builtin_expect (b != a_inf.value, 1))
-+        {
-+          double y, x;
-+          fenv_t fe;
-+
-+          fe = fegetenv_register ();
-+
-+          relax_fenv_state ();
-+
-+          /* Compute y = 1.5 * b - b.  Uses fewer constants than y = 0.5 * b.  */
-+          y = FMSUB (threehalf, b, b);
-+
-+          /* Initial estimate.  */
-+          __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
-+
-+          /* Iterate.  x_{n+1} = x_n * (1.5 - y * (x_n * x_n)).  */
-+          x = x * FNMSUB (y, x * x, threehalf);
-+          x = x * FNMSUB (y, x * x, threehalf);
-+          x = x * FNMSUB (y, x * x, threehalf);
-+
-+          /* All done.  */
-+          fesetenv_register (fe);
-+          return x * b;
-+        }
-+    }
-+  else if (b < 0)
-+    {
-+      /* For some reason, some PowerPC32 processors don't implement
-+         FE_INVALID_SQRT.  */
-+#ifdef FE_INVALID_SQRT
-+      feraiseexcept (FE_INVALID_SQRT);
-+
-+      fenv_union_t u = { .fenv = fegetenv_register () };
-+      if ((u.l[1] & FE_INVALID) == 0)
-+#endif
-+	feraiseexcept (FE_INVALID);
-+      b = a_nan.value;
-+    }
-+  return f_washf (b);
-+}
-Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies
-===================================================================
---- /dev/null
-+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies
-@@ -0,0 +1 @@
-+powerpc/powerpc32/603e/fpu
-Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/fpu/Implies
-===================================================================
---- /dev/null
-+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/7400/fpu/Implies
-@@ -0,0 +1 @@
-+powerpc/powerpc32/603e/fpu
-Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies
-===================================================================
---- /dev/null
-+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies
-@@ -0,0 +1 @@
-+powerpc/powerpc32/603e/fpu
-Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies
-===================================================================
---- /dev/null
-+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies
-@@ -0,0 +1 @@
-+powerpc/powerpc64/e5500/fpu
-Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies
-===================================================================
---- /dev/null
-+++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies
-@@ -0,0 +1 @@
-+powerpc/powerpc32/603e/fpu
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch b/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch
deleted file mode 100644
index dbf70a9..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Test for -fstack-protector is compile only test. One might have the option but
-might have build the compiler with --disable-ssp which means ssp should not be
-enabled. Therefore we change the test to a link time test. It will fail if
-libssp is not available.
-
-Upstream-Status: Pending
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
-Index: libc/configure
-===================================================================
---- libc.orig/configure
-+++ libc/configure
-@@ -6937,7 +6937,7 @@ if test "${libc_cv_ssp+set}" = set; then
-   $as_echo_n "(cached) " >&6
- else
-   if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector
--			    -o /dev/null -c -x c /dev/null 1>&5'
-+			    -o /dev/null -x c /dev/null 1>&5'
-   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-   (eval $ac_try) 2>&5
-   ac_status=$?
-Index: libc/configure.in
-===================================================================
---- libc.orig/configure.in
-+++ libc/configure.in
-@@ -1787,7 +1787,7 @@ AC_SUBST(fno_unit_at_a_time)
- 
- AC_CACHE_CHECK(for -fstack-protector, libc_cv_ssp, [dnl
- if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS -Werror -fstack-protector
--			    -o /dev/null -c -x c /dev/null 1>&AS_MESSAGE_LOG_FD])
-+			    -o /dev/null -x c /dev/null 1>&AS_MESSAGE_LOG_FD])
- then
-   libc_cv_ssp=yes
- else
diff --git a/meta/recipes-core/eglibc/eglibc-2.13/use-sysroot-cxx-headers.patch b/meta/recipes-core/eglibc/eglibc-2.13/use-sysroot-cxx-headers.patch
deleted file mode 100644
index c06eebf..0000000
--- a/meta/recipes-core/eglibc/eglibc-2.13/use-sysroot-cxx-headers.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-build system of glibc currently adds the cxx headers path by detecting
-it using provided CXX and expects that they are installed w.r.t to standard
-installation location but in OE we install and use cxx headers from target
-sysroot therefore that code needs to be adapted for OE
-
-Upstream-Status: Inappropriate [OE-specific]
-
--Khem
-
-
---- a/configure.in
-+++ b/configure.in
-@@ -1118,9 +1118,8 @@ if test -n "$sysheaders"; then
-   SYSINCLUDES="$SYSINCLUDES \
- -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
-   if test -n "$CXX"; then
--    cxxversion=`$CXX -dumpversion 2>&AS_MESSAGE_LOG_FD` &&
-     cxxmachine=`$CXX -dumpmachine 2>&AS_MESSAGE_LOG_FD` &&
--    cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" &&
-+    cxxheaders=`$CXX -print-sysroot`"$prefix/include/c++" &&
-     CXX_SYSINCLUDES="-isystem $cxxheaders \
- -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
-   fi
---- a/configure
-+++ b/configure
-@@ -5544,9 +5544,8 @@ if test -n "$sysheaders"; then
-   SYSINCLUDES="$SYSINCLUDES \
- -isystem `echo $sysheaders | sed 's/:/ -isystem /g'`"
-   if test -n "$CXX"; then
--    cxxversion=`$CXX -dumpversion 2>&5` &&
-     cxxmachine=`$CXX -dumpmachine 2>&5` &&
--    cxxheaders=`$CXX -print-file-name=../../../../include/c++/`"$cxxversion" &&
-+    cxxheaders=`$CXX -print-sysroot`"$prefix/include/c++" &&
-     CXX_SYSINCLUDES="-isystem $cxxheaders \
- -isystem $cxxheaders/$cxxmachine -isystem $cxxheaders/backward"
-   fi
diff --git a/meta/recipes-core/eglibc/eglibc-initial_2.13.bb b/meta/recipes-core/eglibc/eglibc-initial_2.13.bb
deleted file mode 100644
index 787c762..0000000
--- a/meta/recipes-core/eglibc/eglibc-initial_2.13.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require eglibc_${PV}.bb
-require eglibc-initial.inc
-
-do_configure_prepend () {
-        unset CFLAGS
-}
diff --git a/meta/recipes-core/eglibc/eglibc-locale_2.13.bb b/meta/recipes-core/eglibc/eglibc-locale_2.13.bb
deleted file mode 100644
index ce6c1d2..0000000
--- a/meta/recipes-core/eglibc/eglibc-locale_2.13.bb
+++ /dev/null
@@ -1 +0,0 @@
-require eglibc-locale.inc
diff --git a/meta/recipes-core/eglibc/eglibc_2.13.bb b/meta/recipes-core/eglibc/eglibc_2.13.bb
deleted file mode 100644
index 690f99d..0000000
--- a/meta/recipes-core/eglibc/eglibc_2.13.bb
+++ /dev/null
@@ -1,218 +0,0 @@
-require eglibc.inc
-
-SRCREV = "15508"
-
-DEPENDS += "gperf-native"
-PR = "r28"
-PR_append = "+svnr${SRCPV}"
-
-EGLIBC_BRANCH="eglibc-2_13"
-SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \
-           file://eglibc-svn-arm-lowlevellock-include-tls.patch \
-           file://IO-acquire-lock-fix.patch \
-           file://mips-rld-map-check.patch \
-           file://stack-protector-test.patch \
-           file://armv4-eabi-compile-fix.patch \
-           file://etc/ld.so.conf \
-           file://generate-supported.mk \
-           file://ppc-sqrt.patch \
-           file://multilib_readlib.patch \
-           file://use-sysroot-cxx-headers.patch \
-	   "
-LIC_FILES_CHKSUM = "file://LICENSES;md5=98a1128c4b58120182cbea3b1752d8b9 \
-      file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
-      file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
-      file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
-
-SRC_URI_append_virtclass-nativesdk = " file://ld-search-order.patch"
-S = "${WORKDIR}/${EGLIBC_BRANCH}/libc"
-B = "${WORKDIR}/build-${TARGET_SYS}"
-
-PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
-PROVIDES_${PN}-dbg = "glibc-dbg"
-
-# the -isystem in bitbake.conf screws up glibc do_stage
-BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
-TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}"
-
-GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
-
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
-
-#
-# For now, we will skip building of a gcc package if it is a uclibc one
-# and our build is not a uclibc one, and we skip a glibc one if our build
-# is a uclibc build.
-#
-# See the note in gcc/gcc_3.4.0.oe
-#
-
-python __anonymous () {
-    import bb, re
-    uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None)
-    if uc_os:
-        raise bb.parse.SkipPackage("incompatible with target %s" %
-                                   d.getVar('TARGET_OS', True))
-}
-
-export libc_cv_slibdir = "${base_libdir}"
-
-
-EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
-                --without-cvs --disable-profile --disable-debug --without-gd \
-                --enable-clocale=gnu \
-                --enable-add-ons=${GLIBC_ADDONS},ports \
-                --with-headers=${STAGING_INCDIR} \
-                --without-selinux \
-                ${GLIBC_EXTRA_OECONF}"
-
-EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
-
-do_unpack_append() {
-	bb.build.exec_func('do_move_ports', d)
-}
-
-do_move_ports() {
-        if test -d ${WORKDIR}/${EGLIBC_BRANCH}/ports ; then
-	    rm -rf ${S}/ports
-	    mv ${WORKDIR}/${EGLIBC_BRANCH}/ports ${S}/
-	fi
-}
-
-do_patch_append() {
-	bb.build.exec_func('do_fix_ia_headers', d)
-	bb.build.exec_func('do_fix_readlib_c', d)
-}
-
-# We need to ensure that all of the i386 and x86_64 headers are identical
-# to support the multilib case.  We do this by copying headers from x86_64
-# to i386 directories.  Normally when hand building eglibc or a combined
-# system you would build 32-bit, and then overwrite any files with the x86_64
-# versions.
-#
-# Each time eglibc is updated, this will need to be re-evaluated.  In order
-# to do this, disable this function.  Build eglibc for a 32-bit and a 64-bit
-# IA32 target.  Compare the contents of the include files -- comments specific
-# to the x86_64 version compared to the 32-bit one.
-#
-# For eglibc 2.13, each conflict noted below:
-#  bits/a.out.h - Add support for __WORDSIZE = 64
-#  bits/byteswap.h - Copyright date mismatch, add support for __WORDSIZE = 64
-#  bits/endian.h - Comment mismatch
-#  bits/environment.h - add support for __WORDSIZE = 64
-#  bits/fcntl.h - Comment/Copyright date mismatch, add support for __WORDSIZE = 64
-#  bits/fenv.h - Copyright date mismatch, add support for __WORDSIZE = 64
-#  bits/huge_vall.h - Comment/Copyright date mismatch, remove support for older gcc
-#  bits/link.h - Function name difference, add x86_64 definitions
-#  bits/mathdef.h - Copyright date mismatch, add support for __WORDSIZE = 64
-#  bits/mathinline.h - Copyright date mismatch, contributed by mismatch, remove support for older gcc/assembly optimization, add support for __WORDSIZE = 64
-#  bits/mman.h - Header/Copyright date mismatch, add MAP_32BIT definition
-#  bits/msq.h - Copyright date mismatch, add __WORDSIZE = 32 definitions
-#  bits/pthread_type.h -- Contributed by added, add support for __WORDSIZE = 64
-#  bits/select.h - Copyright date mismatch, add support for __WORDSIZE = 64
-#  bits/semaphore.h - Copyright date mismatch, add support for __WORDSIZE = 64
-#  bits/sem.h - Copyright date mismatch
-#  bits/setjmp.h - Copyrgiht date mismatch, add support for __WORDSIZE = 64
-#  bits/shm.h - Copyright date mismatch, add support for __WORDSIZE = 32
-#  bits/sigcontext.h - Copyright date mismatch, license wording mismatch, add support for __WORDSIZE = 32
-#  bits/stat.h - Copyright date mismatch, add support for __WORDSIZE = 32 and __WORDSIZE = 64
-#  bits/string.h - Header/Copyright date mismatch, remove assembly optimizations
-#  bits/syscall.h - different order, some different syscalls listed
-#  bits/wchar.h - Change the way the definitions are done
-#  bits/wordsize.h - Different header, remove license notice, add __x86_64__ support
-#  bits/xtitypes.h - Header difference, different typedef format
-#  bits/fpu_control.h - header difference, revised comments, updated assembly macros
-#  sys/debugreg.h - Copyright date mismatch, new definition and added __WORDSIZE=64 support
-#  sys/epoll.h - Copyright date mismatch, slightly different definitions
-#  sys/io.h - Copyright date mismatch, slightly different assembly formats
-#  sys/perm.h - Copyright date mismatch
-#  sys/procfs.h - Copyright date mismatch, support for __WORDSIZE = 32
-#  sys/reg.h - Copyright date mismatch, support for __WORDSIZE = 64
-#  sys/ucontext.h - Copyright date mismatch, support for __WORDSIZE = 64
-#  sys/user.h - Copyright date mismatch, support for __WORDSIZE = 64
-#
-# we rm something to return to the default version
-#
-do_fix_ia_headers() {
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/a.out.h ${S}/sysdeps/unix/sysv/linux/i386/bits/a.out.h
-	cp ${S}/sysdeps/x86_64/bits/byteswap.h ${S}/sysdeps/i386/bits/byteswap.h
-	cp ${S}/sysdeps/x86_64/bits/endian.h ${S}/sysdeps/i386/bits/endian.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/environments.h ${S}/sysdeps/unix/sysv/linux/i386/bits/environments.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h ${S}/sysdeps/unix/sysv/linux/i386/bits/fcntl.h
-	cp ${S}/sysdeps/x86_64/fpu/bits/fenv.h ${S}/sysdeps/i386/fpu/bits/fenv.h
-	rm -f ${S}/sysdeps/i386/bits/huge_vall.h
-	cp ${S}/sysdeps/x86_64/bits/link.h ${S}/sysdeps/i386/bits/link.h
-	cp ${S}/sysdeps/x86_64/bits/mathdef.h ${S}/sysdeps/i386/bits/mathdef.h
-	cp ${S}/sysdeps/x86_64/fpu/bits/mathinline.h ${S}/sysdeps/i386/fpu/bits/mathinline.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/mman.h ${S}/sysdeps/unix/sysv/linux/i386/bits/mman.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/msq.h ${S}/sysdeps/unix/sysv/linux/i386/bits/msq.h
-	cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/pthreadtypes.h ${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/pthreadtypes.h
-	cp ${S}/sysdeps/x86_64/bits/select.h ${S}/sysdeps/i386/bits/select.h
-	cp ${S}/nptl/sysdeps/unix/sysv/linux/x86_64/bits/semaphore.h ${S}/nptl/sysdeps/unix/sysv/linux/i386/bits/semaphore.h
-	rm -f ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sem.h
-	cp ${S}/sysdeps/x86_64/bits/setjmp.h ${S}/sysdeps/i386/bits/setjmp.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/shm.h ${S}/sysdeps/unix/sysv/linux/i386/bits/shm.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/sigcontext.h ${S}/sysdeps/unix/sysv/linux/i386/bits/sigcontext.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/bits/stat.h ${S}/sysdeps/unix/sysv/linux/i386/bits/stat.h
-	rm -f ${S}/sysdeps/i386/i486/bits/string.h ; cp ${S}/sysdeps/x86_64/bits/string.h ${S}/sysdeps/i386/bits/string.h 
-	# Skip syscall.h, see do_install
-	rm -f ${S}/sysdeps/unix/sysv/linux/i386/bits/wchar.h 
-	cp ${S}/sysdeps/x86_64/bits/wordsize.h ${S}/sysdeps/i386/bits/wordsize.h
-	cp ${S}/sysdeps/x86_64/bits/xtitypes.h ${S}/sysdeps/i386/bits/xtitypes.h
-	# i386 version is correct, x86_64 is incorrect for fpu_control.h
-	cp ${S}/sysdeps/i386/fpu_control.h ${S}/sysdeps/x86_64/fpu_control.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h ${S}/sysdeps/unix/sysv/linux/i386/sys/debugreg.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/epoll.h ${S}/sysdeps/unix/sysv/linux/i386/sys/epoll.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/io.h ${S}/sysdeps/unix/sysv/linux/i386/sys/io.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/perm.h ${S}/sysdeps/unix/sysv/linux/i386/sys/perm.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/procfs.h ${S}/sysdeps/unix/sysv/linux/i386/sys/procfs.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/reg.h ${S}/sysdeps/unix/sysv/linux/i386/sys/reg.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h ${S}/sysdeps/unix/sysv/linux/i386/sys/ucontext.h
-	cp ${S}/sysdeps/unix/sysv/linux/x86_64/sys/user.h ${S}/sysdeps/unix/sysv/linux/i386/sys/user.h
-}
-
-do_fix_readlib_c () {
-	sed -i -e 's#OECORE_KNOWN_INTERPRETER_NAMES#${EGLIBC_KNOWN_INTERPRETER_NAMES}#' ${S}/elf/readlib.c
-}
-
-do_configure () {
-# override this function to avoid the autoconf/automake/aclocal/autoheader
-# calls for now
-# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
-# version check and doesn't really help with anything
-        if [ -z "`which rpcgen`" ]; then
-                echo "rpcgen not found.  Install glibc-devel."
-                exit 1
-        fi
-        (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
-        find ${S} -name "configure" | xargs touch
-        CPPFLAGS="" oe_runconf
-}
-
-rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
-	  yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
-	  rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
-
-do_compile () {
-	# -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
-	unset LDFLAGS
-	base_do_compile
-	(
-		cd ${S}/sunrpc/rpcsvc
-		for r in ${rpcsvc}; do
-			h=`echo $r|sed -e's,\.x$,.h,'`
-			rpcgen -h $r -o $h || bbwarn "unable to generate header for $r"
-		done
-	)
-	echo "Adjust ldd script"
-	if [ -n "${RTLDLIST}" ]
-	then
-		sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#'
-		sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#'
-	fi
-}
-
-require eglibc-package.inc
-
-BBCLASSEXTEND = "nativesdk"
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 07/17] gcc: Remove csl gcc recipes
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (5 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 06/17] eglibc-2.13: Retire into toolchain layer Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 08/17] gzip: upgrade to 1.5 Saul Wold
                   ` (11 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Khem Raj <raj.khem@gmail.com>

sourcery toolchain is available as external pluggable toolchain
if needed.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../gcc/gcc-cross-initial_csl-arm-2008q1.bb        |   10 -
 .../gcc/gcc-cross-intermediate_csl-arm-2008q1.bb   |   10 -
 meta/recipes-devtools/gcc/gcc-cross-kernel.inc     |   19 -
 .../gcc/gcc-cross_csl-arm-2008q1.bb                |   24 -
 meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc   |   22 -
 meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc   |   53 -
 .../gcc/gcc-csl-arm/arm-nolibfloat.patch           |   25 -
 .../gcc/gcc-csl-arm/arm-softfloat.patch            |   17 -
 .../gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch |   13 -
 .../gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch   |   30 -
 .../gcc/gcc-csl-arm/gcc-configure-no-fortran.patch | 1076 --------------------
 .../gcc/gcc-csl-arm/gcc-new-makeinfo.patch         |   36 -
 .../gcc/gcc-csl-arm/gcc41-configure.in.patch       |   24 -
 .../gcc/gcc-csl-arm/gcc_optab_arm.patch            |   97 --
 .../gcc/gcc-csl-arm/gfortran.patch                 |   42 -
 .../gcc/gcc-csl-arm/zecke-no-host-includes.patch   |   33 -
 .../gcc/gcc-csl-arm/zecke-xgcc-cpp.patch           |   17 -
 meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb    |    3 -
 18 files changed, 0 insertions(+), 1551 deletions(-)
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-kernel.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
 delete mode 100644 meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb

diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb
deleted file mode 100644
index 0621103..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-initial.inc
-
-S = "${WORKDIR}/gcc-4.2"
-
-# Hack till we fix *libc properly
-do_install_append() {
-	ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
-}
-
diff --git a/meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
deleted file mode 100644
index 8a8f21a..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require gcc-cross_${PV}.bb
-require gcc-cross-intermediate.inc
-
-S = "${WORKDIR}/gcc-4.2"
-
-# Hack till we fix *libc properly
-do_install_append() {
-	ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
-}
-
diff --git a/meta/recipes-devtools/gcc/gcc-cross-kernel.inc b/meta/recipes-devtools/gcc/gcc-cross-kernel.inc
deleted file mode 100644
index be772ba..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross-kernel.inc
+++ /dev/null
@@ -1,19 +0,0 @@
-# Cut-down gcc for kernel builds
-# Only installs ${TARGET_PREFIX}gcc-${PV}, not ${TARGET_PREFIX}gcc.
-
-PROVIDES = "virtual/${TARGET_PREFIX}gcc-${PV}"
-
-do_install () {
-	cd gcc
-	oe_runmake 'DESTDIR=${D}' install-common install-headers install-libgcc
-	install -m 0755 xgcc  ${D}${bindir}/${TARGET_PREFIX}gcc-${PV}
-
-    # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
-    # found. These need to be relative paths so they work in different locations.
-    dest=${D}${libexecdir}/gcc/${TARGET_SYS}/${BINV}/
-    install -d $dest
-    for t in ar as ld nm objcopy objdump ranlib strip cpp; do
-        ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t $dest$t
-        ln -sf ${BINRELPATH}/${TARGET_PREFIX}$t ${dest}${TARGET_PREFIX}$t
-    done
-}
diff --git a/meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb
deleted file mode 100644
index 58eba46..0000000
--- a/meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-require gcc-csl-arm-2008q1.inc
-require gcc-cross4.inc
-require gcc-configure-cross.inc
-require gcc-package-cross.inc
-
-SRC_URI_append = " file://zecke-no-host-includes.patch "
-
-EXTRA_OECONF += "--disable-multilib --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}"
-
-#We don't want i686 linux ending up in the CFLAGS_FOR_TARGET like this: -isystem/OE/angstrom-tmp/staging/i686-linux/usr/include
-CFLAGS = ""
-CXXFLAGS = ""
-LDFLAGS = ""
-
-# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
-do_compile_prepend() {
-	ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
-	ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
-	ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ 
-	sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
-
-}
-
-ARCH_FLAGS_FOR_TARGET += " -L${STAGING_DIR_TARGET}${target_libdir} -isystem${STAGING_DIR_TARGET}${target_includedir}"
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc
deleted file mode 100644
index 9aad535..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-require gcc-common.inc
-
-BINV = "3.4.4"
-PV = "3.4.4+csl-arm-2005q3-2"
-PV_chinook-compat = "3.4.4cs2005q3.2"
-
-FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
-
-SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2005q3-2-arm-none-eabi.src.tar.bz2 \
-           file://gcc_optab_arm.patch \
-           file://gcc-3.4.4-eabi-bigendian.patch"
-
-S = "${WORKDIR}/gcc-2005q3"
-
-do_unpack2() {
-	cd ${WORKDIR}
-	tar -xvjf ./arm-2005q3-2-arm-none-eabi/gcc-2005q3-2.tar.bz2
-}
-
-addtask unpack2 after do_unpack before do_patch
-
-
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
deleted file mode 100644
index 648d783..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-require gcc-common.inc
-
-BINV = "4.2.3"
-PV = "4.2.3+csl-arm-2008q1-126"
-PR = "r6"
-
-FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
-
-SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2 \
-           file://gcc41-configure.in.patch \
-           file://arm-nolibfloat.patch \
-           file://arm-softfloat.patch \
-           file://zecke-xgcc-cpp.patch \
-"
-#           file://100-uclibc-conf.patch
-#           file://103-uclibc-conf-noupstream.patch
-#           file://200-uclibc-locale.patch
-#           file://203-uclibc-locale-no__x.patch
-#           file://204-uclibc-locale-wchar_fix.patch
-#           file://205-uclibc-locale-update.patch
-#           file://300-libstdc++-pic.patch
-#           file://302-c99-snprintf.patch
-#           file://303-c99-complex-ugly-hack.patch
-#           file://304-index_macro.patch
-#           file://305-libmudflap-susv3-legacy.patch
-#           file://306-libstdc++-namespace.patch
-#           file://307-locale_facets.patch
-#           file://402-libbackend_dep_gcov-iov.h.patch
-#           file://602-sdk-libstdc++-includes.patch
-#           file://gfortran.patch
-#           file://fortran-static-linking.patch
-#           file://gcc-configure-no-fortran.patch
-#           file://gcc-new-makeinfo.patch
-
-S = "${WORKDIR}/gcc-4.2"
-
-do_unpack2() {
-	cd ${WORKDIR}
-	tar -xvjf ./arm-2008q1-126-arm-none-eabi/gcc-2008q1-126.tar.bz2
-}
-
-# Language Overrides
-FORTRAN = ""
-#FORTRAN_linux-gnueabi = ",fortran"
-#JAVA = ",java"
-
-EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap"
-EXTRA_OECONF_INITIAL = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
-EXTRA_OECONF_INTERMEDIATE = "--disable-libmudflap --disable-libgomp --disable-libssp --disable-bootstrap"
-
-ARM_INSTRUCTION_SET = "arm"
-
-addtask unpack2 after do_unpack before do_patch
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
deleted file mode 100644
index 57d4a00..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-# Dimitry Andric <dimitry@andric.com>, 2004-05-01
-#
-# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed
-#   anymore.  (The required functions are now in libgcc.)
-# 
-# Fixes errors like
-# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat
-# collect2: ld returned 1 exit status
-# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1
-# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat
-
-Index: gcc-4.0.2/gcc/config/arm/linux-elf.h
-===================================================================
---- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h	2005-03-04 16:14:01.000000000 +0000
-+++ gcc-4.0.2/gcc/config/arm/linux-elf.h	2005-11-11 18:02:54.000000000 +0000
-@@ -56,7 +56,7 @@
-    %{shared:-lc} \
-    %{!shared:%{profile:-lc_p}%{!profile:-lc}}"
- 
--#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc"
-+#define LIBGCC_SPEC "-lgcc"
- 
- /* Provide a STARTFILE_SPEC appropriate for GNU/Linux.  Here we add
-    the GNU/Linux magical crtbegin.o file (see crtstuff.c) which
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
deleted file mode 100644
index 9a0a691..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Pending
-Index: gcc-4.0.2/gcc/config/arm/t-linux
-===================================================================
---- gcc-4.0.2.orig/gcc/config/arm/t-linux	2004-05-15 12:41:35.000000000 +0000
-+++ gcc-4.0.2/gcc/config/arm/t-linux	2005-11-11 16:07:53.000000000 +0000
-@@ -4,7 +4,10 @@
- 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 _floatundisf _floatundidf
- 
- # MULTILIB_OPTIONS = mhard-float/msoft-float
- # MULTILIB_DIRNAMES = hard-float soft-float
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
deleted file mode 100644
index 7453acd..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Pending
---- gcc-2005q3/gcc/config/arm/linux-eabi.h~	2007-07-10 09:19:47.000000000 +0930
-+++ gcc-2005q3/gcc/config/arm/linux-eabi.h	2007-07-10 10:42:37.000000000 +0930
-@@ -48,7 +48,8 @@
- #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 \
-+    " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
- 
- /* Use ld-linux.so.3 so that it will be possible to run "classic"
-    GNU/Linux binaries on an EABI system.  */
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
deleted file mode 100644
index 9c53173..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Upstream-Status: Pending
---- gcc-3.4.4/gcc/Makefile.in.orig	2005-07-25 21:00:37 +0200
-+++ gcc-3.4.4/gcc/Makefile.in	2005-07-25 21:01:19 +0200
-@@ -304,7 +304,7 @@
-     if [ "$(host)" = "$(target)" ] ; then \
-       echo ar; \
-     else \
--       t='$(program_transform_name)'; echo ar | sed -e $$t ; \
-+       t='$(program_transform_name)'; echo ar | sed -e "$$t" ; \
-     fi; \
-   fi`
- AR_FLAGS_FOR_TARGET =
-@@ -317,7 +317,7 @@
-     if [ "$(host)" = "$(target)" ] ; then \
-       echo $(RANLIB); \
-     else \
--       t='$(program_transform_name)'; echo ranlib | sed -e $$t ; \
-+       t='$(program_transform_name)'; echo ranlib | sed -e "$$t" ; \
-     fi; \
-   fi`
- NM_FOR_TARGET = ` \
-@@ -329,7 +329,7 @@
-     if [ "$(host)" = "$(target)" ] ; then \
-       echo nm; \
-     else \
--       t='$(program_transform_name)'; echo nm | sed -e $$t ; \
-+       t='$(program_transform_name)'; echo nm | sed -e "$$t" ; \
-     fi; \
-   fi`
- 
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
deleted file mode 100644
index d9aed34..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
+++ /dev/null
@@ -1,1076 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
---- tmp/configure.in.orig	2006-09-05 17:50:48.000000000 +0100
-+++ tmp/configure.in	2006-09-05 17:50:48.000000000 +0100
-@@ -157,7 +157,6 @@
- 		target-libstdc++-v3 \
- 		target-libmudflap \
- 		target-libssp \
--		target-libgfortran \
- 		${libgcj} \
- 		target-libobjc \
- 		target-libada"
-@@ -1084,77 +1083,6 @@
- AC_SUBST(docdir)
- AC_SUBST(htmldir)
- 
--# Check for GMP and MPFR
--gmplibs=
--gmpinc=
--have_gmp=yes
--# Specify a location for mpfr
--# check for this first so it ends up on the link line before gmp.
--AC_ARG_WITH(mpfr-dir, [  --with-mpfr-dir=PATH    Specify source directory for MPFR library])
--
--if test "x$with_mpfr_dir" != x; then
--  gmpinc="-I$with_mpfr_dir"
--  gmplibs="$with_mpfr_dir/libmpfr.a"
--else
--  gmplibs="-lmpfr"
--fi
--
--AC_ARG_WITH(mpfr, [  --with-mpfr=PATH        Specify directory for installed MPFR library])
--
--if test "x$with_mpfr" != x; then
--  gmplibs="-L$with_mpfr/lib $gmplibs"
--  gmpinc="-I$with_mpfr/include"
--fi
--
--# Specify a location for gmp
--AC_ARG_WITH(gmp-dir, [  --with-gmp-dir=PATH     Specify source directory for GMP library])
--
--if test "x$with_gmp_dir" != x; then
--  gmpinc="$gmpinc -I$with_gmp_dir"
--  if test -f "$with_gmp_dir/.libs/libgmp.a"; then
--    gmplibs="$gmplibs $with_gmp_dir/.libs/libgmp.a"
--  elif test -f "$with_gmp_dir/_libs/libgmp.a"; then
--    gmplibs="$gmplibs $with_gmp_dir/_libs/libgmp.a"
--  fi
--  # One of the later tests will catch the error if neither library is present.
--else
--  gmplibs="$gmplibs -lgmp"
--fi
--
--AC_ARG_WITH(gmp, [  --with-gmp=PATH         Specify directory for installed GMP library])
--
--if test "x$with_gmp" != x; then
--  gmplibs="-L$with_gmp/lib $gmplibs"
--  gmpinc="-I$with_gmp/include $gmpinc"
--fi
--
--saved_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $gmpinc"
--# Check GMP actually works
--AC_MSG_CHECKING([for correct version of gmp.h])
--AC_TRY_COMPILE([#include "gmp.h"],[
--#if __GNU_MP_VERSION < 3
--choke me
--#endif
--], [AC_MSG_RESULT([yes])],
--  [AC_MSG_RESULT([no]); have_gmp=no])
--
--if test x"$have_gmp" = xyes; then
--  AC_MSG_CHECKING([for MPFR])
--
--  saved_LIBS="$LIBS"
--  LIBS="$LIBS $gmplibs"
--  AC_TRY_LINK([#include <gmp.h>
--#include <mpfr.h>], [mpfr_t n; mpfr_init(n);],
--    [AC_MSG_RESULT([yes])],  [AC_MSG_RESULT([no]); have_gmp=no])
--  LIBS="$saved_LIBS"
--  CFLAGS="$saved_CFLAGS"
--fi
--
--# Flags needed for both GMP and/or MPFR
--AC_SUBST(gmplibs)
--AC_SUBST(gmpinc)
--
- # By default, C is the only stage 1 language.
- stage1_languages=c
- AC_SUBST(stage1_languages)
-@@ -1182,15 +1110,6 @@
-   fi
-   enable_languages=`echo "${enable_languages}" | sed -e 's/[[ 	,]][[ 	,]]*/,/g' -e 's/,$//'`
- 
--  # 'f95' is the old name for the 'fortran' language. We issue a warning
--  # and make the substitution.
--  case ,${enable_languages}, in
--    *,f95,*)
--      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
--      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
--      ;;
--  esac
--
-   # First scan to see if an enabled language requires some other language.
-   # We assume that a given config-lang.in will list all the language
-   # front ends it requires, even if some are required indirectly.
-@@ -2213,7 +2132,6 @@
- NCN_STRICT_CHECK_TARGET_TOOLS(DLLTOOL_FOR_TARGET, dlltool)
- NCN_STRICT_CHECK_TARGET_TOOLS(GCC_FOR_TARGET, gcc, ${CC_FOR_TARGET})
- NCN_STRICT_CHECK_TARGET_TOOLS(GCJ_FOR_TARGET, gcj)
--NCN_STRICT_CHECK_TARGET_TOOLS(GFORTRAN_FOR_TARGET, gfortran)
- NCN_STRICT_CHECK_TARGET_TOOLS(LD_FOR_TARGET, ld)
- NCN_STRICT_CHECK_TARGET_TOOLS(LIPO_FOR_TARGET, lipo)
- NCN_STRICT_CHECK_TARGET_TOOLS(NM_FOR_TARGET, nm)
-@@ -2237,9 +2155,7 @@
- GCC_TARGET_TOOL(gcc, GCC_FOR_TARGET, , [gcc/xgcc -B$$r/$(HOST_SUBDIR)/gcc/])
- GCC_TARGET_TOOL(gcj, GCJ_FOR_TARGET, GCJ,
- 		[gcc/gcj -B$$r/$(HOST_SUBDIR)/gcc/], java)
--GCC_TARGET_TOOL(gfortran, GFORTRAN_FOR_TARGET, GFORTRAN,
--		[gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/], fortran)
- GCC_TARGET_TOOL(ld, LD_FOR_TARGET, LD, [ld/ld-new])
- GCC_TARGET_TOOL(lipo, LIPO_FOR_TARGET, LIPO)
- GCC_TARGET_TOOL(nm, NM_FOR_TARGET, NM, [binutils/nm-new])
-
---- tmp/Makefile.in.orig	2006-09-06 08:33:46.000000000 +0100
-+++ tmp/Makefile.in	2006-09-06 08:33:46.000000000 +0100
-@@ -119,7 +119,6 @@
- 	CXX="$(CXX_FOR_BUILD)"; export CXX; \
- 	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
- 	GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
--	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
- 	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
- 	LD="$(LD_FOR_BUILD)"; export LD; \
- 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-@@ -201,7 +200,6 @@
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
- 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
- 	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
--	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
- 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
- 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
- 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -313,7 +311,6 @@
- CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
- RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
- GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
--GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
- DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
- LD_FOR_TARGET=@LD_FOR_TARGET@
- 
-@@ -452,7 +449,6 @@
- 	"CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \
- 	"DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \
- 	"GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
--	"GFORTRAN_FOR_TARGET=$(GFORTRAN_FOR_TARGET)" \
- 	"LD_FOR_TARGET=$(LD_FOR_TARGET)" \
- 	"LIPO_FOR_TARGET=$(LIPO_FOR_TARGET)" \
- 	"LDFLAGS_FOR_TARGET=$(LDFLAGS_FOR_TARGET)" \
-@@ -618,7 +614,6 @@
-     maybe-configure-target-libmudflap \
-     maybe-configure-target-libssp \
-     maybe-configure-target-newlib \
--    maybe-configure-target-libgfortran \
-     maybe-configure-target-libobjc \
-     maybe-configure-target-libtermcap \
-     maybe-configure-target-winsup \
-@@ -737,7 +732,6 @@
-     maybe-all-target-libmudflap \
-     maybe-all-target-libssp \
-     maybe-all-target-newlib \
--    maybe-all-target-libgfortran \
-     maybe-all-target-libobjc \
-     maybe-all-target-libtermcap \
-     maybe-all-target-winsup \
-@@ -844,7 +838,6 @@
-     maybe-info-target-libmudflap \
-     maybe-info-target-libssp \
-     maybe-info-target-newlib \
--    maybe-info-target-libgfortran \
-     maybe-info-target-libobjc \
-     maybe-info-target-libtermcap \
-     maybe-info-target-winsup \
-@@ -946,7 +939,6 @@
-     maybe-dvi-target-libmudflap \
-     maybe-dvi-target-libssp \
-     maybe-dvi-target-newlib \
--    maybe-dvi-target-libgfortran \
-     maybe-dvi-target-libobjc \
-     maybe-dvi-target-libtermcap \
-     maybe-dvi-target-winsup \
-@@ -1048,7 +1040,6 @@
-     maybe-html-target-libmudflap \
-     maybe-html-target-libssp \
-     maybe-html-target-newlib \
--    maybe-html-target-libgfortran \
-     maybe-html-target-libobjc \
-     maybe-html-target-libtermcap \
-     maybe-html-target-winsup \
-@@ -1150,7 +1141,6 @@
-     maybe-TAGS-target-libmudflap \
-     maybe-TAGS-target-libssp \
-     maybe-TAGS-target-newlib \
--    maybe-TAGS-target-libgfortran \
-     maybe-TAGS-target-libobjc \
-     maybe-TAGS-target-libtermcap \
-     maybe-TAGS-target-winsup \
-@@ -1252,7 +1242,6 @@
-     maybe-install-info-target-libmudflap \
-     maybe-install-info-target-libssp \
-     maybe-install-info-target-newlib \
--    maybe-install-info-target-libgfortran \
-     maybe-install-info-target-libobjc \
-     maybe-install-info-target-libtermcap \
-     maybe-install-info-target-winsup \
-@@ -1354,7 +1343,6 @@
-     maybe-install-html-target-libmudflap \
-     maybe-install-html-target-libssp \
-     maybe-install-html-target-newlib \
--    maybe-install-html-target-libgfortran \
-     maybe-install-html-target-libobjc \
-     maybe-install-html-target-libtermcap \
-     maybe-install-html-target-winsup \
-@@ -1456,7 +1444,6 @@
-     maybe-installcheck-target-libmudflap \
-     maybe-installcheck-target-libssp \
-     maybe-installcheck-target-newlib \
--    maybe-installcheck-target-libgfortran \
-     maybe-installcheck-target-libobjc \
-     maybe-installcheck-target-libtermcap \
-     maybe-installcheck-target-winsup \
-@@ -1558,7 +1545,6 @@
-     maybe-mostlyclean-target-libmudflap \
-     maybe-mostlyclean-target-libssp \
-     maybe-mostlyclean-target-newlib \
--    maybe-mostlyclean-target-libgfortran \
-     maybe-mostlyclean-target-libobjc \
-     maybe-mostlyclean-target-libtermcap \
-     maybe-mostlyclean-target-winsup \
-@@ -1660,7 +1646,6 @@
-     maybe-clean-target-libmudflap \
-     maybe-clean-target-libssp \
-     maybe-clean-target-newlib \
--    maybe-clean-target-libgfortran \
-     maybe-clean-target-libobjc \
-     maybe-clean-target-libtermcap \
-     maybe-clean-target-winsup \
-@@ -1762,7 +1747,6 @@
-     maybe-distclean-target-libmudflap \
-     maybe-distclean-target-libssp \
-     maybe-distclean-target-newlib \
--    maybe-distclean-target-libgfortran \
-     maybe-distclean-target-libobjc \
-     maybe-distclean-target-libtermcap \
-     maybe-distclean-target-winsup \
-@@ -1864,7 +1848,6 @@
-     maybe-maintainer-clean-target-libmudflap \
-     maybe-maintainer-clean-target-libssp \
-     maybe-maintainer-clean-target-newlib \
--    maybe-maintainer-clean-target-libgfortran \
-     maybe-maintainer-clean-target-libobjc \
-     maybe-maintainer-clean-target-libtermcap \
-     maybe-maintainer-clean-target-winsup \
-@@ -2024,7 +2007,6 @@
-     maybe-check-target-libmudflap \
-     maybe-check-target-libssp \
-     maybe-check-target-newlib \
--    maybe-check-target-libgfortran \
-     maybe-check-target-libobjc \
-     maybe-check-target-libtermcap \
-     maybe-check-target-winsup \
-@@ -2223,7 +2205,6 @@
-     maybe-install-target-libmudflap \
-     maybe-install-target-libssp \
-     maybe-install-target-newlib \
--    maybe-install-target-libgfortran \
-     maybe-install-target-libobjc \
-     maybe-install-target-libtermcap \
-     maybe-install-target-winsup \
-@@ -31606,382 +31587,6 @@
- 
- 
- # There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
--@if target-libgfortran
--$(TARGET_SUBDIR)/libgfortran/multilib.out: multilib.out
--	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
--	rm -f $(TARGET_SUBDIR)/libgfortran/Makefile || : ; \
--	cp multilib.out $(TARGET_SUBDIR)/libgfortran/multilib.out
--@endif target-libgfortran
--
--
--
--.PHONY: configure-target-libgfortran maybe-configure-target-libgfortran
--maybe-configure-target-libgfortran:
--@if target-libgfortran
--maybe-configure-target-libgfortran: configure-target-libgfortran
--configure-target-libgfortran: $(TARGET_SUBDIR)/libgfortran/multilib.out
--	@$(unstage)
--	@test ! -f $(TARGET_SUBDIR)/libgfortran/Makefile || exit 0; \
--	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo Configuring in $(TARGET_SUBDIR)/libgfortran; \
--	cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \
--	case $(srcdir) in \
--	  /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
--	  *) topdir=`echo $(TARGET_SUBDIR)/libgfortran/ | \
--		sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \
--	esac; \
--	srcdiroption="--srcdir=$${topdir}/libgfortran"; \
--	libsrcdir="$$s/libgfortran"; \
--	rm -f no-such-file || : ; \
--	CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
--	  $(TARGET_CONFIGARGS) $${srcdiroption}  \
--	  || exit 1
--@endif target-libgfortran
--
--
--
--
--
--.PHONY: all-target-libgfortran maybe-all-target-libgfortran
--maybe-all-target-libgfortran:
--@if target-libgfortran
--TARGET-target-libgfortran=all
--maybe-all-target-libgfortran: all-target-libgfortran
--all-target-libgfortran: configure-target-libgfortran
--	@$(unstage)
--	@r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  $(TARGET-target-libgfortran))
--@endif target-libgfortran
--
--
--
--
--
--.PHONY: check-target-libgfortran maybe-check-target-libgfortran
--maybe-check-target-libgfortran:
--@if target-libgfortran
--maybe-check-target-libgfortran: check-target-libgfortran
--
--check-target-libgfortran:
--	@: $(MAKE); $(unstage)
--	@r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)   check)
--
--@endif target-libgfortran
--
--.PHONY: install-target-libgfortran maybe-install-target-libgfortran
--maybe-install-target-libgfortran:
--@if target-libgfortran
--maybe-install-target-libgfortran: install-target-libgfortran
--
--install-target-libgfortran: installdirs
--	@: $(MAKE); $(unstage)
--	@r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(TARGET_FLAGS_TO_PASS)  install)
--
--@endif target-libgfortran
--
--# Other targets (info, dvi, etc.)
--
--.PHONY: maybe-info-target-libgfortran info-target-libgfortran
--maybe-info-target-libgfortran:
--@if target-libgfortran
--maybe-info-target-libgfortran: info-target-libgfortran
--
--info-target-libgfortran: \
--    configure-target-libgfortran 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing info in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           info) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-dvi-target-libgfortran dvi-target-libgfortran
--maybe-dvi-target-libgfortran:
--@if target-libgfortran
--maybe-dvi-target-libgfortran: dvi-target-libgfortran
--
--dvi-target-libgfortran: \
--    configure-target-libgfortran 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing dvi in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           dvi) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-html-target-libgfortran html-target-libgfortran
--maybe-html-target-libgfortran:
--@if target-libgfortran
--maybe-html-target-libgfortran: html-target-libgfortran
--
--html-target-libgfortran: \
--    configure-target-libgfortran 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing html in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           html) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-TAGS-target-libgfortran TAGS-target-libgfortran
--maybe-TAGS-target-libgfortran:
--@if target-libgfortran
--maybe-TAGS-target-libgfortran: TAGS-target-libgfortran
--
--TAGS-target-libgfortran: \
--    configure-target-libgfortran 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing TAGS in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           TAGS) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-install-info-target-libgfortran install-info-target-libgfortran
--maybe-install-info-target-libgfortran:
--@if target-libgfortran
--maybe-install-info-target-libgfortran: install-info-target-libgfortran
--
--install-info-target-libgfortran: \
--    configure-target-libgfortran \
--    info-target-libgfortran 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing install-info in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           install-info) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-install-html-target-libgfortran install-html-target-libgfortran
--maybe-install-html-target-libgfortran:
--@if target-libgfortran
--maybe-install-html-target-libgfortran: install-html-target-libgfortran
--
--install-html-target-libgfortran: \
--    configure-target-libgfortran \
--    html-target-libgfortran 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing install-html in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           install-html) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-installcheck-target-libgfortran installcheck-target-libgfortran
--maybe-installcheck-target-libgfortran:
--@if target-libgfortran
--maybe-installcheck-target-libgfortran: installcheck-target-libgfortran
--
--installcheck-target-libgfortran: \
--    configure-target-libgfortran 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing installcheck in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           installcheck) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-mostlyclean-target-libgfortran mostlyclean-target-libgfortran
--maybe-mostlyclean-target-libgfortran:
--@if target-libgfortran
--maybe-mostlyclean-target-libgfortran: mostlyclean-target-libgfortran
--
--mostlyclean-target-libgfortran: 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           mostlyclean) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-clean-target-libgfortran clean-target-libgfortran
--maybe-clean-target-libgfortran:
--@if target-libgfortran
--maybe-clean-target-libgfortran: clean-target-libgfortran
--
--clean-target-libgfortran: 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing clean in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           clean) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-distclean-target-libgfortran distclean-target-libgfortran
--maybe-distclean-target-libgfortran:
--@if target-libgfortran
--maybe-distclean-target-libgfortran: distclean-target-libgfortran
--
--distclean-target-libgfortran: 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing distclean in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           distclean) \
--	  || exit 1
--
--@endif target-libgfortran
--
--.PHONY: maybe-maintainer-clean-target-libgfortran maintainer-clean-target-libgfortran
--maybe-maintainer-clean-target-libgfortran:
--@if target-libgfortran
--maybe-maintainer-clean-target-libgfortran: maintainer-clean-target-libgfortran
--
--maintainer-clean-target-libgfortran: 
--	@: $(MAKE); $(unstage)
--	@[ -f $(TARGET_SUBDIR)/libgfortran/Makefile ] || exit 0 ; \
--	r=`${PWD_COMMAND}`; export r; \
--	s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
--	$(NORMAL_TARGET_EXPORTS) \
--	echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgfortran" ; \
--	for flag in $(EXTRA_TARGET_FLAGS); do \
--	  eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
--	done; \
--	(cd $(TARGET_SUBDIR)/libgfortran && \
--	  $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \
--	          "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \
--	          "RANLIB=$${RANLIB}" \
--	          "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" \
--	           maintainer-clean) \
--	  || exit 1
--
--@endif target-libgfortran
--
--
--
--# There's only one multilib.out.  Cleverer subdirs shouldn't need it copied.
- @if target-libobjc
- $(TARGET_SUBDIR)/libobjc/multilib.out: multilib.out
- 	$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \
-@@ -38574,8 +38179,6 @@
- 
- configure-target-newlib: maybe-all-gcc
- 
--configure-target-libgfortran: maybe-all-gcc
--
- configure-target-libobjc: maybe-all-gcc
- 
- configure-target-libtermcap: maybe-all-gcc
-@@ -38613,9 +38216,7 @@
- 
- configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss
- 
--configure-target-libgfortran: maybe-all-target-newlib maybe-all-target-libgloss
--
- configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss
- 
- configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss
-
---- tmp/Makefile.tpl.orig	2006-09-06 08:36:52.000000000 +0100
-+++ tmp/Makefile.tpl	2006-09-06 08:36:52.000000000 +0100
-@@ -122,7 +122,6 @@
- 	CXX="$(CXX_FOR_BUILD)"; export CXX; \
- 	CXXFLAGS="$(CXXFLAGS_FOR_BUILD)"; export CXXFLAGS; \
- 	GCJ="$(GCJ_FOR_BUILD)"; export GCJ; \
--	GFORTRAN="$(GFORTRAN_FOR_BUILD)"; export GFORTRAN; \
- 	DLLTOOL="$(DLLTOOL_FOR_BUILD)"; export DLLTOOL; \
- 	LD="$(LD_FOR_BUILD)"; export LD; \
- 	LDFLAGS="$(LDFLAGS_FOR_BUILD)"; export LDFLAGS; \
-@@ -204,7 +203,6 @@
- 	CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
- 	CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
- 	GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
--	GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
- 	DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
- 	LD="$(COMPILER_LD_FOR_TARGET)"; export LD; \
- 	LDFLAGS="$(LDFLAGS_FOR_TARGET)"; export LDFLAGS; \
-@@ -316,7 +314,6 @@
- CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
- RAW_CXX_FOR_TARGET=$(STAGE_CC_WRAPPER) @RAW_CXX_FOR_TARGET@ $(FLAGS_FOR_TARGET)
- GCJ_FOR_TARGET=$(STAGE_CC_WRAPPER) @GCJ_FOR_TARGET@ $(FLAGS_FOR_TARGET)
--GFORTRAN_FOR_TARGET=$(STAGE_CC_WRAPPER) @GFORTRAN_FOR_TARGET@ $(FLAGS_FOR_TARGET)
- DLLTOOL_FOR_TARGET=@DLLTOOL_FOR_TARGET@
- LD_FOR_TARGET=@LD_FOR_TARGET@
-
---- tmp/Makefile.def.orig	2006-09-06 08:38:50.000000000 +0100
-+++ tmp/Makefile.def	2006-09-06 08:38:50.000000000 +0100
-@@ -117,7 +117,6 @@
- target_modules = { module= libmudflap; lib_path=.libs; };
- target_modules = { module= libssp; lib_path=.libs; };
- target_modules = { module= newlib; };
--target_modules = { module= libgfortran; };
- target_modules = { module= libobjc; };
- target_modules = { module= libtermcap; no_check=true;
-                    missing=mostlyclean;
-@@ -227,7 +226,6 @@
- flags_to_pass = { flag= CXXFLAGS_FOR_TARGET ; };
- flags_to_pass = { flag= DLLTOOL_FOR_TARGET ; };
- flags_to_pass = { flag= GCJ_FOR_TARGET ; };
--flags_to_pass = { flag= GFORTRAN_FOR_TARGET ; };
- flags_to_pass = { flag= LD_FOR_TARGET ; };
- flags_to_pass = { flag= LIPO_FOR_TARGET ; };
- flags_to_pass = { flag= LDFLAGS_FOR_TARGET ; };
-@@ -415,7 +413,6 @@
- lang_env_dependencies = { module=boehm-gc; };
- lang_env_dependencies = { module=gperf; cxx=true; };
- lang_env_dependencies = { module=libada; };
--lang_env_dependencies = { module=libgfortran; };
- lang_env_dependencies = { module=libffi; };
- lang_env_dependencies = { module=libjava; cxx=true; };
- lang_env_dependencies = { module=libmudflap; };
-
---- tmp/configure.orgig	2006-09-06 10:01:52.000000000 +0100
-+++ tmp/configure	2006-09-06 10:01:52.000000000 +0100
-@@ -921,7 +921,6 @@
- 		target-libstdc++-v3 \
- 		target-libmudflap \
- 		target-libssp \
--		target-libgfortran \
- 		${libgcj} \
- 		target-libobjc \
- 		target-libada"
-@@ -2246,135 +2245,6 @@
- fi
- 
- 
--
--
--
--
--# Check for GMP and MPFR
--gmplibs=
--gmpinc=
--have_gmp=yes
--# Specify a location for mpfr
--# check for this first so it ends up on the link line before gmp.
--# Check whether --with-mpfr-dir or --without-mpfr-dir was given.
--if test "${with_mpfr_dir+set}" = set; then
--  withval="$with_mpfr_dir"
--  :
--fi
--
--
--if test "x$with_mpfr_dir" != x; then
--  gmpinc="-I$with_mpfr_dir"
--  gmplibs="$with_mpfr_dir/libmpfr.a"
--else
--  gmplibs="-lmpfr"
--fi
--
--# Check whether --with-mpfr or --without-mpfr was given.
--if test "${with_mpfr+set}" = set; then
--  withval="$with_mpfr"
--  :
--fi
--
--
--if test "x$with_mpfr" != x; then
--  gmplibs="-L$with_mpfr/lib $gmplibs"
--  gmpinc="-I$with_mpfr/include"
--fi
--
--# Specify a location for gmp
--# Check whether --with-gmp-dir or --without-gmp-dir was given.
--if test "${with_gmp_dir+set}" = set; then
--  withval="$with_gmp_dir"
--  :
--fi
--
--
--if test "x$with_gmp_dir" != x; then
--  gmpinc="$gmpinc -I$with_gmp_dir"
--  if test -f "$with_gmp_dir/.libs/libgmp.a"; then
--    gmplibs="$gmplibs $with_gmp_dir/.libs/libgmp.a"
--  elif test -f "$with_gmp_dir/_libs/libgmp.a"; then
--    gmplibs="$gmplibs $with_gmp_dir/_libs/libgmp.a"
--  fi
--  # One of the later tests will catch the error if neither library is present.
--else
--  gmplibs="$gmplibs -lgmp"
--fi
--
--# Check whether --with-gmp or --without-gmp was given.
--if test "${with_gmp+set}" = set; then
--  withval="$with_gmp"
--  :
--fi
--
--
--if test "x$with_gmp" != x; then
--  gmplibs="-L$with_gmp/lib $gmplibs"
--  gmpinc="-I$with_gmp/include $gmpinc"
--fi
--
--saved_CFLAGS="$CFLAGS"
--CFLAGS="$CFLAGS $gmpinc"
--# Check GMP actually works
--echo $ac_n "checking for correct version of gmp.h""... $ac_c" 1>&6
--echo "configure:2322: checking for correct version of gmp.h" >&5
--cat > conftest.$ac_ext <<EOF
--#line 2324 "configure"
--#include "confdefs.h"
--#include "gmp.h"
--int main() {
--
--#if __GNU_MP_VERSION < 3
--choke me
--#endif
--
--; return 0; }
--EOF
--if { (eval echo configure:2335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
--  rm -rf conftest*
--  echo "$ac_t""yes" 1>&6
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  echo "$ac_t""no" 1>&6; have_gmp=no
--fi
--rm -f conftest*
--
--if test x"$have_gmp" = xyes; then
--  echo $ac_n "checking for MPFR""... $ac_c" 1>&6
--echo "configure:2348: checking for MPFR" >&5
--
--  saved_LIBS="$LIBS"
--  LIBS="$LIBS $gmplibs"
--  cat > conftest.$ac_ext <<EOF
--#line 2353 "configure"
--#include "confdefs.h"
--#include <gmp.h>
--#include <mpfr.h>
--int main() {
--mpfr_t n; mpfr_init(n);
--; return 0; }
--EOF
--if { (eval echo configure:2361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  echo "$ac_t""yes" 1>&6
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  echo "$ac_t""no" 1>&6; have_gmp=no
--fi
--rm -f conftest*
--  LIBS="$saved_LIBS"
--  CFLAGS="$saved_CFLAGS"
--fi
--
--# Flags needed for both GMP and/or MPFR
--
--
--
- # By default, C is the only stage 1 language.
- stage1_languages=c
- 
-@@ -2402,15 +2272,6 @@
-   fi
-   enable_languages=`echo "${enable_languages}" | sed -e 's/[ 	,][ 	,]*/,/g' -e 's/,$//'`
- 
--  # 'f95' is the old name for the 'fortran' language. We issue a warning
--  # and make the substitution.
--  case ,${enable_languages}, in
--    *,f95,*)
--      echo configure.in: warning: 'f95' as language name is deprecated, use 'fortran' instead 1>&2
--      enable_languages=`echo "${enable_languages}" | sed -e 's/f95/fortran/g'`
--      ;;
--  esac
--
-   # First scan to see if an enabled language requires some other language.
-   # We assume that a given config-lang.in will list all the language
-   # front ends it requires, even if some are required indirectly.
-@@ -5036,81 +4897,6 @@
-   fi
- fi
- 
-- for ncn_progname in gfortran; do
--  if test -n "$ncn_target_tool_prefix"; then
--    # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
--set dummy ${ncn_target_tool_prefix}${ncn_progname}; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5045: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$GFORTRAN_FOR_TARGET"; then
--  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
--else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}${ncn_progname}"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--fi
--fi
--GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET"
--if test -n "$GFORTRAN_FOR_TARGET"; then
--  echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
--
--  fi
--  if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" && test $build = $target ; then
--    # Extract the first word of "${ncn_progname}", so it can be a program name with args.
--set dummy ${ncn_progname}; ac_word=$2
--echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:5076: checking for $ac_word" >&5
--if eval "test \"`echo '$''{'ac_cv_prog_GFORTRAN_FOR_TARGET'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  if test -n "$GFORTRAN_FOR_TARGET"; then
--  ac_cv_prog_GFORTRAN_FOR_TARGET="$GFORTRAN_FOR_TARGET" # Let the user override the test.
--else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
--  ac_dummy="$PATH"
--  for ac_dir in $ac_dummy; do
--    test -z "$ac_dir" && ac_dir=.
--    if test -f $ac_dir/$ac_word; then
--      ac_cv_prog_GFORTRAN_FOR_TARGET="${ncn_progname}"
--      break
--    fi
--  done
--  IFS="$ac_save_ifs"
--fi
--fi
--GFORTRAN_FOR_TARGET="$ac_cv_prog_GFORTRAN_FOR_TARGET"
--if test -n "$GFORTRAN_FOR_TARGET"; then
--  echo "$ac_t""$GFORTRAN_FOR_TARGET" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
-- 
--  fi
--  test -n "$ac_cv_prog_GFORTRAN_FOR_TARGET" && break
--done
--
--if test -z "$ac_cv_prog_GFORTRAN_FOR_TARGET" ; then
--  set dummy gfortran
--  if test $build = $target ; then
--    GFORTRAN_FOR_TARGET="$2"
--  else
--    GFORTRAN_FOR_TARGET="${ncn_target_tool_prefix}$2"
--  fi
--fi
--
-  for ncn_progname in ld; do
-   if test -n "$ncn_target_tool_prefix"; then
-     # Extract the first word of "${ncn_target_tool_prefix}${ncn_progname}", so it can be a program name with args.
-@@ -5843,34 +5629,6 @@
-     echo "$ac_t""pre-installed" 1>&6
-   fi
- fi
--echo $ac_n "checking where to find the target gfortran""... $ac_c" 1>&6
--echo "configure:5848: checking where to find the target gfortran" >&5
--if test "x${build}" != "x${host}" ; then
--  # Canadian cross, just use what we found
--  echo "$ac_t""pre-installed" 1>&6
--else
--  ok=yes
--  case " ${configdirs} " in
--    *" gcc "*) ;;
--    *) ok=no ;;
--  esac
--  case ,${enable_languages}, in
--    *,fortran,*) ;;
--    *) ok=no ;;
--  esac
--  if test $ok = yes; then
--    # An in-tree tool is available and we can use it
--    GFORTRAN_FOR_TARGET='$$r/$(HOST_SUBDIR)/gcc/gfortran -B$$r/$(HOST_SUBDIR)/gcc/'
--    echo "$ac_t""just compiled" 1>&6
--  elif test "x$target" = "x$host"; then
--    # We can use an host tool
--    GFORTRAN_FOR_TARGET='$(GFORTRAN)'
--    echo "$ac_t""host tool" 1>&6
--  else
--    # We need a cross tool
--    echo "$ac_t""pre-installed" 1>&6
--  fi
--fi
- echo $ac_n "checking where to find the target ld""... $ac_c" 1>&6
- echo "configure:5876: checking where to find the target ld" >&5
- if test "x${build}" != "x${host}" ; then
-@@ -6413,7 +6171,6 @@
- s%@DLLTOOL_FOR_TARGET@%$DLLTOOL_FOR_TARGET%g
- s%@GCC_FOR_TARGET@%$GCC_FOR_TARGET%g
- s%@GCJ_FOR_TARGET@%$GCJ_FOR_TARGET%g
--s%@GFORTRAN_FOR_TARGET@%$GFORTRAN_FOR_TARGET%g
- s%@LD_FOR_TARGET@%$LD_FOR_TARGET%g
- s%@LIPO_FOR_TARGET@%$LIPO_FOR_TARGET%g
- s%@NM_FOR_TARGET@%$NM_FOR_TARGET%g
-
---- tmp/config-ml.in.orig	2006-09-06 10:27:49.000000000 +0100
-+++ tmp/config-ml.in	2006-09-06 10:27:49.000000000 +0100
-@@ -785,14 +785,12 @@
-         break
-       fi
-     done
--    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags"'
-+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" GCJ="${GCJ_}$flags"'
- 
-     if [ "${with_target_subdir}" = "." ]; then
- 	CC_=$CC' '
- 	CXX_=$CXX' '
--	F77_=$F77' '
- 	GCJ_=$GCJ' '
--	GFORTRAN_=$GFORTRAN' '
-     else
- 	# Create a regular expression that matches any string as long
- 	# as ML_POPDIR.
-@@ -821,18 +819,6 @@
- 	  esac
- 	done
- 
--	F77_=
--	for arg in ${F77}; do
--	  case $arg in
--	  -[BIL]"${ML_POPDIR}"/*)
--	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
--	  "${ML_POPDIR}"/*)
--	    F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
--	  *)
--	    F77_="${F77_}${arg} " ;;
--	  esac
--	done
--
- 	GCJ_=
- 	for arg in ${GCJ}; do
- 	  case $arg in
-@@ -845,18 +831,6 @@
- 	  esac
- 	done
- 
--	GFORTRAN_=
--	for arg in ${GFORTRAN}; do
--	  case $arg in
--	  -[BIL]"${ML_POPDIR}"/*)
--	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
--	  "${ML_POPDIR}"/*)
--	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
--	  *)
--	    GFORTRAN_="${GFORTRAN_}${arg} " ;;
--	  esac
--	done
--
- 	if test "x${LD_LIBRARY_PATH+set}" = xset; then
- 	  LD_LIBRARY_PATH_=
- 	  for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
deleted file mode 100644
index bd3197d..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
----
- configure    |    2 +-
- configure.in |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- gcc-2006q1.orig/configure
-+++ gcc-2006q1/configure
-@@ -3453,11 +3453,11 @@ case " $build_configdirs " in
-   *)
- 
-     # For an installed makeinfo, we require it to be from texinfo 4.2 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-     fi
-     ;;
---- gcc-2006q1.orig/configure.in
-+++ gcc-2006q1/configure.in
-@@ -2078,11 +2078,11 @@ case " $build_configdirs " in
-   *)
- changequote(,)
-     # For an installed makeinfo, we require it to be from texinfo 4.2 or
-     # higher, else we use the "missing" dummy.
-     if ${MAKEINFO} --version \
--       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
-+       | egrep 'texinfo[^0-9]*(4\.([6-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then
-       :
-     else
-       MAKEINFO="$MISSING makeinfo"
-     fi
-     ;;
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
deleted file mode 100644
index 88b0611..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
---- gcc-3.4.4/configure.in.orig	2005-08-09 19:57:51.504323183 -0700
-+++ gcc-3.4.4/configure.in	2005-08-09 20:00:12.073168623 -0700
-@@ -1907,7 +1907,7 @@
-   *) gxx_include_dir=${with_gxx_include_dir} ;;
- esac
- 
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
-  *" newlib "*)
-   case " $target_configargs " in
---- gcc-3.4.4/configure.orig	2005-08-09 21:02:29.668360660 -0700
-+++ gcc-3.4.4/configure	2005-08-09 21:02:50.157649970 -0700
-@@ -2669,7 +2669,7 @@
-   *) gxx_include_dir=${with_gxx_include_dir} ;;
- esac
- 
--FLAGS_FOR_TARGET=
-+FLAGS_FOR_TARGET="$ARCH_FLAGS_FOR_TARGET"
- case " $target_configdirs " in
-  *" newlib "*)
-   case " $target_configargs " in
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
deleted file mode 100644
index 5738a47..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Upstream-Status: Pending
-
-ARM is the only architecture that has a helper function that returns
-an unbiased result. This fix is trivial enough that we can show it
-doesn't effect any of the other arches. Can we consider this a
-regression fix since it used to work until the helper was added :}
-
-Tested with no regressions on x86_64-pc-linux-gnu and arm-none-eabi.
-
-Cheers,
-Carlos.
--- 
-Carlos O'Donell
-CodeSourcery
-carlos@codesourcery.com
-(650) 331-3385 x716
-
-gcc/
-
-2006-01-27  Carlos O'Donell  <carlos@codesourcery.com>
-
-	* optabs.c (prepare_cmp_insn): If unbaised and unsigned then bias
-	the comparison routine return.
-	
-gcc/testsuite/
-
-2006-01-27  Carlos O'Donell  <carlos@codesourcery.com>
-
-	* gcc.dg/unsigned-long-compare.c: New test.
-
-Index: gcc/optabs.c
-===================================================================
---- 1/gcc/optabs.c	(revision 110300)
-+++ 2/gcc/optabs.c	(working copy)
-@@ -3711,18 +3711,24 @@
-       result = emit_library_call_value (libfunc, NULL_RTX, LCT_CONST_MAKE_BLOCK,
- 					word_mode, 2, x, mode, y, mode);
- 
-+      /* There are two kinds of comparison routines. Biased routines
-+	 return 0/1/2, and unbiased routines return -1/0/1. Other parts
-+	 of gcc expect that the comparison operation is equivalent
-+	 to the modified comparison. For signed comparisons compare the 
-+	 result against 1 in the unbiased case, and zero in the biased
-+	 case. For unsigned comparisons always compare against 1 after
-+	 biasing the unbased result by adding 1. This gives us a way to
-+	 represent LTU. */
-       *px = result;
-       *pmode = word_mode;
--      if (TARGET_LIB_INT_CMP_BIASED)
--	/* Integer comparison returns a result that must be compared
--	   against 1, so that even if we do an unsigned compare
--	   afterward, there is still a value that can represent the
--	   result "less than".  */
--	*py = const1_rtx;
--      else
-+      *py = const1_rtx;
-+
-+      if (!TARGET_LIB_INT_CMP_BIASED)
- 	{
--	  *py = const0_rtx;
--	  *punsignedp = 1;
-+	  if (*punsignedp)
-+	    *px = plus_constant (result, 1);  
-+	  else
-+	    *py = const0_rtx;
- 	}
-       return;
-     }
-Index: gcc/testsuite/gcc.dg/unsigned-long-compare.c
-===================================================================
---- 1/gcc/testsuite/gcc.dg/unsigned-long-compare.c	(revision 0)
-+++ 2/gcc/testsuite/gcc.dg/unsigned-long-compare.c	(revision 0)
-@@ -0,0 +1,24 @@
-+/* Copyright (C) 2006 Free Software Foundation, Inc. */
-+/* Contributed by Carlos O'Donell on 2006-01-27 */
-+
-+/* Test a division corner case where the expression simplifies
-+   to a comparison, and the optab expansion is wrong. The optab 
-+   expansion emits a function whose return is unbiased and needs
-+   adjustment. */
-+/* Origin: Carlos O'Donell <carlos@codesourcery.com> */
-+/* { dg-do run { target arm-*-*eabi* } } */
-+/* { dg-options "" } */
-+#include <stdlib.h>
-+
-+#define BIG_CONSTANT 0xFFFFFFFF80000000ULL
-+
-+int main (void)
-+{
-+  unsigned long long OneULL = 1ULL;
-+  unsigned long long result;
-+
-+  result = OneULL / BIG_CONSTANT; 
-+  if (result)
-+    abort ();
-+  exit (0);
-+}
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch
deleted file mode 100644
index c78e831..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Pending
-
-The patch below fixes a crash building libgfortran on arm-linux-gnueabi.
-
-This target doesn't really have a 128-bit integer type, however it does use 
-TImode to represent the return value of certain special ABI defined library 
-functions. This results in type_for_size(TImode) being called.
-
-Because TImode deosn't correspond to any gfortran integer kind 
-gfc_type_for_size returns NULL and we segfault shortly after.
-
-The patch below fixes this by making gfc_type_for_size handle TImode in the 
-same way as the C frontend.
-
-Tested on x86_64-linux and arm-linux-gnueabi.
-Applied to trunk.
-
-Paul
-
-2007-05-15  Paul Brook  <paul@codesourcery.com>
-
-	gcc/fortran/
-	* trans-types.c (gfc_type_for_size): Handle signed TImode.
-
-Index: gcc-4.2.1/gcc/fortran/trans-types.c
-===================================================================
---- gcc-4.2.1/gcc/fortran/trans-types.c	(revision 170435)
-+++ gcc-4.2.1/gcc/fortran/trans-types.c	(working copy)
-@@ -1800,6 +1800,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/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
deleted file mode 100644
index 1695582..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Pending
-
-Index: gcc-4.0.2/gcc/c-incpath.c
-===================================================================
---- gcc-4.0.2.orig/gcc/c-incpath.c	2005-01-23 16:05:27.000000000 +0100
-+++ gcc-4.0.2/gcc/c-incpath.c	2006-05-15 21:23:02.000000000 +0200
-@@ -350,6 +350,26 @@
-   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.  */
-+	{
-+		/* printf("Adding Path: %s\n", p->name ); */
-+		if( strstr(p->name, "/usr/include" ) == p->name ) {
-+			fprintf(stderr, _("BUILD ISOLATION FAILURE: /usr/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
-+			abort();
-+		} else if( strstr(p->name, "/sw/include") == p->name ) {
-+			fprintf(stderr, _("BUILD ISOLATION FAILURE: /sw/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
-+			abort();
-+		} else if( strstr(p->name, "/opt/include") == p->name ) {
-+			fprintf(stderr, _("BUILD ISOLATION FAILURE: /opt/include in INCLUDEPATH: %s\n Please fix the flags passed to the compiler to use the correct prefix.\n"), p->name);
-+			abort();
-+		 }
-+	}
-+#endif
-+
-   add_cpp_dir_path (p, chain);
- }
- 
diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch b/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
deleted file mode 100644
index b06de54..0000000
--- a/meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-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.
-
-Index: gcc-4.1.1/Makefile.in
-===================================================================
---- gcc-4.1.1.orig/Makefile.in	2006-08-06 13:32:44.000000000 +0200
-+++ gcc-4.1.1/Makefile.in	2006-08-06 13:32:46.000000000 +0200
-@@ -194,6 +194,7 @@
- 	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/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb b/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
deleted file mode 100644
index 5bb8e58..0000000
--- a/meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require gcc-${PV}.inc
-require gcc-configure-target.inc
-require gcc-package-target.inc
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 08/17] gzip: upgrade to 1.5
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (6 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 07/17] gcc: Remove csl gcc recipes Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 09/17] sudo: upgrade to 1.8.5p2 Saul Wold
                   ` (10 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Scott Garman <scott.a.garman@intel.com>

LIC_FILES_CHKSUM updated due to trivial copyright date change.

Use new update-alternatives syntax.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-extended/gzip/gzip.inc    |    7 +++++--
 meta/recipes-extended/gzip/gzip_1.4.bb |   10 ----------
 meta/recipes-extended/gzip/gzip_1.5.bb |   10 ++++++++++
 3 files changed, 15 insertions(+), 12 deletions(-)
 delete mode 100644 meta/recipes-extended/gzip/gzip_1.4.bb
 create mode 100644 meta/recipes-extended/gzip/gzip_1.5.bb

diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 1d608a6..a4b1abe 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -6,7 +6,7 @@ SECTION = "console/utils"
 # change to GPLv3+ in 2007/07. Previous GPLv2 version is 1.3.12
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
-                    file://gzip.h;firstline=8;endline=20;md5=e2ec6b91fbe43a18f6081f3bbae46a01"
+                    file://gzip.h;firstline=8;endline=20;md5=d31380638987e6789f06bc96a29a9a16"
 
 SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
 
@@ -22,5 +22,8 @@ do_install_append () {
 
 inherit update-alternatives
 
-ALTERNATIVE_LINKS = "${base_bindir}/gunzip ${base_bindir}/gzip ${base_bindir}/zcat"
 ALTERNATIVE_PRIORITY = "100"
+ALTERNATIVE_${PN} = "gunzip gzip zcat"
+ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
+ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
+ALTERNATIVE_LINK_NAME[zcat] = "${base_bindir}/zcat"
diff --git a/meta/recipes-extended/gzip/gzip_1.4.bb b/meta/recipes-extended/gzip/gzip_1.4.bb
deleted file mode 100644
index 54dd50a..0000000
--- a/meta/recipes-extended/gzip/gzip_1.4.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-require gzip.inc
-
-PR = "r2"
-
-NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
-
-BBCLASSEXTEND = "native"
-
-SRC_URI[md5sum] = "e381b8506210c794278f5527cba0e765"
-SRC_URI[sha256sum] = "d166cfd3da380da1bd535633e8890bfb5664f9e68870a611d1dc01a3e9f711ee"
diff --git a/meta/recipes-extended/gzip/gzip_1.5.bb b/meta/recipes-extended/gzip/gzip_1.5.bb
new file mode 100644
index 0000000..7a811e2
--- /dev/null
+++ b/meta/recipes-extended/gzip/gzip_1.5.bb
@@ -0,0 +1,10 @@
+require gzip.inc
+
+PR = "r0"
+
+NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"
+
+BBCLASSEXTEND = "native"
+
+SRC_URI[md5sum] = "11b76536941ee1c0221fe6eefbcb32cb"
+SRC_URI[sha256sum] = "b5d56e8ffc9918e8c941fab56e04121194f9870adeeb859e09c09eac264035a3"
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 09/17] sudo: upgrade to 1.8.5p2
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (7 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 08/17] gzip: upgrade to 1.5 Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 10/17] bitbake.conf/abi_version.conf: Update to use BasicHash signature generator Saul Wold
                   ` (9 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Scott Garman <scott.a.garman@intel.com>

LIC_FILES_CHKSUM updated due to trivial copyright date change.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-extended/sudo/sudo.inc                |    2 +-
 .../sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb}      |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-extended/sudo/{sudo_1.8.4p4.bb => sudo_1.8.5p2.bb} (83%)

diff --git a/meta/recipes-extended/sudo/sudo.inc b/meta/recipes-extended/sudo/sudo.inc
index 2168690..babea37 100644
--- a/meta/recipes-extended/sudo/sudo.inc
+++ b/meta/recipes-extended/sudo/sudo.inc
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.sudo.ws"
 BUGTRACKER = "http://www.sudo.ws/bugs/"
 SECTION = "admin"
 LICENSE = "ISC & BSD & Zlib"
-LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=19f95c610f585c26a836975654807669 \
+LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=d25a8240ca6decdecb9990789e593130 \
                     file://plugins/sudoers/redblack.c;beginline=1;endline=41;md5=fba1c1dca0951819964dfdc618e81724 \
                     file://compat/fnmatch.c;beginline=3;endline=27;md5=67f83ee9bd456557397082f8f1be0efd \
                     file://compat/getcwd.c;beginline=5;endline=27;md5=449af4cc57fc7d46f42090608ba3e681 \
diff --git a/meta/recipes-extended/sudo/sudo_1.8.4p4.bb b/meta/recipes-extended/sudo/sudo_1.8.5p2.bb
similarity index 83%
rename from meta/recipes-extended/sudo/sudo_1.8.4p4.bb
rename to meta/recipes-extended/sudo/sudo_1.8.5p2.bb
index 20c4a14..dfba7e0 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.5p2.bb
@@ -1,6 +1,6 @@
 require sudo.inc
 
-PR = "r1"
+PR = "r0"
 
 SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
            file://libtool.patch \
@@ -8,8 +8,8 @@ SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
 
 PAM_SRC_URI = "file://sudo.pam"
 
-SRC_URI[md5sum] = "b9be6df7ecefedff2263052ed9fc5e93"
-SRC_URI[sha256sum] = "bf965b09bde9b0cf7fd2355c53a81884d02d522af2d539cf40218436e9a5051e"
+SRC_URI[md5sum] = "dc42ed9f0946d92273762d0ae7314d59"
+SRC_URI[sha256sum] = "c32ae2bc3faf83444c82ca75ccb10ad3684d8222e3535f164c4a4db7cdddf8cf"
 
 DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
 RDEPENDS_${PN} += " ${@base_contains('DISTRO_FEATURES', 'pam', 'pam-plugin-limits pam-plugin-keyinit', '', d)}"
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 10/17] bitbake.conf/abi_version.conf: Update to use BasicHash signature generator
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (8 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 09/17] sudo: upgrade to 1.8.5p2 Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 11/17] linux-firmware: update to main repo on kernel.org Saul Wold
                   ` (8 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Richard Purdie <richard.purdie@linuxfoundation.org>

This switches to use the hash based signature generatior and update
layout_abi to match stamp file layout changes.

Angstrom, SHR and Poky did this a while ago. This brings the OE-Core defaults
into line with what is the best common practise at this point. Its been
discussed on the mailing lists and by the TSC at length, this just completes
the transition.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/conf/abi_version.conf |    2 +-
 meta/conf/bitbake.conf     |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index f2919e5..83b668a 100644
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -4,4 +4,4 @@
 # that breaks the format and have been previously discussed on the mailing list 
 # with general agreement from the core team.
 #
-OELAYOUT_ABI = "7"
+OELAYOUT_ABI = "8"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index b6fbc7a..fbc0ca2 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -748,7 +748,7 @@ TRANSLATED_TARGET_ARCH ??= "${@d.getVar('TARGET_ARCH', True).replace("_", "-")}"
 BB_CONSOLELOG ?= "${TMPDIR}/cooker.log.${DATETIME}"
 
 # Setup our default hash policy
-BB_SIGNATURE_HANDLER ?= "OEBasic"
+BB_SIGNATURE_HANDLER ?= "OEBasicHash"
 BB_HASHBASE_WHITELIST ?= "TMPDIR FILE PATH PWD BB_TASKHASH BBPATH DL_DIR SSTATE_DIR THISDIR FILESEXTRAPATHS FILE_DIRNAME HOME LOGNAME SHELL TERM USER FILESPATH STAGING_DIR_HOST STAGING_DIR_TARGET COREBASE PRSERV_HOST PRSERV_PORT PRSERV_DUMPDIR PRSERV_DUMPFILE PRSERV_LOCKDOWN PARALLEL_MAKE CCACHE_DIR EXTERNAL_TOOLCHAIN CCACHE"
 BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SESSION_MANAGER DBUS_SESSION_BUS_ADDRESS SSH_AGENT_PID XDG_SESSION_COOKIE SSH_AUTH_SOCK XAUTHORITY PSEUDO_BUILD"
 BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc defaultval _append _prepend deps depends lockfiles type vardepsexclude \
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 11/17] linux-firmware: update to main repo on kernel.org
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (9 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 10/17] bitbake.conf/abi_version.conf: Update to use BasicHash signature generator Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 12/17] kconfig-frontends: New recipe Saul Wold
                   ` (7 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Paul Gortmaker <paul.gortmaker@windriver.com>

This is now the authoratative repository, taking updates.
The latest has a couple updated license files, vs. the previous
srcrev that was used.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 .../linux-firmware/linux-firmware_git.bb           |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
index 3675978..8aacce4 100644
--- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
+++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb
@@ -7,23 +7,23 @@ SECTION = "kernel"
 
 LICENSE = "Proprietary"
 
-LIC_FILES_CHKSUM = "file://LICENSE.radeon_rlc;md5=4c243f7854d2884b483abda991adef43 \
+LIC_FILES_CHKSUM = "file://LICENSE.radeon;md5=e56b405656593a0c97e478513051ea0e \
                     file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \
                     file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \
                     file://LICENCE.ralink-firmware.txt;md5=ab2c269277c45476fb449673911a2dfd \
                     file://LICENCE.qla2xxx;md5=4005328a134054f0fa077bdc37aa64f2 \
-                    file://LICENCE.iwlwifi_firmware;md5=311cc823df5b1be4f00fbf0f17d96a6b \
+                    file://LICENCE.iwlwifi_firmware;md5=11545778abf78c43d7644d4f171ea1c7 \
                     file://LICENCE.i2400m;md5=14b901969e23c41881327c0d9e4b7d36 \
                     file://LICENCE.atheros_firmware;md5=30a14c7823beedac9fa39c64fdd01a13 \
                     file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
                     file://LICENCE.rtlwifi_firmware.txt;md5=00d06cfd3eddd5a2698948ead2ad54a5 \
                    "
 
-SRCREV = "15888a2eab052ac3d3f49334e4f6f05f347a516e"
+SRCREV = "e98750f0d68d0037ce5a186f7f863a9c13bf773a"
 PV = "0.0+git${SRCPV}"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "git://git.infradead.org/users/dwmw2/linux-firmware.git;protocol=git"
+SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 12/17] kconfig-frontends: New recipe
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (10 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 11/17] linux-firmware: update to main repo on kernel.org Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 13/17] uclibc: Fix packaging to match the new package order Saul Wold
                   ` (6 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Khem Raj <raj.khem@gmail.com>

kconfig-frontends provides the kconfig infrastructure
thats used for linux kernel as a standalone package. Its
not intended to be used for kernel itself but can be
used by packages who are based on kconfig e.g. busybox
uclibc or new packages who wants to use kconfig infra
for the package build

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../kconfig-frontends/kconfig-frontends_3.4.bb     |   28 ++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.4.bb

diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.4.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.4.bb
new file mode 100644
index 0000000..d95d3e8
--- /dev/null
+++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.4.bb
@@ -0,0 +1,28 @@
+# Copyright (C) 2012 Khem Raj <raj.khem@gmail.com>
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "The kconfig-frontends project aims at centralising \
+the effort of keeping an up-to-date, out-of-tree, packaging of the \
+kconfig infrastructure, ready for use by third-party projects. \
+The kconfig-frontends package provides the kconfig parser, as well as all \
+the frontends"
+HOMEPAGE = "http://ymorin.is-a-geek.org/projects/kconfig-frontends"
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
+SECTION = "devel"
+DEPENDS += "ncurses flex bison gperf"
+PR = "r0"
+PV = "3.4.0"
+SPIN = "0"
+SRC_URI = "http://ymorin.is-a-geek.org/download/${BPN}/${BPN}-${PV}-${SPIN}.tar.xz"
+SRC_URI[md5sum] = "7eed0faf5a41d6dd0b2a886a440a972d"
+SRC_URI[sha256sum] = "638006f3d1aefefdc1db3030a15b562cf3c89f2028b1cea0bf0f0629708802f2"
+
+S = "${WORKDIR}/${BPN}-${PV}-${SPIN}"
+
+inherit autotools
+do_configure_prepend () {
+	mkdir -p scripts/.autostuff/m4
+}
+EXTRA_OECONF += "--disable-gconf --disable-qconf"
+BBCLASSEXTEND = "native nativesdk"
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 13/17] uclibc: Fix packaging to match the new package order
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (11 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 12/17] kconfig-frontends: New recipe Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 14/17] qemu.inc: Fix packageconfig options Saul Wold
                   ` (5 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Khem Raj <raj.khem@gmail.com>

This gets rid of some phony rdepends on uclibc-dev
being reported

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-core/uclibc/uclibc.inc |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/meta/recipes-core/uclibc/uclibc.inc b/meta/recipes-core/uclibc/uclibc.inc
index 6769279..4dae303 100644
--- a/meta/recipes-core/uclibc/uclibc.inc
+++ b/meta/recipes-core/uclibc/uclibc.inc
@@ -13,7 +13,7 @@ SECTION = "libs"
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=a6f89e2100d9b6cdffcea4f398e37343 \
 		    file://COPYING.LIB.boilerplate;md5=aaddeadcddeb918297e0e4afc52ce46f \
 file://${S}/test/regex/testregex.c;startline=1;endline=31;md5=234efb227d0a40677f895e4a1e26e960"
-INC_PR = "r7"
+INC_PR = "r8"
 
 require uclibc-config.inc
 STAGINGCC = "gcc-cross-intermediate"
@@ -50,7 +50,7 @@ INHIBIT_DEFAULT_DEPS = "1"
 
 # Ensure the uclibc-dev package is processed before uclibc-staticdev to allow
 # *_nonshared.a libraries to be packaged in the uclibc-dev package.
-PACKAGES = "${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN} ${PN}-doc ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db uclibc-argp uclibc-backtrace uclibc-libcrypt uclibc-libintl uclibc-libnsl uclibc-libresolv uclibc-libm uclibc-libdl uclibc-libutil uclibc-libpthread uclibc-librt"
+PACKAGES = "ldd uclibc-utils-dbg uclibc-utils uclibc-gconv uclibc-thread-db uclibc-argp uclibc-backtrace uclibc-libcrypt uclibc-libintl uclibc-libnsl uclibc-libresolv uclibc-libm uclibc-libdl uclibc-libutil uclibc-libpthread uclibc-librt ${PN}-dbg ${PN}-dev ${PN}-staticdev ${PN}-doc ${PN}"
 
 FILES_uclibc-libcrypt = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so"
 FILES_uclibc-libintl = "${base_libdir}/libintl*.so.* ${base_libdir}/libintl-*.so"
@@ -62,34 +62,36 @@ FILES_uclibc-libutil = "${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so
 FILES_uclibc-libpthread = "${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so"
 FILES_uclibc-librt = "${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so"
 
+FILES_ldd = "${bindir}/ldd"
+FILES_uclibc-utils = "${bindir} ${sbindir}"
+FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
+FILES_uclibc-gconv = "${libdir}/gconv"
+FILES_uclibc-thread-db = "${base_libdir}/libthread_db*"
+FILES_uclibc-argp = "${base_libdir}/libuargp-*.so ${base_libdir}/libuargp*.so.*"
+FILES_uclibc-backtrace = "${base_libdir}/libubacktrace-*.so ${base_libdir}/libubacktrace*.so.*"
+
 # The last line (gdb and lib1) is for uclinux-uclibc builds
 uclibc_baselibs = "${base_libdir}/ld*.so.* ${base_libdir}/ld*.so \
                    ${base_libdir}/libc*.so.* ${base_libdir}/libuClibc-*.so \
                    ${libdir}/libc.gdb ${libdir}/libc ${base_libdir}/lib1.so \
                   "
-FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
-               ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
-FILES_ldd = "${bindir}/ldd"
-FILES_${PN}-dev_append = "\
+FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
+FILES_${PN}-dev += "\
         ${libdir}/lib*.so \
         ${libdir}/*_nonshared.a \
         ${libdir}/[S]*crt[1in].o \
         ${libdir}/crtreloc*.o \
         ${includedir}/*.h ${includedir}/*/*.h \
        "
-FILES_uclibc-utils = "${bindir} ${sbindir}"
-FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
-FILES_uclibc-gconv = "${libdir}/gconv"
-FILES_uclibc-thread-db = "${base_libdir}/libthread_db*"
-FILES_uclibc-argp = "${base_libdir}/libuargp-*.so ${base_libdir}/libuargp*.so.*"
-FILES_uclibc-backtrace = "${base_libdir}/libubacktrace-*.so ${base_libdir}/libubacktrace*.so.*"
+FILES_${PN} = "${sysconfdir} ${uclibc_baselibs} /sbin/ldconfig \
+               ${libexecdir} ${datadir}/zoneinfo ${libdir}/locale"
 
 RPROVIDES_${PN}-dev += "libc-dev virtual-libc-dev"
 # uclibc does not really have libsegfault but then using the one from glibc is also not
 # going to work. So we pretend that we have it to make bitbake not pull other recipes
 # to satisfy this dependency for the images/tasks
 
-RPROVIDES_uclibc += "libsegfault rtld(GNU_HASH)"
+RPROVIDES_${PN} += "libsegfault rtld(GNU_HASH)"
 
 SRC_URI = "\
         http://www.uclibc.org/downloads/uClibc-${PV}.tar.bz2;name=uClibc-${PV} \
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 14/17] qemu.inc: Fix packageconfig options
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (12 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 13/17] uclibc: Fix packaging to match the new package order Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 15/17] qemu-git: Move to tip of git Saul Wold
                   ` (4 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Khem Raj <raj.khem@gmail.com>

--{en|dis}able-gl-accel is spcefic to gl
patches in 0.15.1 which may not be available
for other qemu's so if someone chooses to remove
gl from PACKAGECONFIG then we dont explicitly
use the --disable-gl-accel option since this
wont be recognised by configure.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/qemu/qemu.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index e618c1d..707493e 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -38,7 +38,7 @@ do_install () {
 }
 
 PACKAGECONFIG ??= "gl"
-PACKAGECONFIG[gl] = "--enable-gl-accel,--disable-gl-accel,,"
+PACKAGECONFIG[gl] = "--enable-gl-accel,,,"
 
 DEPENDS_virtclass-native = "zlib-native alsa-lib-native glib-2.0-native"
 DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk glib-2.0-nativesdk \
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 15/17] qemu-git: Move to tip of git
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (13 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 14/17] qemu.inc: Fix packageconfig options Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 16/17] qemu_git: set empty PACKAGECONFIG Saul Wold
                   ` (3 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Khem Raj <raj.khem@gmail.com>

There are a lot of armv7 and sh4 fixes that
its worth moving to latest version. The patch
forward porting can happen later.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../recipes-devtools/qemu/qemu-git/powerpc_rom.bin |  Bin 0 -> 4096 bytes
 meta/recipes-devtools/qemu/qemu_git.bb             |   18 +++++-------------
 2 files changed, 5 insertions(+), 13 deletions(-)
 create mode 100644 meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin

diff --git a/meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin b/meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c4044296c51529878f5d2a46230949d09ef1d4e2
GIT binary patch
literal 4096
zcmeHJQEMDk6h4#Pn8Z}5VUd7UHb$_7oo16ZWvl_Wq7bx}RV;`Ib~1CD44Ivo&djz(
z20DZ^Sm;B1^P!YL$|?xr50Dxx<W1-=Nb#jAB1A;VL+N<VoqKm?mo4n8m<wmm`OZ1_
zyXT&{cV+<&$6*H!JMdrW!2M?){{b*MgY{|vBVVIFj`A$ZQ4}1?4fK1d-SMjkR6spQ
z_GQ*+=6p}1edN8j-n~$%zt8GvfO5${M!BlzGeJ!LBFYOW#4B+{V8!s70opWVtXD3@
zDYsT7E6WA+<uUG+56Lw@`umUh__@Kqf6n8Nx^M%7WfVF8S{METF%22NokAEuO`<ed
z!}V9WmvV;4>hcYvi`OX{&F6WBRnw|kl?KhhA=dzmNj!qa7`0aw&RpKS@@VUVz<iB3
zMpQ$|xW4%zN%nJ?dQI!dwdlD}J%p)_T~Q;N05Shf4N8(@M;Ibka{YvEauGg?vIjtA
zbqtD8FaGQiqq(Cfl+!&ZM!lezVg)+I$)>XgU6}SL_e61d_GCWQDdT+4h>0J6J|vY6
z?n%vooL{&VPxp1(X12&CZmJJ@_@6`fnCE!)^YzN9>I}3^S{w(>9Y>+QAbsI`)YLe%
zhsb^kg>uN3pwJm3OoIDU=pIs8v?nECzNOo>lb47s&EaP<^|yU5q9tpZ%W9g#!{`Jv
zr|0H!wb2^S$51#BeALr<I95i*YdC^h)=oK8XTDy_e`39s6Efd#dZB8#PUySXQy=qb
zi2XtSc~LLG(q`vgB_qvg-;s)C8L6AkMN@f2<h+bp)Cgs?d9P4!Wp?qtu*JH{JmPj=
z9X5+MwRTe6R?5lm8zJYFbLBH3ET5Y^zkF@UH=8!Po3GplAFV<2I`~fY=BxF=C+}Vd
z-|60b7yIC&+PdqT)q3&`#C`C|bJS5^Z@xl5eDtl8^${oMHJ06gIf&9&36H?r)A;V4
z#+S@==jEcgSd;QG&rb6RyBX$`vA~Dw|Jwn1zD7)T#WL6@;i|`=;hOjXG2Diyht{Ia
zU{W_tp9O(xFxw7bGO#{l!uHt`7`AJysF!?pxyc-36&9O84uw{OE$RWwxh&Ptjb*0V
zmcvvc1M`U<9+ne0ptr1=y`Obs#c{9N%v@sN>&_Cx0<&mZafTbZr#AFp1v*?A3Nlm0
zZzgj>xMKNXQ@2&xYBnqPS-@>HKdpGnx?^IqQWS)y+YFH+ToxY7u|nTegHZRwP8V}b
zSae+sEb;%K*M1#ny}qNsYkLXA5B@1?u>#SJLhH*7Xlm<8f;#-X1y`fH6W_i8$-egB
zukYdwC~E6a_+TB*MCN`S^Bz_3)<>=KiD-M`L~SkEkMBZtb6dHCdSP>WD2n&sT(mn?
z+PpV(Q@b~GE4~eH#;xQaDju($jbT{3o+O+D*Tz`w>>7;I`r2-i+`I$ItrjS_{sHo6
zTN_Ym=RSmE(Ze$(%wLGV!aq8Lpw!l&igq#Dm@1(jj;@#MaSO(y^{Eo=O`A-R1mJvJ
aoLIp7h<sDgFE5ple~0izly{QHzx@jx&XA}8

literal 0
HcmV?d00001

diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb
index bcec9bb..b788e51 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -1,28 +1,20 @@
 require qemu.inc
 
-SRCREV = "56a60dd6d619877e9957ba06b92d2f276e3c229d"
+SRCREV = "93bfef4c6e4b23caea9d51e1099d06433d8835a4"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
                     file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
 
-PV = "0.14.0"
-PR = "r3"
+PV = "1.1+git"
+PR = "r0"
 
 FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
 FILESDIR = "${WORKDIR}"
 
 SRC_URI = "\
     git://git.qemu.org/qemu.git;protocol=git \
-    file://qemu-git-qemugl-host.patch \
-    file://no-strip.patch \
-    file://fix-nogl.patch \
-    file://qemugl-allow-glxcontext-release.patch \
-    file://linker-flags.patch \
-    file://qemu-vmware-vga-depth.patch \
-    file://enable-i386-linux-user.patch"
-
+    file://powerpc_rom.bin \
+    "
 S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"
-
-
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 16/17] qemu_git: set empty PACKAGECONFIG
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (14 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 15/17] qemu-git: Move to tip of git Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-22 22:00 ` [CONSOLIDATED PULL 17/17] distrodata: Fix missed VARIABLE name change Saul Wold
                   ` (2 subsequent siblings)
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

From: Khem Raj <raj.khem@gmail.com>

gl patches are not yet forward ported to git recipe

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 meta/recipes-devtools/qemu/qemu_git.bb |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb
index b788e51..0d0308b 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -18,3 +18,4 @@ SRC_URI = "\
 S = "${WORKDIR}/git"
 
 DEFAULT_PREFERENCE = "-1"
+PACKAGECONFIG = ""
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [CONSOLIDATED PULL 17/17] distrodata: Fix missed VARIABLE name change
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (15 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 16/17] qemu_git: set empty PACKAGECONFIG Saul Wold
@ 2012-06-22 22:00 ` Saul Wold
  2012-06-24 18:18 ` [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
  2012-06-25 15:55 ` Richard Purdie
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-22 22:00 UTC (permalink / raw)
  To: openembedded-core

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/distrodata.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index 90ee7ae..5b10eac 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -612,7 +612,7 @@ python do_checkpkg() {
 		pstatus += ":%s%s" % (host, path)
 
 	"""Read from manual distro tracking fields as alternative"""
-	pmver = d.getVar("RECIPE_LATEST_VERSION", True)
+	pmver = d.getVar("RECIPE_UPSTREAM_VERSION", True)
 	if not pmver:
 		pmver = "N/A"
 		pmstatus = "ErrNoRecipeData"
-- 
1.7.7.6




^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [CONSOLIDATED PULL 00/17] Misc Fixes & Updates
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (16 preceding siblings ...)
  2012-06-22 22:00 ` [CONSOLIDATED PULL 17/17] distrodata: Fix missed VARIABLE name change Saul Wold
@ 2012-06-24 18:18 ` Saul Wold
  2012-06-25 15:55 ` Richard Purdie
  18 siblings, 0 replies; 22+ messages in thread
From: Saul Wold @ 2012-06-24 18:18 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On 06/22/2012 03:00 PM, Saul Wold wrote:
> Richard,
>
> I have build and done simple testing on these changes
>
Clearly my initial builds and testing where not enough, I found a couple 
of issues from this set below with further build testing.

Please do not pull the mtd or kconfig changes yet.


> Thanks
> 	Sau!
>
>
> The following changes since commit e2cc4a44d510e0d473d15f207c1c886db6a5ccf7:
>
>    [PATCH] guile: fix compilation on MIPS/PPC (2012-06-21 13:41:12 +0100)
>
> are available in the git repository at:
>    git://git.openembedded.org/openembedded-core-contrib sgw/stage
>    http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
>
> Andrea Adami (1):
>    mtd-utils: do not stage headers in sysroot
>
> Darren Hart (1):
>    cml1.bbclass: Only delay exit if the command fails
>
> Kang Kai (1):
>    runqemu-internal: qemu fails to run on ext2 image
>
> Khem Raj (8):
>    gcc-4.6: Retire into toochain-layer
>    eglibc-2.13: Retire into toolchain layer
>    gcc: Remove csl gcc recipes
>    kconfig-frontends: New recipe
>    uclibc: Fix packaging to match the new package order
>    qemu.inc: Fix packageconfig options
>    qemu-git: Move to tip of git
>    qemu_git: set empty PACKAGECONFIG
>
> Paul Gortmaker (1):
>    linux-firmware: update to main repo on kernel.org
>
> Richard Purdie (1):
>    bitbake.conf/abi_version.conf: Update to use BasicHash signature
>      generator
>
> Saul Wold (1):
>    distrodata: Fix missed VARIABLE name change
>
> Scott Garman (2):
>    gzip: upgrade to 1.5
>    sudo: upgrade to 1.8.5p2
>
> Valentin Popa (1):
>    gpgme: updated to 1.3.2
>
>   meta/classes/cml1.bbclass                          |    2 +-
>   meta/classes/distrodata.bbclass                    |    2 +-
>   meta/conf/abi_version.conf                         |    2 +-
>   meta/conf/bitbake.conf                             |    2 +-
>   .../eglibc/cross-localedef-native_2.13.bb          |   43 -
>   .../eglibc/eglibc-2.13/IO-acquire-lock-fix.patch   |   17 -
>   .../eglibc-2.13/armv4-eabi-compile-fix.patch       |   25 -
>   .../eglibc-svn-arm-lowlevellock-include-tls.patch  |   21 -
>   .../eglibc/eglibc-2.13/generate-supported.mk       |   11 -
>   .../eglibc/eglibc-2.13/ld-search-order.patch       |   56 -
>   .../eglibc/eglibc-2.13/mips-rld-map-check.patch    |   26 -
>   .../eglibc/eglibc-2.13/multilib_readlib.patch      |   17 -
>   .../recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch |  538 ----
>   .../eglibc/eglibc-2.13/stack-protector-test.patch  |   35 -
>   .../eglibc-2.13/use-sysroot-cxx-headers.patch      |   36 -
>   meta/recipes-core/eglibc/eglibc-initial_2.13.bb    |    6 -
>   meta/recipes-core/eglibc/eglibc-locale_2.13.bb     |    1 -
>   meta/recipes-core/eglibc/eglibc_2.13.bb            |  218 --
>   meta/recipes-core/uclibc/uclibc.inc                |   28 +-
>   meta/recipes-devtools/gcc/gcc-4.6.inc              |  119 -
>   .../gcc/gcc-4.6/100-uclibc-conf.patch              |   39 -
>   .../gcc/gcc-4.6/103-uclibc-conf-noupstream.patch   |   17 -
>   .../gcc/gcc-4.6/200-uclibc-locale.patch            | 2842 --------------------
>   .../gcc/gcc-4.6/203-uclibc-locale-no__x.patch      |  235 --
>   .../gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch  |   54 -
>   .../gcc/gcc-4.6/205-uclibc-locale-update.patch     |  521 ----
>   .../gcc/gcc-4.6/301-missing-execinfo_h.patch       |   15 -
>   .../gcc/gcc-4.6/302-c99-snprintf.patch             |   15 -
>   .../gcc/gcc-4.6/303-c99-complex-ugly-hack.patch    |   16 -
>   .../gcc/gcc-4.6/304-index_macro.patch              |   30 -
>   .../gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch  |   51 -
>   .../gcc/gcc-4.6/306-libstdc++-namespace.patch      |   40 -
>   meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch  |   68 -
>   .../gcc/gcc-4.6/740-sh-pr24836.patch               |   31 -
>   .../gcc/gcc-4.6/800-arm-bigendian.patch            |   36 -
>   .../gcc/gcc-4.6/904-flatten-switch-stmt-00.patch   |   76 -
>   .../gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch          |   25 -
>   .../GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch       |  186 --
>   .../gcc/gcc-4.6/arm-nolibfloat.patch               |   26 -
>   .../gcc/gcc-4.6/arm-softfloat.patch                |   18 -
>   .../gcc/gcc-4.6/cache-amnesia.patch                |   33 -
>   .../gcc/gcc-4.6/cpp-honour-sysroot.patch           |   40 -
>   .../gcc/gcc-4.6/disable_relax_pic_calls_flag.patch |   48 -
>   .../gcc/gcc-4.6/fix-for-ice-50099.patch            |   49 -
>   .../gcc/gcc-4.6/fortran-cross-compile-hack.patch   |   32 -
>   .../gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch  |   33 -
>   .../gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch      |  116 -
>   .../gcc/gcc-4.6/gcc-argument-list-too-long.patch   |   33 -
>   .../gcc/gcc-4.6/gcc-arm-set-cost.patch             |   35 -
>   .../gcc/gcc-4.6/gcc-flags-for-build.patch          |  189 --
>   .../gcc/gcc-4.6/gcc-poison-dir-extend.patch        |   27 -
>   .../gcc-4.6/gcc-poison-system-directories.patch    |  223 --
>   .../gcc-uclibc-locale-ctype_touplow_t.patch        |   72 -
>   .../gcc/gcc-4.6/gcc-with-linker-hash-style.patch   |  196 --
>   .../gcc/gcc-4.6/mips64-default-n64.patch           |   32 -
>   .../gcc/gcc-4.6/optional_libstdc.patch             |   86 -
>   .../gcc/gcc-4.6/powerpc-e5500.patch                |  465 ----
>   meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch    |   72 -
>   meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch    |  393 ---
>   meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch    |   64 -
>   .../gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch |   80 -
>   .../gcc/gcc-4.6/zecke-xgcc-cpp.patch               |   30 -
>   .../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb |   23 -
>   meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb |    2 -
>   .../gcc/gcc-cross-initial_csl-arm-2008q1.bb        |   10 -
>   .../gcc/gcc-cross-intermediate_4.6.bb              |    3 -
>   .../gcc/gcc-cross-intermediate_csl-arm-2008q1.bb   |   10 -
>   meta/recipes-devtools/gcc/gcc-cross-kernel.inc     |   19 -
>   meta/recipes-devtools/gcc/gcc-cross_4.6.bb         |    8 -
>   .../gcc/gcc-cross_csl-arm-2008q1.bb                |   24 -
>   .../gcc/gcc-crosssdk-initial_4.6.bb                |    2 -
>   .../gcc/gcc-crosssdk-intermediate_4.6.bb           |    3 -
>   meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb      |    2 -
>   meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc   |   22 -
>   meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc   |   53 -
>   .../gcc/gcc-csl-arm/arm-nolibfloat.patch           |   25 -
>   .../gcc/gcc-csl-arm/arm-softfloat.patch            |   17 -
>   .../gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch |   13 -
>   .../gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch   |   30 -
>   .../gcc/gcc-csl-arm/gcc-configure-no-fortran.patch | 1076 --------
>   .../gcc/gcc-csl-arm/gcc-new-makeinfo.patch         |   36 -
>   .../gcc/gcc-csl-arm/gcc41-configure.in.patch       |   24 -
>   .../gcc/gcc-csl-arm/gcc_optab_arm.patch            |   97 -
>   .../gcc/gcc-csl-arm/gfortran.patch                 |   42 -
>   .../gcc/gcc-csl-arm/zecke-no-host-includes.patch   |   33 -
>   .../gcc/gcc-csl-arm/zecke-xgcc-cpp.patch           |   17 -
>   meta/recipes-devtools/gcc/gcc-runtime_4.6.bb       |    8 -
>   meta/recipes-devtools/gcc/gcc_4.6.bb               |    5 -
>   meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb    |    3 -
>   meta/recipes-devtools/gcc/libgcc_4.6.bb            |   71 -
>   .../kconfig-frontends/kconfig-frontends_3.4.bb     |   28 +
>   meta/recipes-devtools/mtd/mtd-utils_1.5.0.bb       |    6 +-
>   .../recipes-devtools/qemu/qemu-git/powerpc_rom.bin |  Bin 0 ->  4096 bytes
>   meta/recipes-devtools/qemu/qemu.inc                |    2 +-
>   meta/recipes-devtools/qemu/qemu_git.bb             |   19 +-
>   meta/recipes-extended/gzip/gzip.inc                |    7 +-
>   meta/recipes-extended/gzip/gzip_1.4.bb             |   10 -
>   meta/recipes-extended/gzip/gzip_1.5.bb             |   10 +
>   meta/recipes-extended/sudo/sudo.inc                |    2 +-
>   .../sudo/{sudo_1.8.4p4.bb =>  sudo_1.8.5p2.bb}      |    6 +-
>   .../linux-firmware/linux-firmware_git.bb           |   10 +-
>   .../disable_gpgconf_check.patch                    |    0
>   .../gpgme/{gpgme_1.3.1.bb =>  gpgme_1.3.2.bb}       |    8 +-
>   scripts/runqemu-internal                           |    2 +-
>   104 files changed, 84 insertions(+), 9598 deletions(-)
>   delete mode 100644 meta/recipes-core/eglibc/cross-localedef-native_2.13.bb
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/IO-acquire-lock-fix.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/armv4-eabi-compile-fix.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/eglibc-svn-arm-lowlevellock-include-tls.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/etc/ld.so.conf
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/generate-supported.mk
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/ld-search-order.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/mips-rld-map-check.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/multilib_readlib.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/ppc-sqrt.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/stack-protector-test.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-2.13/use-sysroot-cxx-headers.patch
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-initial_2.13.bb
>   delete mode 100644 meta/recipes-core/eglibc/eglibc-locale_2.13.bb
>   delete mode 100644 meta/recipes-core/eglibc/eglibc_2.13.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6.inc
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/100-uclibc-conf.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/103-uclibc-conf-noupstream.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/200-uclibc-locale.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/203-uclibc-locale-no__x.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/204-uclibc-locale-wchar_fix.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/205-uclibc-locale-update.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/301-missing-execinfo_h.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/302-c99-snprintf.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/303-c99-complex-ugly-hack.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/304-index_macro.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/305-libmudflap-susv3-legacy.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/306-libstdc++-namespace.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/64bithack.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/740-sh-pr24836.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/800-arm-bigendian.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/904-flatten-switch-stmt-00.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/COLLECT_GCC_OPTIONS.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/GPLUSPLUS_INCLUDE_DIR_with_sysroot.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/arm-nolibfloat.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/arm-softfloat.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/cache-amnesia.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/cpp-honour-sysroot.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/disable_relax_pic_calls_flag.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fix-for-ice-50099.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/fortran-cross-compile-hack.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-argument-list-too-long.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-arm-set-cost.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-flags-for-build.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-dir-extend.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-poison-system-directories.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-uclibc-locale-ctype_touplow_t.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/gcc-with-linker-hash-style.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/mips64-default-n64.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/optional_libstdc.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/powerpc-e5500.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr32219.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr46934.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/pr47551.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/use-defaults.h-and-t-oe-in-B.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-4.6/zecke-xgcc-cpp.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-initial_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-initial_csl-arm-2008q1.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-intermediate_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-intermediate_csl-arm-2008q1.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-cross-kernel.inc
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-cross_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-cross_csl-arm-2008q1.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk-initial_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk-intermediate_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-crosssdk_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm-2005q3.inc
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/arm-nolibfloat.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/arm-softfloat.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-3.4.4-makefile-fix.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-configure-no-fortran.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc-new-makeinfo.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc41-configure.in.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gcc_optab_arm.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/gfortran.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/zecke-no-host-includes.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-csl-arm/zecke-xgcc-cpp.patch
>   delete mode 100644 meta/recipes-devtools/gcc/gcc-runtime_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc_4.6.bb
>   delete mode 100644 meta/recipes-devtools/gcc/gcc_csl-arm-2008q1.bb
>   delete mode 100644 meta/recipes-devtools/gcc/libgcc_4.6.bb
>   create mode 100644 meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.4.bb
>   create mode 100644 meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin
>   delete mode 100644 meta/recipes-extended/gzip/gzip_1.4.bb
>   create mode 100644 meta/recipes-extended/gzip/gzip_1.5.bb
>   rename meta/recipes-extended/sudo/{sudo_1.8.4p4.bb =>  sudo_1.8.5p2.bb} (83%)
>   rename meta/recipes-support/gpgme/{gpgme-1.3.1 =>  gpgme-1.3.2}/disable_gpgconf_check.patch (100%)
>   rename meta/recipes-support/gpgme/{gpgme_1.3.1.bb =>  gpgme_1.3.2.bb} (83%)
>



^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [CONSOLIDATED PULL 00/17] Misc Fixes & Updates
  2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
                   ` (17 preceding siblings ...)
  2012-06-24 18:18 ` [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
@ 2012-06-25 15:55 ` Richard Purdie
  2012-06-25 21:14   ` Khem Raj
  18 siblings, 1 reply; 22+ messages in thread
From: Richard Purdie @ 2012-06-25 15:55 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Fri, 2012-06-22 at 15:00 -0700, Saul Wold wrote:
> The following changes since commit e2cc4a44d510e0d473d15f207c1c886db6a5ccf7:
> 
>   [PATCH] guile: fix compilation on MIPS/PPC (2012-06-21 13:41:12 +0100)
> 
> are available in the git repository at:
>   git://git.openembedded.org/openembedded-core-contrib sgw/stage
>   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
> 
> Andrea Adami (1):
>   mtd-utils: do not stage headers in sysroot

Not taken after you requested I didn't.

> Darren Hart (1):
>   cml1.bbclass: Only delay exit if the command fails
> 
> Kang Kai (1):
>   runqemu-internal: qemu fails to run on ext2 image
> 
> Khem Raj (8):
>   gcc-4.6: Retire into toochain-layer
>   eglibc-2.13: Retire into toolchain layer
>   gcc: Remove csl gcc recipes
>   kconfig-frontends: New recipe

Not taken after you requested I didn't.

>   uclibc: Fix packaging to match the new package order
>   qemu.inc: Fix packageconfig options
>   qemu-git: Move to tip of git
>  qemu_git: set empty PACKAGECONFIG

I have said no to this until the patch set gets updated. It will just
get ignored/forgotten about otherwise.

> Paul Gortmaker (1):
>   linux-firmware: update to main repo on kernel.org
> 
> Richard Purdie (1):
>   bitbake.conf/abi_version.conf: Update to use BasicHash signature
>     generator
> 
> Saul Wold (1):
>   distrodata: Fix missed VARIABLE name change
> 
> Scott Garman (2):
>   gzip: upgrade to 1.5
>   sudo: upgrade to 1.8.5p2
> 
> Valentin Popa (1):
>   gpgme: updated to 1.3.2

Otherwise merged to master, thanks.

Richard




^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [CONSOLIDATED PULL 00/17] Misc Fixes & Updates
  2012-06-25 15:55 ` Richard Purdie
@ 2012-06-25 21:14   ` Khem Raj
  2012-06-29 12:26     ` Richard Purdie
  0 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2012-06-25 21:14 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Mon, Jun 25, 2012 at 8:55 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>>   qemu-git: Move to tip of git
>>  qemu_git: set empty PACKAGECONFIG
>
> I have said no to this until the patch set gets updated. It will just
> get ignored/forgotten about otherwise.
>

qemu git recipe as we have today is probably useless and its older
than 0.15 even and in any case set to D_P = "-1", forward porting
those gl patches is non trivial
intention of this recipe is to have support/fixes for machines that
had been since added and gl patches are x86 specific.

I feel its a unnecessary restriction you are imposing for a recipe
which is not used by default even.

-Khem



^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [CONSOLIDATED PULL 00/17] Misc Fixes & Updates
  2012-06-25 21:14   ` Khem Raj
@ 2012-06-29 12:26     ` Richard Purdie
  0 siblings, 0 replies; 22+ messages in thread
From: Richard Purdie @ 2012-06-29 12:26 UTC (permalink / raw)
  To: Patches and discussions about the oe-core layer

On Mon, 2012-06-25 at 14:14 -0700, Khem Raj wrote:
> On Mon, Jun 25, 2012 at 8:55 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
> >>   qemu-git: Move to tip of git
> >>  qemu_git: set empty PACKAGECONFIG
> >
> > I have said no to this until the patch set gets updated. It will just
> > get ignored/forgotten about otherwise.
> >
> 
> qemu git recipe as we have today is probably useless and its older
> than 0.15 even and in any case set to D_P = "-1", forward porting
> those gl patches is non trivial
> intention of this recipe is to have support/fixes for machines that
> had been since added and gl patches are x86 specific.
> 
> I feel its a unnecessary restriction you are imposing for a recipe
> which is not used by default even.

Having one recipe that provides different sets of features with the same
configuration is something I get concerned about.

I'm putting on some pressure to the team to figure out how/when we're
going to upgrade this. I'm hoping to have an answer on that soon.

Cheers,

Richard




^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2012-06-29 12:37 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-06-22 22:00 [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 01/17] cml1.bbclass: Only delay exit if the command fails Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 02/17] runqemu-internal: qemu fails to run on ext2 image Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 03/17] mtd-utils: do not stage headers in sysroot Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 04/17] gpgme: updated to 1.3.2 Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 05/17] gcc-4.6: Retire into toochain-layer Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 06/17] eglibc-2.13: Retire into toolchain layer Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 07/17] gcc: Remove csl gcc recipes Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 08/17] gzip: upgrade to 1.5 Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 09/17] sudo: upgrade to 1.8.5p2 Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 10/17] bitbake.conf/abi_version.conf: Update to use BasicHash signature generator Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 11/17] linux-firmware: update to main repo on kernel.org Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 12/17] kconfig-frontends: New recipe Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 13/17] uclibc: Fix packaging to match the new package order Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 14/17] qemu.inc: Fix packageconfig options Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 15/17] qemu-git: Move to tip of git Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 16/17] qemu_git: set empty PACKAGECONFIG Saul Wold
2012-06-22 22:00 ` [CONSOLIDATED PULL 17/17] distrodata: Fix missed VARIABLE name change Saul Wold
2012-06-24 18:18 ` [CONSOLIDATED PULL 00/17] Misc Fixes & Updates Saul Wold
2012-06-25 15:55 ` Richard Purdie
2012-06-25 21:14   ` Khem Raj
2012-06-29 12:26     ` Richard Purdie

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.