Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv into openelec-next

2025-07-24 11:16:51 +00:00 · 2011-07-12 06:24:19 +02:00 · 2011-07-12 06:24:19 +02:00 · 1352b48426
commit 1352b48426
parent 59ba5ae70b 44a00da3a7
75 changed files with 371 additions and 9912 deletions
--- a/config/functions
+++ b/config/functions
@ -145,12 +145,14 @@ strip_lto() {
  LDFLAGS=`echo $LDFLAGS | sed -e "s|-flto||"`
 }

-strip_gold() {
-  # strip out usage from GOLD linker
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||" -e "s|-fuse-linker-plugin||"`
-}
-
 strip_linker_plugin() {
  # strip out usage from linker plugin
  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||"`
 }
+
+strip_gold() {
+  # strip out usage from GOLD linker
+  strip_linker_plugin
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||"`
+}
+
--- a/config/optimize
+++ b/config/optimize
@ -1,30 +1,45 @@
+if [ "$OPTIMIZATIONS" = fast ];then
+  GCC_OPTIM="-Ofast"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  LD_OPTIM="-Wl,--as-needed"
+fi
+
 if [ "$OPTIMIZATIONS" = speed ];then
-  GCC_OPTIM="-O3"
-  LD_OPTIM=""
+  GCC_OPTIM="$GCC_OPTIM -O3"
+  GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
+  LD_OPTIM="-Wl,--as-needed"
 fi

 if [ "$OPTIMIZATIONS" = normal ];then
-  GCC_OPTIM="-O2"
+  GCC_OPTIM="$GCC_OPTIM -O2"
  LD_OPTIM=""
 fi

 if [ "$OPTIMIZATIONS" = size ];then
-  GCC_OPTIM="-Os"
+  GCC_OPTIM="$GCC_OPTIM -Os"
  LD_OPTIM=""
 fi

-GCC_OPTIM="$GCC_OPTIM -ffast-math"
-GCC_OPTIM="$GCC_OPTIM -ftree-loop-distribution"
-GCC_OPTIM="$GCC_OPTIM -floop-interchange"
-GCC_OPTIM="$GCC_OPTIM -floop-strip-mine"
-GCC_OPTIM="$GCC_OPTIM -floop-block"
-GCC_OPTIM="$GCC_OPTIM -fgraphite-identity"
-GCC_OPTIM="$GCC_OPTIM -fexcess-precision=fast"
-GCC_OPTIM="$GCC_OPTIM -flto"
+if [ "$LOOP_SUPPORT" = yes ];then
+  GCC_OPTIM="$GCC_OPTIM -ftree-loop-distribution"
+  GCC_OPTIM="$GCC_OPTIM -floop-interchange"
+  GCC_OPTIM="$GCC_OPTIM -floop-strip-mine"
+  GCC_OPTIM="$GCC_OPTIM -floop-block"
+fi

-LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
-LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
-LD_OPTIM="$LD_OPTIM -Wl,--as-needed"
+if [ "$GRAPHITE_SUPPORT" = yes ];then
+  GCC_OPTIM="$GCC_OPTIM -fgraphite-identity"
+fi
+
+if [ "$LTO_SUPPORT" = yes ];then
+  GCC_OPTIM="$GCC_OPTIM -flto"
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
+fi
+
+if [ "$GOLD_SUPPORT" = yes ];then
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
+  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
+fi

 if [ "$DEBUG" = yes ]; then
  TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
--- a/config/path
+++ b/config/path
@ -129,4 +129,3 @@ else
  exec 4>/dev/null
 fi
 INDENT_SIZE=4
-
--- a/packages/audio/alsa-lib/build
+++ b/packages/audio/alsa-lib/build
@ -22,6 +22,9 @@

 . config/options $1

+# fails to build with gcc-4.6.1
+  strip_lto
+
 CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=32 -fPIC -DPIC"

 cd $PKG_BUILD
@ -47,4 +50,5 @@ $MAKE -C src DESTDIR=$SYSROOT_PREFIX install-exec
 $MAKE -C utils DESTDIR=$SYSROOT_PREFIX install-pkgconfigDATA

 mkdir -p $SYSROOT_PREFIX/usr/share/aclocal
-  cp utils/alsa.m4 $SYSROOT_PREFIX/usr/share/aclocal
+  cp utils/alsa.m4 $SYSROOT_PREFIX/usr/share/aclocal
+
--- a/packages/compress/unrar/build
+++ b/packages/compress/unrar/build
@ -22,9 +22,6 @@

 . config/options $1

-# fails to build with GOLD linker
-  strip_gold
-
 cd $BUILD/$1
 make CC=$TARGET_CC \
     RANLIB=$TARGET_RANLIB \
--- a/packages/databases/sqlite/build
+++ b/packages/databases/sqlite/build
@ -23,6 +23,7 @@
 . config/options $1

 # sqlite fails to compile with fast-math link time optimization.
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-O3|"`
  CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||"`

 cd $PKG_BUILD
--- a/packages/devel/libplist/build
+++ b/packages/devel/libplist/build
@ -22,9 +22,6 @@

 . config/options $1

-# libplist fails to build with GOLD linker
-  strip_gold
-
 cd $PKG_BUILD
 mkdir -p build && cd build

--- a/packages/devel/pcre/build
+++ b/packages/devel/pcre/build
@ -22,6 +22,9 @@

 . config/options $1

+# fails to build with gcc-4.6.1
+  strip_lto
+
 cd $PKG_BUILD

 mkdir -p m4 && do_autoreconf
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@ -24,10 +24,7 @@

 get_graphicdrivers

-# dont use gold linker because of compiling issues
-  strip_gold
-  strip_linker_plugin
-  strip_lto # Mesa fails to build with LTO optimization
+strip_lto # Mesa fails to build with LTO optimization

 if [ "$LLVM_SUPPORT" = "yes" ]; then
  export LLVM_CONFIG="$SYSROOT_PREFIX/usr/bin/llvm-config"
--- a/packages/initramfs/sysutils/busybox-initramfs/build
+++ b/packages/initramfs/sysutils/busybox-initramfs/build
@ -31,8 +31,12 @@ else
 fi

 # optimize for size
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
  CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`

+# fails to build with gcc-4.6.1
+  strip_lto
+
 LDFLAGS="$LDFLAGS -fwhole-program"

 cd $BUILD/busybox*
--- a/packages/linux/meta
+++ b/packages/linux/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="linux"
-PKG_VERSION="3.0-rc6"
+PKG_VERSION="3.0-rc7"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/linux/patches/linux-3.0-rc6-051-call_input_sync_after_scancode_reports.patch
+++ b/packages/linux/patches/linux-3.0-rc6-051-call_input_sync_after_scancode_reports.patch
@ -1,148 +0,0 @@
-From 4035056c1fde50b6a18f32c2c9087dd09374fbe2 Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Thu, 23 Jun 2011 09:40:55 -0400
-Subject: [PATCH] [media] rc: call input_sync after scancode reports
-
-Due to commit cdda911c34006f1089f3c87b1a1f31ab3a4722f2, evdev only
-becomes readable when the buffer contains an EV_SYN/SYN_REPORT event. If
-we get a repeat or a scancode we don't have a mapping for, we never call
-input_sync, and thus those events don't get reported in a timely
-fashion.
-
-For example, take an mceusb transceiver with a default rc6 keymap. Press
-buttons on an rc5 remote while monitoring with ir-keytable, and you'll
-see nothing. Now press a button on the rc6 remote matching the keymap.
-You'll suddenly get the rc5 key scancodes, the rc6 scancode and the rc6
-key spit out all at the same time.
-
-Pressing and holding a button on a remote we do have a keymap for also
-works rather unreliably right now, due to repeat events also happening
-without a call to input_sync (we bail from ir_do_keydown before getting
-to the point where it calls input_sync).
-
-Easy fix though, just add two strategically placed input_sync calls
-right after our input_event calls for EV_MSC, and all is well again.
-Technically, we probably should have been doing this all along, its just
-that it never caused any functional difference until the referenced
-change went into the input layer.
-
-v2: rework code a bit, per Dmitry's example, so that we only call
-input_sync once per IR signal. There was another hidden bug in the code
-where we were calling input_report_key using last_keycode instead of our
-just discovered keycode, which manifested with the reordering of calling
-input_report_key and setting last_keycode.
-
-Reported-by: Stephan Raue <sraue@openelec.tv>
-CC: Stephan Raue <sraue@openelec.tv>
-CC: Mauro Carvalho Chehab <mchehab@redhat.com>
-CC: Jeff Brown <jeffbrown@android.com>
-CC: Dmitry Torokhov <dtor@mail.ru>
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
- drivers/media/rc/rc-main.c |   48 ++++++++++++++++++++++---------------------
- 1 files changed, 25 insertions(+), 23 deletions(-)
-
-diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
-index f57cd56..3186ac7 100644
--- a/drivers/media/rc/rc-main.c
-+++ b/drivers/media/rc/rc-main.c
-@@ -522,18 +522,20 @@ EXPORT_SYMBOL_GPL(rc_g_keycode_from_table);
- /**
-  * ir_do_keyup() - internal function to signal the release of a keypress
-  * @dev:	the struct rc_dev descriptor of the device
-+ * @sync:	whether or not to call input_sync
-  *
-  * This function is used internally to release a keypress, it must be
-  * called with keylock held.
-  */
-static void ir_do_keyup(struct rc_dev *dev)
-+static void ir_do_keyup(struct rc_dev *dev, bool sync)
- {
- 	if (!dev->keypressed)
- 		return;
- 
- 	IR_dprintk(1, "keyup key 0x%04x\n", dev->last_keycode);
- 	input_report_key(dev->input_dev, dev->last_keycode, 0);
-	input_sync(dev->input_dev);
-+	if (sync)
-+		input_sync(dev->input_dev);
- 	dev->keypressed = false;
- }
- 
-@@ -549,7 +551,7 @@ void rc_keyup(struct rc_dev *dev)
- 	unsigned long flags;
- 
- 	spin_lock_irqsave(&dev->keylock, flags);
-	ir_do_keyup(dev);
-+	ir_do_keyup(dev, true);
- 	spin_unlock_irqrestore(&dev->keylock, flags);
- }
- EXPORT_SYMBOL_GPL(rc_keyup);
-@@ -578,7 +580,7 @@ static void ir_timer_keyup(unsigned long cookie)
- 	 */
- 	spin_lock_irqsave(&dev->keylock, flags);
- 	if (time_is_before_eq_jiffies(dev->keyup_jiffies))
-		ir_do_keyup(dev);
-+		ir_do_keyup(dev, true);
- 	spin_unlock_irqrestore(&dev->keylock, flags);
- }
- 
-@@ -597,6 +599,7 @@ void rc_repeat(struct rc_dev *dev)
- 	spin_lock_irqsave(&dev->keylock, flags);
- 
- 	input_event(dev->input_dev, EV_MSC, MSC_SCAN, dev->last_scancode);
-+	input_sync(dev->input_dev);
- 
- 	if (!dev->keypressed)
- 		goto out;
-@@ -622,29 +625,28 @@ EXPORT_SYMBOL_GPL(rc_repeat);
- static void ir_do_keydown(struct rc_dev *dev, int scancode,
- 			  u32 keycode, u8 toggle)
- {
-	input_event(dev->input_dev, EV_MSC, MSC_SCAN, scancode);
-
-	/* Repeat event? */
-	if (dev->keypressed &&
-	    dev->last_scancode == scancode &&
-	    dev->last_toggle == toggle)
-		return;
-+	bool new_event = !dev->keypressed ||
-+			 dev->last_scancode != scancode ||
-+			 dev->last_toggle != toggle;
- 
-	/* Release old keypress */
-	ir_do_keyup(dev);
-+	if (new_event && dev->keypressed)
-+		ir_do_keyup(dev, false);
- 
-	dev->last_scancode = scancode;
-	dev->last_toggle = toggle;
-	dev->last_keycode = keycode;
-+	input_event(dev->input_dev, EV_MSC, MSC_SCAN, scancode);
- 
-	if (keycode == KEY_RESERVED)
-		return;
-+	if (new_event && keycode != KEY_RESERVED) {
-+		/* Register a keypress */
-+		dev->keypressed = true;
-+		dev->last_scancode = scancode;
-+		dev->last_toggle = toggle;
-+		dev->last_keycode = keycode;
-+
-+		IR_dprintk(1, "%s: key down event, "
-+			   "key 0x%04x, scancode 0x%04x\n",
-+			   dev->input_name, keycode, scancode);
-+		input_report_key(dev->input_dev, keycode, 1);
-+	}
- 
-	/* Register a keypress */
-	dev->keypressed = true;
-	IR_dprintk(1, "%s: key down event, key 0x%04x, scancode 0x%04x\n",
-		   dev->input_name, keycode, scancode);
-	input_report_key(dev->input_dev, dev->last_keycode, 1);
- 	input_sync(dev->input_dev);
- }
- 
-- 
-1.7.4.4
-
--- a/packages/linux/patches/linux-3.0-rc6-110-drm_nouveau_upstream-20110626.1.patch
+++ b/packages/linux/patches/linux-3.0-rc6-110-drm_nouveau_upstream-20110626.1.patch
--- a/packages/linux/patches/linux-3.0-rc7-000_crosscompile.patch
+++ b/packages/linux/patches/linux-3.0-rc7-000_crosscompile.patch
--- a/packages/linux/patches/linux-3.0-rc7-003-no_dev_console.patch
+++ b/packages/linux/patches/linux-3.0-rc7-003-no_dev_console.patch
--- a/packages/linux/patches/linux-3.0-rc7-004_lower_undefined_mode_timeout.patch
+++ b/packages/linux/patches/linux-3.0-rc7-004_lower_undefined_mode_timeout.patch
--- a/packages/linux/patches/linux-3.0-rc7-006_enable_utf8.patch
+++ b/packages/linux/patches/linux-3.0-rc7-006_enable_utf8.patch
--- a/packages/linux/patches/linux-3.0-rc7-007_die_floppy_die.patch
+++ b/packages/linux/patches/linux-3.0-rc7-007_die_floppy_die.patch
--- a/packages/linux/patches/linux-3.0-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch
+++ b/packages/linux/patches/linux-3.0-rc7-008-hda_intel_prealloc_4mb_dmabuffer.patch
--- a/packages/linux/patches/linux-3.0-rc7-009_disable_i8042_check_on_apple_mac.patch
+++ b/packages/linux/patches/linux-3.0-rc7-009_disable_i8042_check_on_apple_mac.patch
--- a/packages/linux/patches/linux-3.0-rc7-050_add_appleir_usb_driver.patch
+++ b/packages/linux/patches/linux-3.0-rc7-050_add_appleir_usb_driver.patch
--- a/packages/linux/patches/linux-3.0-rc7-052-aureal_remote_quirk-0.1.patch
+++ b/packages/linux/patches/linux-3.0-rc7-052-aureal_remote_quirk-0.1.patch
--- a/packages/linux/patches/linux-3.0-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch
+++ b/packages/linux/patches/linux-3.0-rc7-053_ati-remote_all_keys_and_keychange-0.1.patch
--- a/packages/linux/patches/linux-3.0-rc7-058-add_rtl2832u_dvb-usb_driver-0.1.patch
+++ b/packages/linux/patches/linux-3.0-rc7-058-add_rtl2832u_dvb-usb_driver-0.1.patch
--- a/packages/linux/patches/linux-3.0-rc7-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
+++ b/packages/linux/patches/linux-3.0-rc7-059-rtl2832u_change_value_of_USB_PID_GTEK_WARM-0.1.patch
--- a/packages/linux/patches/linux-3.0-rc7-071-silence_i915_agp-module-0.1.patch
+++ b/packages/linux/patches/linux-3.0-rc7-071-silence_i915_agp-module-0.1.patch
--- a/packages/linux/patches/linux-3.0-rc7-322-omap4_pandaboard_fix_dvi_support-0.1.patch
+++ b/packages/linux/patches/linux-3.0-rc7-322-omap4_pandaboard_fix_dvi_support-0.1.patch
--- a/packages/linux/patches/linux-3.0-rc7-716_mm-zero_swappiness.patch
+++ b/packages/linux/patches/linux-3.0-rc7-716_mm-zero_swappiness.patch
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@ -78,8 +78,6 @@ fi

 # xbmc (ffmpeg) fails to build with LTO optimization
  strip_lto
-  strip_gold
-  strip_linker_plugin

 # dont use some optimizations because of problems
 # this fixes problems with faac implementation of ffmpeg
--- a/packages/multimedia/libbluray/meta
+++ b/packages/multimedia/libbluray/meta
@ -19,12 +19,12 @@
 ################################################################################

 PKG_NAME="libbluray"
-PKG_VERSION="20739ed"
+PKG_VERSION="51d7d60"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.videolan.org/developers/libbluray.html"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
--- a/packages/multimedia/libbluray/patches/libbluray-20739ed-configure.patch
+++ b/packages/multimedia/libbluray/patches/libbluray-20739ed-configure.patch
@ -1,12 +0,0 @@
-diff -Naur libbluray-894441d1931e25f6250ae2d15d174d0266c98462-old/configure.ac libbluray-894441d1931e25f6250ae2d15d174d0266c98462-new/configure.ac
--- libbluray-894441d1931e25f6250ae2d15d174d0266c98462-old/configure.ac	2010-12-14 09:07:24.000000000 -0800
-+++ libbluray-894441d1931e25f6250ae2d15d174d0266c98462-new/configure.ac	2010-12-14 09:08:31.000000000 -0800
-@@ -33,7 +33,7 @@
- using_normal_linking="Using libaacs and libbdplus via normal linking."
- 
- # configure options
-AC_ARG_ENABLE([dlopen-crypto-libs],
-+AC_ARG_WITH([dlopen-crypto-libs],
-   [AS_HELP_STRING([--with-dlopen-crypto-libs],
-   [use libaacs and libbdplus via dlopen (default is auto)])],
-   [use_dlopen_crypto_libs=$withval],
--- a/packages/network/libnfsidmap/build
+++ b/packages/network/libnfsidmap/build
@ -1,35 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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 Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
-
-make
-
-$MAKEINSTALL
--- a/packages/network/libnfsidmap/meta
+++ b/packages/network/libnfsidmap/meta
@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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 Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libnfsidmap"
-PKG_VERSION="0.24"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="OSS"
-PKG_SITE="http://www.citi.umich.edu/projects/nfsv4/linux/"
-PKG_URL="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/$PKG_NAME-$PKG_VERSION.tar.gz"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="libnfsidmap: Library to help mapping id's, mainly for NFSv4"
-PKG_LONGDESC="Library to help mapping id's, mainly for NFSv4."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
--- a/packages/network/libtirpc/build
+++ b/packages/network/libtirpc/build
@ -1,36 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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 Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-cd $PKG_BUILD
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
-            --disable-gss \
-            --with-gnu-ld
-
-make
-$MAKEINSTALL
--- a/packages/network/libtirpc/install
+++ b/packages/network/libtirpc/install
@ -1,30 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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 Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/usr/lib
-  cp $PKG_BUILD/src/.libs/*.so* $INSTALL/usr/lib
-
-mkdir -p $INSTALL/etc
-  cp $PKG_BUILD/doc/etc_netconfig $INSTALL/etc/netconfig
-
--- a/packages/network/libtirpc/meta
+++ b/packages/network/libtirpc/meta
@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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 Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="libtirpc"
-PKG_VERSION="0.2.2"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="https://sourceforge.net/projects/libtirpc/"
-PKG_URL="https://downloads.sourceforge.net/project/libtirpc/libtirpc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS=""
-PKG_BUILD_DEPENDS="toolchain"
-PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="libtirpc: Transport Independent RPC Library"
-PKG_LONGDESC="Libtirpc is a port of Suns Transport-Independent RPC library to Linux. It's being developed by the Bull GNU/Linux NFSv4 project."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
--- a/packages/network/netmount/config/netmount.conf.sample
+++ b/packages/network/netmount/config/netmount.conf.sample
@ -40,4 +40,4 @@
 # afp | 192.168.1.44/videos | /storage/mount/videos | <username>:<password>
 # cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
 # cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
-# nfs | 192.168.1.44:/videos | /storage/mount/videos | <optional mount options, comma seperated>
+# nfs | 192.168.1.44:/videos | /storage/mount/videos | ro,tcp,timeo=600
--- a/packages/network/netmount/meta
+++ b/packages/network/netmount/meta
@ -25,7 +25,7 @@ PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.openelec.tv"
 PKG_URL=""
-PKG_DEPENDS="afpfs-ng cifs-utils nfs-utils sshfs-fuse connman"
+PKG_DEPENDS="afpfs-ng cifs-utils sshfs-fuse connman"
 PKG_BUILD_DEPENDS="toolchain"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
--- a/packages/network/netmount/scripts/netmount
+++ b/packages/network/netmount/scripts/netmount
@ -46,7 +46,7 @@ IFS="
        mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" &
        ;;
      nfs)
-        mount.nfs "$SHARE" "$MOUNTPOINT" -o nolock,"$OPTIONS" &
+        mount "$SHARE" "$MOUNTPOINT" -o nolock,"$OPTIONS" &
        ;;
    esac
  done
--- a/packages/network/netstatus/build
+++ b/packages/network/netstatus/build
@ -23,6 +23,9 @@

 . config/options $1

+# dont use some optimizations because of problems
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
+
 cd $PKG_BUILD

 make
--- a/packages/network/nfs-utils/build
+++ b/packages/network/nfs-utils/build
@ -1,59 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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 Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-CFLAGS_FOR_BUILD="$HOST_CFLAGS"
-CXXFLAGS_FOR_BUILD="$HOST_CXXFLAGS"
-CPPFLAGS_FOR_BUILD="$HOST_CPPFLAGS"
-LDFLAGS_FOR_BUILD="$HOST_LDFLAGS"
-
-cd $PKG_BUILD
-libblkid_is_recent="yes" \
-./configure --host=$TARGET_NAME \
-            --build=$HOST_NAME \
-            --prefix=/usr \
-            --sysconfdir=/etc \
-            --disable-static \
-            --enable-shared \
-            --with-sysroot="$SYSROOT_PREFIX/usr" \
-            --enable-nfsv3 \
-            --enable-nfsv4 \
-            --enable-nfsv41 \
-            --disable-gss \
-            --disable-kprefix \
-            --enable-uuid \
-            --enable-mount \
-            --enable-tirpc \
-            --with-tirpcinclude="$SYSROOT_PREFIX/usr/include/tirpc" \
-            --enable-ipv6 \
-            --disable-mountconfig \
-            --without-tcp-wrappers \
-            --without-krb5 \
-            --disable-caps \
-            --enable-largefile \
-            --with-gnu-ld
-
-make -C support
-make -C utils
-
-sed -e "s,#!/bin/sh -p,#!/bin/sh,g" -i utils/statd/start-statd
--- a/packages/network/nfs-utils/config/protocols
+++ b/packages/network/nfs-utils/config/protocols
@ -1,154 +0,0 @@
-# /etc/protocols:
-# $Id: protocols,v 1.5 2006/10/11 15:39:11 pknirsch Exp $
-#
-# Internet (IP) protocols
-#
-#	from: @(#)protocols	5.1 (Berkeley) 4/17/89
-#
-# Updated for NetBSD based on RFC 1340, Assigned Numbers (July 1992).
-#
-# See also http://www.iana.org/assignments/protocol-numbers
-
-ip	0	IP		# internet protocol, pseudo protocol number
-hopopt	0	HOPOPT		# hop-by-hop options for ipv6
-icmp	1	ICMP		# internet control message protocol
-igmp	2	IGMP		# internet group management protocol
-ggp	3	GGP		# gateway-gateway protocol
-ipencap	4	IP-ENCAP	# IP encapsulated in IP (officially ``IP'')
-st	5	ST		# ST datagram mode
-tcp	6	TCP		# transmission control protocol
-cbt	7	CBT		# CBT, Tony Ballardie <A.Ballardie@cs.ucl.ac.uk>
-egp	8	EGP		# exterior gateway protocol
-igp	9	IGP		# any private interior gateway (Cisco: for IGRP)
-bbn-rcc	10	BBN-RCC-MON	# BBN RCC Monitoring
-nvp	11	NVP-II		# Network Voice Protocol
-pup	12	PUP		# PARC universal packet protocol
-argus	13	ARGUS		# ARGUS
-emcon	14	EMCON		# EMCON
-xnet	15	XNET		# Cross Net Debugger
-chaos	16	CHAOS		# Chaos
-udp	17	UDP		# user datagram protocol
-mux	18	MUX		# Multiplexing protocol
-dcn	19	DCN-MEAS	# DCN Measurement Subsystems
-hmp	20	HMP		# host monitoring protocol
-prm	21	PRM		# packet radio measurement protocol
-xns-idp	22	XNS-IDP		# Xerox NS IDP
-trunk-1	23	TRUNK-1		# Trunk-1
-trunk-2	24	TRUNK-2		# Trunk-2
-leaf-1	25	LEAF-1		# Leaf-1
-leaf-2	26	LEAF-2		# Leaf-2
-rdp	27	RDP		# "reliable datagram" protocol
-irtp	28	IRTP		# Internet Reliable Transaction Protocol
-iso-tp4	29	ISO-TP4		# ISO Transport Protocol Class 4
-netblt	30	NETBLT		# Bulk Data Transfer Protocol
-mfe-nsp	31	MFE-NSP		# MFE Network Services Protocol
-merit-inp	32	MERIT-INP	# MERIT Internodal Protocol
-dccp	33	DCCP		# Datagram Congestion Control Protocol  
-3pc	34	3PC		# Third Party Connect Protocol
-idpr	35	IDPR		# Inter-Domain Policy Routing Protocol
-xtp	36	XTP		# Xpress Tranfer Protocol
-ddp	37	DDP		# Datagram Delivery Protocol
-idpr-cmtp	38	IDPR-CMTP	# IDPR Control Message Transport Proto
-tp++	39	TP++		# TP++ Transport Protocol
-il	40	IL		# IL Transport Protocol
-ipv6	41	IPv6		# IPv6
-sdrp	42	SDRP		# Source Demand Routing Protocol
-ipv6-route	43	IPv6-Route 	# Routing Header for IPv6
-ipv6-frag	44	IPv6-Frag	# Fragment Header for IPv6
-idrp	45	IDRP		# Inter-Domain Routing Protocol
-rsvp	46	RSVP		# Resource ReSerVation Protocol
-gre	47	GRE		# Generic Routing Encapsulation
-dsr	48	DSR		# Dynamic Source Routing Protocol
-bna	49	BNA		# BNA
-esp	50	ESP		# Encap Security Payload
-ah	51	AH		# Authentication Header
-i-nlsp	52	I-NLSP		# Integrated Net Layer Security TUBA
-swipe	53	SWIPE		# IP with Encryption
-narp	54	NARP		# NBMA Address Resolution Protocol
-mobile	55	MOBILE		# IP Mobility
-tlsp	56	TLSP		# Transport Layer Security Protocol
-skip	57	SKIP		# SKIP
-ipv6-icmp	58	IPv6-ICMP	# ICMP for IPv6
-ipv6-nonxt	59	IPv6-NoNxt	# No Next Header for IPv6
-ipv6-opts	60	IPv6-Opts	# Destination Options for IPv6
-#	61			# any host internal protocol
-cftp	62	CFTP		# CFTP
-#	63			# any local network
-sat-expak	64	SAT-EXPAK	# SATNET and Backroom EXPAK
-kryptolan	65	KRYPTOLAN	# Kryptolan
-rvd	66	RVD		# MIT Remote Virtual Disk Protocol
-ippc	67	IPPC		# Internet Pluribus Packet Core
-#	68			# any distributed file system
-sat-mon	69	SAT-MON		# SATNET Monitoring
-visa	70	VISA		# VISA Protocol
-ipcv	71	IPCV		# Internet Packet Core Utility
-cpnx	72	CPNX		# Computer Protocol Network Executive
-cphb	73	CPHB		# Computer Protocol Heart Beat
-wsn	74	WSN		# Wang Span Network
-pvp	75	PVP		# Packet Video Protocol
-br-sat-mon	76	BR-SAT-MON	# Backroom SATNET Monitoring
-sun-nd	77	SUN-ND		# SUN ND PROTOCOL-Temporary
-wb-mon	78	WB-MON		# WIDEBAND Monitoring
-wb-expak	79	WB-EXPAK	# WIDEBAND EXPAK
-iso-ip	80	ISO-IP		# ISO Internet Protocol
-vmtp	81	VMTP		# Versatile Message Transport
-secure-vmtp	82	SECURE-VMTP	# SECURE-VMTP
-vines	83	VINES		# VINES
-ttp	84	TTP		# TTP
-nsfnet-igp	85	NSFNET-IGP	# NSFNET-IGP
-dgp	86	DGP		# Dissimilar Gateway Protocol
-tcf	87	TCF		# TCF
-eigrp	88	EIGRP		# Enhanced Interior Routing Protocol (Cisco)
-ospf	89	OSPFIGP		# Open Shortest Path First IGP
-sprite-rpc	90	Sprite-RPC	# Sprite RPC Protocol
-larp	91	LARP		# Locus Address Resolution Protocol
-mtp	92	MTP		# Multicast Transport Protocol
-ax.25	93	AX.25		# AX.25 Frames
-ipip	94	IPIP		# Yet Another IP encapsulation
-micp	95	MICP		# Mobile Internetworking Control Pro.
-scc-sp	96	SCC-SP		# Semaphore Communications Sec. Pro.
-etherip	97	ETHERIP		# Ethernet-within-IP Encapsulation
-encap	98	ENCAP		# Yet Another IP encapsulation
-#	99			# any private encryption scheme
-gmtp	100	GMTP		# GMTP
-ifmp	101	IFMP		# Ipsilon Flow Management Protocol
-pnni	102	PNNI		# PNNI over IP
-pim	103	PIM		# Protocol Independent Multicast
-aris	104	ARIS		# ARIS
-scps	105	SCPS		# SCPS
-qnx	106	QNX		# QNX
-a/n	107	A/N		# Active Networks
-ipcomp	108	IPComp		# IP Payload Compression Protocol
-snp	109	SNP		# Sitara Networks Protocol
-compaq-peer	110	Compaq-Peer	# Compaq Peer Protocol
-ipx-in-ip	111	IPX-in-IP	# IPX in IP
-vrrp	112	VRRP		# Virtual Router Redundancy Protocol
-pgm	113	PGM		# PGM Reliable Transport Protocol
-#	114			# any 0-hop protocol
-l2tp	115	L2TP		# Layer Two Tunneling Protocol
-ddx	116	DDX		# D-II Data Exchange
-iatp	117	IATP		# Interactive Agent Transfer Protocol
-stp	118	STP		# Schedule Transfer
-srp	119	SRP		# SpectraLink Radio Protocol
-uti	120	UTI		# UTI
-smp	121	SMP		# Simple Message Protocol
-sm	122	SM		# SM
-ptp	123	PTP		# Performance Transparency Protocol
-isis	124	ISIS		# ISIS over IPv4
-fire	125	FIRE
-crtp	126	CRTP		# Combat Radio Transport Protocol
-crdup	127	CRUDP		# Combat Radio User Datagram
-sscopmce	128	SSCOPMCE
-iplt	129	IPLT
-sps	130	SPS		# Secure Packet Shield
-pipe	131	PIPE		# Private IP Encapsulation within IP
-sctp	132	SCTP		# Stream Control Transmission Protocol
-fc	133	FC		# Fibre Channel
-rsvp-e2e-ignore	134	RSVP-E2E-IGNORE
-#	135			# Mobility Header
-udplite	136	UDPLite
-mpls-in-ip	137	MPLS-in-IP
-#   138-252 Unassigned                                       [IANA]
-#   253     Use for experimentation and testing           [RFC3692]
-#   254     Use for experimentation and testing           [RFC3692]
-#   255                 Reserved                             [IANA]
--- a/packages/network/nfs-utils/install
+++ b/packages/network/nfs-utils/install
@ -1,37 +0,0 @@
-#!/bin/sh
-
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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 Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-. config/options $1
-
-mkdir -p $INSTALL/sbin
-  cp $PKG_BUILD/utils/mount/mount.nfs $INSTALL/sbin/
-    ln -sf mount.nfs $INSTALL/sbin/mount.nfs4
-    ln -sf mount.nfs $INSTALL/sbin/umount.nfs
-    ln -sf mount.nfs $INSTALL/sbin/umount.nfs4
-
-mkdir -p $INSTALL/usr/sbin
-  cp $PKG_BUILD/utils/statd/statd $INSTALL/usr/sbin/rpc.statd
-  cp $PKG_BUILD/utils/statd/start-statd $INSTALL/usr/sbin/
-    chmod +x $INSTALL/usr/sbin/start-statd
-
-mkdir -p $INSTALL/etc
-  cp $PKG_DIR/config/protocols $INSTALL/etc
--- a/packages/network/nfs-utils/meta
+++ b/packages/network/nfs-utils/meta
@ -1,36 +0,0 @@
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
-#
-#  This Program 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 Program 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 OpenELEC.tv; see the file COPYING.  If not, write to
-#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="nfs-utils"
-PKG_VERSION="1.2.3"
-PKG_REV="1"
-PKG_ARCH="any"
-PKG_LICENSE="GPL"
-PKG_SITE="http://nfs.sourceforge.net/"
-PKG_URL="$SOURCEFORGE_SRC/nfs/nfs-utils/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_DEPENDS="libevent libnfsidmap libtirpc util-linux"
-PKG_BUILD_DEPENDS="toolchain libevent libnfsidmap libtirpc util-linux"
-PKG_PRIORITY="optional"
-PKG_SECTION="network"
-PKG_SHORTDESC="nfs-utils: Linux NFS client and server utilities"
-PKG_LONGDESC="The nfs-utils package provides a daemon for the kernel NFS server and related tools, which provides a much higher level of performance than the traditional Linux NFS server used by most users. This package also contains the showmount program. Showmount queries the mount daemon on a remote host for information about the NFS (Network File System) server on the remote host. For example, showmount can display the clients which are mounted on that host."
-PKG_IS_ADDON="no"
-
-PKG_AUTORECONF="yes"
--- a/packages/sysutils/busybox/build
+++ b/packages/sysutils/busybox/build
@ -28,7 +28,11 @@ else
  BUSYBOX_CFG_FILE=$ROOT/$PKG_DIR/config/$1.conf
 fi

+# fails to build with gcc-4.6.1
+  strip_lto
+
 # optimize for size
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-Os|"`
  CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-Os|"`

 LDFLAGS="$LDFLAGS -fwhole-program"
--- a/packages/sysutils/busybox/config/busybox.conf
+++ b/packages/sysutils/busybox/config/busybox.conf
@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.18.4
-# Fri May  6 21:33:25 2011
+# Busybox version: 1.18.5
+# Tue Jul 12 05:24:10 2011
 #
 CONFIG_HAVE_DOT_CONFIG=y

@ -49,7 +49,7 @@ CONFIG_FEATURE_SUID=y
 # CONFIG_FEATURE_PREFER_APPLETS is not set
 CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe"
 CONFIG_FEATURE_SYSLOG=y
-# CONFIG_FEATURE_HAVE_RPC is not set
+CONFIG_FEATURE_HAVE_RPC=y

 #
 # Build Options
@ -558,14 +558,14 @@ CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y
 CONFIG_MKSWAP=y
 CONFIG_FEATURE_MKSWAP_UUID=y
 CONFIG_MORE=y
-# CONFIG_MOUNT is not set
-# CONFIG_FEATURE_MOUNT_FAKE is not set
-# CONFIG_FEATURE_MOUNT_VERBOSE is not set
-# CONFIG_FEATURE_MOUNT_HELPERS is not set
-# CONFIG_FEATURE_MOUNT_LABEL is not set
-# CONFIG_FEATURE_MOUNT_NFS is not set
+CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_FAKE=y
+CONFIG_FEATURE_MOUNT_VERBOSE=y
+CONFIG_FEATURE_MOUNT_HELPERS=y
+CONFIG_FEATURE_MOUNT_LABEL=y
+CONFIG_FEATURE_MOUNT_NFS=y
 # CONFIG_FEATURE_MOUNT_CIFS is not set
-# CONFIG_FEATURE_MOUNT_FLAGS is not set
+CONFIG_FEATURE_MOUNT_FLAGS=y
 # CONFIG_FEATURE_MOUNT_FSTAB is not set
 # CONFIG_PIVOT_ROOT is not set
 CONFIG_RDATE=y
@ -578,10 +578,14 @@ CONFIG_RDATE=y
 # CONFIG_SWAPONOFF is not set
 # CONFIG_FEATURE_SWAPON_PRI is not set
 # CONFIG_SWITCH_ROOT is not set
-# CONFIG_UMOUNT is not set
-# CONFIG_FEATURE_UMOUNT_ALL is not set
-# CONFIG_FEATURE_MOUNT_LOOP is not set
-# CONFIG_FEATURE_MOUNT_LOOP_CREATE is not set
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_UMOUNT_ALL=y
+
+#
+# Common options for mount/umount
+#
+CONFIG_FEATURE_MOUNT_LOOP=y
+CONFIG_FEATURE_MOUNT_LOOP_CREATE=y
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
 CONFIG_VOLUMEID=y

--- a/packages/sysutils/libhid/build
+++ b/packages/sysutils/libhid/build
@ -28,6 +28,7 @@ cd $PKG_BUILD
            --prefix=/usr \
            --enable-shared \
            --disable-static \
+            --disable-werror \
            --enable-swig \

 make
--- a/packages/sysutils/parted/build
+++ b/packages/sysutils/parted/build
@ -22,9 +22,6 @@

 . config/options $1

-# parted fails to build with GOLD linker
-  strip_gold
-
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
            --build=$HOST_NAME \
--- a/packages/sysutils/udisks/patches/udisks-1.0.3-01-busybox_mount-0.1.patch
+++ b/packages/sysutils/udisks/patches/udisks-1.0.3-01-busybox_mount-0.1.patch
@ -0,0 +1,12 @@
+diff -Naur udisks-1.0.2/src/device.c udisks-1.0.2.patch/src/device.c
+--- udisks-1.0.2/src/device.c	2010-11-06 17:41:23.000000000 +0100
+++ udisks-1.0.2.patch/src/device.c	2011-03-08 23:25:46.382977610 +0100
+@@ -6307,7 +6307,7 @@
+   options = prepend_default_mount_options (fsmo, caller_uid, given_options);
+ 
+   /* validate mount options and check for authorizations */
+-  s = g_string_new ("uhelper=udisks,nodev,nosuid");
+  s = g_string_new ("nodev,nosuid");
+   for (n = 0; options[n] != NULL; n++)
+     {
+       const char *option = options[n];
--- a/packages/sysutils/util-linux/build
+++ b/packages/sysutils/util-linux/build
@ -32,7 +32,7 @@ gt_cv_func_gnugettext1_libintl=no \
            --disable-static \
            --disable-gtk-doc \
            --enable-tls \
-            --enable-mount \
+            --disable-mount \
            --disable-fsck \
            --enable-libuuid \
            --enable-uuidd \
@ -76,8 +76,6 @@ gt_cv_func_gnugettext1_libintl=no \
            --without-selinux \
            --without-audit

-make -C mount mount
-make -C mount umount
 make -C fsck fsck
 make -C mount swapon
 make -C misc-utils blkid
--- a/packages/sysutils/util-linux/install
+++ b/packages/sysutils/util-linux/install
@ -22,10 +22,6 @@

 . config/options $1

-mkdir -p $INSTALL/bin
-  cp $PKG_BUILD/mount/.libs/mount $INSTALL/bin
-  cp $PKG_BUILD/mount/.libs/umount $INSTALL/bin
-
 mkdir -p $INSTALL/sbin
  cp $PKG_BUILD/misc-utils/.libs/blkid $INSTALL/sbin
  cp $PKG_BUILD/sys-utils/fstrim $INSTALL/sbin
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@ -25,10 +25,15 @@
 strip_lto  # Fails to compile with GCC's link time optimization.
 strip_gold # Fails to compile using the gold linker.

-# Filter out some problematic CFLAGS
+# Filter out some problematic *FLAGS
  CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||"`
+  CFLAGS=`echo $CFLAGS | sed -e "s|-Ofast|-O2|"`
  CFLAGS=`echo $CFLAGS | sed -e "s|-O.|-O2|"`

+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-ffast-math||"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-Ofast|-O2|"`
+  LDFLAGS=`echo $LDFLAGS | sed -e "s|-O.|-O2|"`
+
 # set some CFLAGS we need
  CFLAGS="$CFLAGS -g -fno-stack-protector"

--- a/packages/toolchain/lang/gcc-core/build
+++ b/packages/toolchain/lang/gcc-core/build
@ -49,9 +49,11 @@ mkdir -p objdir-$1 && cd objdir-$1
             --disable-__cxa_atexit \
             --disable-libada \
             --disable-libmudflap \
-             --enable-gold=both/ld \
+             --enable-gold=yes \
+             --enable-ld=default \
             --enable-plugin \
             --enable-lto \
+             --disable-libquadmath \
             --disable-libssp \
             --disable-libgomp \
             --disable-shared \
--- a/packages/toolchain/lang/gcc-final/build
+++ b/packages/toolchain/lang/gcc-final/build
@ -49,9 +49,11 @@ mkdir -p objdir-$1 && cd objdir-$1
             --disable-libmudflap \
             --disable-libssp \
             --disable-multilib \
-             --enable-gold=both/ld \
+             --enable-gold=yes \
+             --enable-ld=default \
             --enable-plugin \
             --enable-lto \
+             --disable-libquadmath \
             --enable-tls \
             --enable-shared \
             --enable-c99 \
--- a/packages/toolchain/lang/gcc/meta
+++ b/packages/toolchain/lang/gcc/meta
@ -19,7 +19,7 @@
 ################################################################################

 PKG_NAME="gcc"
-PKG_VERSION="4.5.3"
+PKG_VERSION="4.6.1"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
--- a/packages/toolchain/lang/gcc/patches/gcc-4.5.3-fix_undefined_references_with_lto-0.1.patch
+++ b/packages/toolchain/lang/gcc/patches/gcc-4.5.3-fix_undefined_references_with_lto-0.1.patch
@ -1,126 +0,0 @@
-diff -Naur gcc-4.5-20101118/gcc/ChangeLog gcc-4.5-20101118.patch/gcc/ChangeLog
-diff -Naur gcc-4.5-20101118/gcc/doc/invoke.texi gcc-4.5-20101118.patch/gcc/doc/invoke.texi
--- gcc-4.5-20101118/gcc/doc/invoke.texi	2010-09-08 19:36:40.000000000 +0200
-+++ gcc-4.5-20101118.patch/gcc/doc/invoke.texi	2010-11-26 03:05:14.029157093 +0100
-@@ -9382,6 +9382,18 @@
- %@{fgnu-runtime:%:replace-outfile(-lobjc -lobjc-gnu)@}
- @end smallexample
- 
-+@item @code{pass-through-libs}
-+The @code{pass-through-libs} spec function takes any number of arguments.  It
-+finds any @option{-l} options and any non-options ending in ".a" (which it
-+assumes are the names of linker input library archive files) and returns a
-+result containing all the found arguments each prepended by
-+@option{-plugin-opt=-pass-through=} and joined by spaces.  This list is
-+intended to be passed to the LTO linker plugin.
-+
-+@smallexample
-+%:pass-through-libs(%G %L %G)
-+@end smallexample
-+
- @item @code{print-asm-header}
- The @code{print-asm-header} function takes no arguments and simply
- prints a banner like:
-diff -Naur gcc-4.5-20101118/gcc/gcc.c gcc-4.5-20101118.patch/gcc/gcc.c
--- gcc-4.5-20101118/gcc/gcc.c	2010-04-18 19:46:08.000000000 +0200
-+++ gcc-4.5-20101118.patch/gcc/gcc.c	2010-11-26 03:03:47.120008881 +0100
-@@ -407,6 +407,7 @@
- static const char *compare_debug_dump_opt_spec_function (int, const char **);
- static const char *compare_debug_self_opt_spec_function (int, const char **);
- static const char *compare_debug_auxbase_opt_spec_function (int, const char **);
-+static const char *pass_through_libs_spec_func (int, const char **);
- 
- /* The Specs Language
- 
-@@ -781,8 +782,7 @@
-     -plugin %(linker_plugin_file) \
-     -plugin-opt=%(lto_wrapper) \
-     -plugin-opt=%(lto_gcc) \
-    %{static|static-libgcc:-plugin-opt=-pass-through=%(lto_libgcc)}	\
-    %{static:-plugin-opt=-pass-through=-lc}	\
-+    %{!nostdlib:%{!nodefaultlibs:%:pass-through-libs(%(link_gcc_c_sequence))}} \
-     %{O*:-plugin-opt=-O%*} \
-     %{w:-plugin-opt=-w} \
-     %{f*:-plugin-opt=-f%*} \
-@@ -841,7 +841,6 @@
- static const char *linker_plugin_file_spec = "";
- static const char *lto_wrapper_spec = "";
- static const char *lto_gcc_spec = "";
-static const char *lto_libgcc_spec = "";
- static const char *link_command_spec = LINK_COMMAND_SPEC;
- static const char *link_libgcc_spec = LINK_LIBGCC_SPEC;
- static const char *startfile_prefix_spec = STARTFILE_PREFIX_SPEC;
-@@ -1688,7 +1687,6 @@
-   INIT_STATIC_SPEC ("linker_plugin_file",	&linker_plugin_file_spec),
-   INIT_STATIC_SPEC ("lto_wrapper",		&lto_wrapper_spec),
-   INIT_STATIC_SPEC ("lto_gcc",			&lto_gcc_spec),
-  INIT_STATIC_SPEC ("lto_libgcc",		&lto_libgcc_spec),
-   INIT_STATIC_SPEC ("link_libgcc",		&link_libgcc_spec),
-   INIT_STATIC_SPEC ("md_exec_prefix",		&md_exec_prefix),
-   INIT_STATIC_SPEC ("md_startfile_prefix",	&md_startfile_prefix),
-@@ -1730,6 +1728,7 @@
-   { "compare-debug-dump-opt",	compare_debug_dump_opt_spec_function },
-   { "compare-debug-self-opt",	compare_debug_self_opt_spec_function },
-   { "compare-debug-auxbase-opt", compare_debug_auxbase_opt_spec_function },
-+  { "pass-through-libs",	pass_through_libs_spec_func },
- #ifdef EXTRA_SPEC_FUNCTIONS
-   EXTRA_SPEC_FUNCTIONS
- #endif
-@@ -7580,10 +7579,6 @@
- 	  if (!linker_plugin_file_spec)
- 	    fatal ("-fuse-linker-plugin, but liblto_plugin.so not found");
- 
-	  lto_libgcc_spec = find_a_file (&startfile_prefixes, "libgcc.a",
-					 R_OK, true);
-	  if (!lto_libgcc_spec)
-	    fatal ("could not find libgcc.a");
- 	}
-       lto_gcc_spec = argv[0];
- 
-@@ -8977,3 +8972,46 @@
- 
-   return name;
- }
-+
-+/* %:pass-through-libs spec function.  Finds all -l options and input
-+   file names in the lib spec passed to it, and makes a list of them
-+   prepended with the plugin option to cause them to be passed through
-+   to the final link after all the new object files have been added.  */
-+
-+const char *
-+pass_through_libs_spec_func (int argc, const char **argv)
-+{
-+  char *prepended = xstrdup (" ");
-+  int n;
-+  /* Shlemiel the painter's algorithm.  Innately horrible, but at least
-+     we know that there will never be more than a handful of strings to
-+     concat, and it's only once per run, so it's not worth optimising.  */
-+  for (n = 0; n < argc; n++)
-+    {
-+      char *old = prepended;
-+      /* Anything that isn't an option is a full path to an output
-+         file; pass it through if it ends in '.a'.  Among options,
-+	 pass only -l.  */
-+      if (argv[n][0] == '-' && argv[n][1] == 'l')
-+	{
-+	  const char *lopt = argv[n] + 2;
-+	  /* Handle both joined and non-joined -l options.  If for any
-+	     reason there's a trailing -l with no joined or following
-+	     arg just discard it.  */
-+	  if (!*lopt && ++n >= argc)
-+	    break;
-+	  else if (!*lopt)
-+	    lopt = argv[n];
-+	  prepended = concat (prepended, "-plugin-opt=-pass-through=-l",
-+		lopt, " ", NULL);
-+	}
-+      else if (!strcmp (".a", argv[n] + strlen (argv[n]) - 2))
-+	{
-+	  prepended = concat (prepended, "-plugin-opt=-pass-through=",
-+		argv[n], " ", NULL);
-+	}
-+      if (prepended != old)
-+	free (old);
-+    }
-+  return prepended;
-+}
--- a/packages/toolchain/lang/gcc/patches/gcc-4.6.1-bfd_and_gold.patch
+++ b/packages/toolchain/lang/gcc/patches/gcc-4.6.1-bfd_and_gold.patch
@ -1,99 +1,7 @@
-diff -Naur gcc-4.5-20101118/configure.ac gcc-4.5-20101118.patch/configure.ac
--- gcc-4.5-20101118/configure.ac	2010-10-06 12:29:55.000000000 +0200
-+++ gcc-4.5-20101118.patch/configure.ac	2010-11-26 03:48:17.007444557 +0100
-@@ -174,7 +174,7 @@
- # know that we are building the simulator.
- # binutils, gas and ld appear in that order because it makes sense to run
- # "make check" in that particular order.
-# If --enable-gold is used, "gold" will replace "ld".
-+# If --enable-gold is used, "gold" may replace "ld".
- host_tools="texinfo byacc flex bison binutils gas ld fixincludes gcc cgen sid sim gdb make patch prms send-pr gprof etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool diff rcs fileutils shellutils time textutils wdiff find uudecode hello tar gzip indent recode release sed utils guile perl gawk findutils gettext zip fastjar gnattools"
- 
- # libgcj represents the runtime libraries only used by gcj.
-@@ -315,37 +315,57 @@
- esac
- 
- # Handle --enable-gold.
-+#   --enable-gold		Build only gold
-+#   --disable-gold [default]	Build only ld
-+#   --enable-gold=both		Build both gold and ld, ld is default
-+#   --enable-gold=both/ld	Same
-+#   --enable-gold=both/gold	Build both gold and ld, gold is default, ld is renamed ld.bfd
- 
- AC_ARG_ENABLE(gold,
-[  --enable-gold           use gold instead of ld],
-+[  --enable-gold[[=ARG]]     build gold [[ARG={both}[[/{gold,ld}]]]]],
- ENABLE_GOLD=$enableval,
- ENABLE_GOLD=no)
-if test "${ENABLE_GOLD}" = "yes"; then
-  # Check for ELF target.
-  is_elf=no
-  case "${target}" in
-    *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
-    | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
-    | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*)
-+  case "${ENABLE_GOLD}" in
-+  yes|both|both/gold|both/ld)
-+    # Check for ELF target.
-+    is_elf=no
-+    case "${target}" in
-+      *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
-+      | *-*-linux* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
-+      | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-solaris2* | *-*-nto*)
-+        case "${target}" in
-+          *-*-linux*aout* | *-*-linux*oldld*)
-+            ;;
-+          *)
-+            is_elf=yes
-+            ;;
-+        esac
-+    esac
-+
-+    if test "$is_elf" = "yes"; then
-+      # Check for target supported by gold.
-       case "${target}" in
-        *-*-linux*aout* | *-*-linux*oldld*)
-          ;;
-        *)
-          is_elf=yes
-+        i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
-+	  case "${ENABLE_GOLD}" in 
-+	  both*)
-+            configdirs="$configdirs gold"
-+	    ;;
-+	  *)
-+            configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
-+	    ;;
-+	  esac
-+	  ENABLE_GOLD=yes
-           ;;
-       esac
-+    fi
-+    ;;
-+  no)
-+    ;;
-+  *)
-+    AC_MSG_ERROR([invalid --enable-gold argument])
-+    ;;
-   esac
- 
-  if test "$is_elf" = "yes"; then
-    # Check for target supported by gold.
-    case "${target}" in
-      i?86-*-* | x86_64-*-* | sparc*-*-* | powerpc*-*-* | arm*-*-*)
-        configdirs=`echo " ${configdirs} " | sed -e 's/ ld / gold /'`
-        ;;
-    esac
-  fi
-fi
-
- # Configure extra directories which are host specific
- 
- case "${host}" in
-diff -Naur gcc-4.5-20101118/gcc/collect2.c gcc-4.5-20101118.patch/gcc/collect2.c
--- gcc-4.5-20101118/gcc/collect2.c	2010-06-24 23:06:37.000000000 +0200
-+++ gcc-4.5-20101118.patch/gcc/collect2.c	2010-11-26 03:42:31.162881405 +0100
-@@ -1114,17 +1114,19 @@
+diff -Naur gcc-4.6.0-old/gcc/collect2.c gcc-4.6.0-new/gcc/collect2.c
+--- gcc-4.6.0-old/gcc/collect2.c	2011-01-06 10:50:20.000000000 -0800
+++ gcc-4.6.0-new/gcc/collect2.c	2011-03-28 21:52:29.000000000 -0700
+@@ -1075,17 +1075,19 @@
 int
 main (int argc, char **argv)
 {
@ -121,7 +29,7 @@ diff -Naur gcc-4.5-20101118/gcc/collect2.c gcc-4.5-20101118.patch/gcc/collect2.c
 
 #ifdef CROSS_DIRECTORY_STRUCTURE
   /* If we look for a program in the compiler directories, we just use
-@@ -1134,6 +1136,10 @@
+@@ -1095,6 +1097,10 @@
 
   const char *const full_ld_suffix =
     concat(target_machine, "-", ld_suffix, NULL);
@ -132,7 +40,7 @@ diff -Naur gcc-4.5-20101118/gcc/collect2.c gcc-4.5-20101118.patch/gcc/collect2.c
   const char *const full_plugin_ld_suffix =
     concat(target_machine, "-", plugin_ld_suffix, NULL);
   const char *const full_nm_suffix =
-@@ -1149,15 +1155,17 @@
+@@ -1110,15 +1116,17 @@
   const char *const full_gstrip_suffix =
     concat (target_machine, "-", gstrip_suffix, NULL);
 #else
@ -156,7 +64,7 @@ diff -Naur gcc-4.5-20101118/gcc/collect2.c gcc-4.5-20101118.patch/gcc/collect2.c
 #endif /* CROSS_DIRECTORY_STRUCTURE */
 
   const char *arg;
-@@ -1171,7 +1179,13 @@
+@@ -1132,7 +1140,13 @@
   const char **c_ptr;
   char **ld1_argv;
   const char **ld1;
@ -171,37 +79,20 @@ diff -Naur gcc-4.5-20101118/gcc/collect2.c gcc-4.5-20101118.patch/gcc/collect2.c
 
   /* The kinds of symbols we will have to consider when scanning the
      outcome of a first pass link.  This is ALL to start with, then might
-@@ -1188,7 +1202,6 @@
-   int first_file;
-   int num_c_args;
-   char **old_argv;
-
-   bool use_verbose = false;
- 
-   old_argv = argv;
-@@ -1244,22 +1257,29 @@
-       {
- 	if (! strcmp (argv[i], "-debug"))
- 	  debug = 1;
-        else if (! strcmp (argv[i], "-flto") && ! use_plugin)
-+        else if (! strcmp (argv[i], "-flto")
+@@ -1209,15 +1223,21 @@
+         else if (! strcmp (argv[i], "-flto-partition=none"))
+ 	  no_partition = true;
+         else if ((! strncmp (argv[i], "-flto=", 6)
+-		  || ! strcmp (argv[i], "-flto")) && ! use_plugin)
+		  || ! strcmp (argv[i], "-flto"))
 +		 && selected_linker != PLUGIN_LINKER)
- 	  {
- 	    use_verbose = true;
- 	    lto_mode = LTO_MODE_LTO;
- 	  }
-        else if (! strcmp (argv[i], "-fwhopr") && ! use_plugin)
-+        else if (! strcmp (argv[i], "-fwhopr")
-+		 && selected_linker != PLUGIN_LINKER)
- 	  {
- 	    use_verbose = true;
- 	    lto_mode = LTO_MODE_WHOPR;
- 	  }
+ 	  lto_mode = LTO_MODE_WHOPR;
+ 	else if (!strncmp (argv[i], "-fno-lto", 8))
+ 	  lto_mode = LTO_MODE_NONE;
         else if (! strcmp (argv[i], "-plugin"))
 	  {
 -	    use_plugin = true;
 +	    selected_linker =  PLUGIN_LINKER;
- 	    use_verbose = true;
 	    lto_mode = LTO_MODE_NONE;
 	  }
 +	else if (! strcmp (argv[i], "-use-gold"))
@ -212,7 +103,7 @@ diff -Naur gcc-4.5-20101118/gcc/collect2.c gcc-4.5-20101118.patch/gcc/collect2.c
 #ifdef COLLECT_EXPORT_LIST
 	/* since -brtl, -bexport, -b64 are not position dependent
 	   also check for them here */
-@@ -1339,35 +1359,108 @@
+@@ -1299,35 +1319,108 @@
   /* Try to discover a valid linker/nm/strip to use.  */
 
   /* Maybe we know the right file to use (if not cross).  */
@ -335,10 +226,10 @@ diff -Naur gcc-4.5-20101118/gcc/collect2.c gcc-4.5-20101118.patch/gcc/collect2.c
 
 #ifdef REAL_NM_FILE_NAME
   nm_file_name = find_a_file (&path, REAL_NM_FILE_NAME);
-diff -Naur gcc-4.5-20101118/gcc/common.opt gcc-4.5-20101118.patch/gcc/common.opt
--- gcc-4.5-20101118/gcc/common.opt	2010-03-18 04:01:09.000000000 +0100
-+++ gcc-4.5-20101118.patch/gcc/common.opt	2010-11-26 03:42:31.164881431 +0100
-@@ -1401,6 +1401,9 @@
+diff -Naur gcc-4.6.0-old/gcc/common.opt gcc-4.6.0-new/gcc/common.opt
+--- gcc-4.6.0-old/gcc/common.opt	2011-03-05 16:38:13.000000000 -0800
+++ gcc-4.6.0-new/gcc/common.opt	2011-03-28 21:52:29.000000000 -0700
+@@ -2019,6 +2019,9 @@
 Common Report Var(flag_unwind_tables) Optimization
 Just generate unwind tables for exception handling
 
@ -348,71 +239,10 @@ diff -Naur gcc-4.5-20101118/gcc/common.opt gcc-4.5-20101118.patch/gcc/common.opt
 fuse-linker-plugin
 Common Undocumented
 
-diff -Naur gcc-4.5-20101118/gcc/configure gcc-4.5-20101118.patch/gcc/configure
--- gcc-4.5-20101118/gcc/configure	2010-10-06 21:09:10.000000000 +0200
-+++ gcc-4.5-20101118.patch/gcc/configure	2010-11-26 03:42:31.184881696 +0100
-@@ -684,6 +684,7 @@
- gcc_cv_objdump
- ORIGINAL_NM_FOR_TARGET
- gcc_cv_nm
-+ORIGINAL_GOLD_FOR_TARGET
- ORIGINAL_LD_FOR_TARGET
- ORIGINAL_PLUGIN_LD_FOR_TARGET
- gcc_cv_ld
-@@ -17108,7 +17109,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
-#line 17111 "configure"
-+#line 17112 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -17214,7 +17215,7 @@
-   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-   lt_status=$lt_dlunknown
-   cat > conftest.$ac_ext <<_LT_EOF
-#line 17217 "configure"
-+#line 17218 "configure"
- #include "confdefs.h"
- 
- #if HAVE_DLFCN_H
-@@ -20662,6 +20663,21 @@
- fi
- fi
- 
-+gcc_cv_ld_gold_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gold
-+
-+if test "${gcc_cv_gold+set}" = set; then :
-+
-+else
-+
-+if test -f $gcc_cv_ld_gold_srcdir/configure.ac \
-+     && test -f ../gold/Makefile \
-+     && test x$build = x$host; then
-+	gcc_cv_gold=../gold/ld-new$build_exeext
-+else
-+        gcc_cv_gold=''
-+fi
-+fi
-+
- ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld
- PLUGIN_LD=`basename $gcc_cv_ld`
- 
-@@ -20688,6 +20704,9 @@
-  ;;
- esac
- 
-+ORIGINAL_GOLD_FOR_TARGET=$gcc_cv_gold
-+
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking what linker to use" >&5
- $as_echo_n "checking what linker to use... " >&6; }
- if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext; then
-diff -Naur gcc-4.5-20101118/gcc/configure.ac gcc-4.5-20101118.patch/gcc/configure.ac
--- gcc-4.5-20101118/gcc/configure.ac	2010-10-06 21:09:10.000000000 +0200
-+++ gcc-4.5-20101118.patch/gcc/configure.ac	2010-11-26 03:42:31.201881922 +0100
-@@ -1947,6 +1947,17 @@
+diff -Naur gcc-4.6.0-old/gcc/configure.ac gcc-4.6.0-new/gcc/configure.ac
+--- gcc-4.6.0-old/gcc/configure.ac	2011-02-28 07:36:37.000000000 -0800
+++ gcc-4.6.0-new/gcc/configure.ac	2011-03-28 21:58:18.000000000 -0700
+@@ -1937,6 +1937,17 @@
         AC_PATH_PROG(gcc_cv_ld, $LD_FOR_TARGET)
 fi])
 
@ -430,7 +260,7 @@ diff -Naur gcc-4.5-20101118/gcc/configure.ac gcc-4.5-20101118.patch/gcc/configur
 ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld
 PLUGIN_LD=`basename $gcc_cv_ld`
 AC_ARG_WITH(plugin-ld,
-@@ -1965,6 +1976,9 @@
+@@ -1966,6 +1977,9 @@
   *) AC_CONFIG_FILES(collect-ld:exec-tool.in, [chmod +x collect-ld]) ;;
 esac 
 
@ -440,44 +270,43 @@ diff -Naur gcc-4.5-20101118/gcc/configure.ac gcc-4.5-20101118.patch/gcc/configur
 AC_MSG_CHECKING(what linker to use)
 if test "$gcc_cv_ld" = ../ld/ld-new$build_exeext; then
 	# Single tree build which includes ld.  We want to prefer it
-diff -Naur gcc-4.5-20101118/gcc/doc/invoke.texi gcc-4.5-20101118.patch/gcc/doc/invoke.texi
--- gcc-4.5-20101118/gcc/doc/invoke.texi	2010-09-08 19:36:40.000000000 +0200
-+++ gcc-4.5-20101118.patch/gcc/doc/invoke.texi	2010-11-26 03:42:31.218882146 +0100
-@@ -390,7 +390,7 @@
+diff -Naur gcc-4.6.0-old/gcc/doc/invoke.texi gcc-4.6.0-new/gcc/doc/invoke.texi
+--- gcc-4.6.0-old/gcc/doc/invoke.texi	2011-03-18 07:34:52.000000000 -0700
+++ gcc-4.6.0-new/gcc/doc/invoke.texi	2011-03-28 21:52:29.000000000 -0700
+@@ -401,7 +401,7 @@
 -funit-at-a-time -funroll-all-loops -funroll-loops @gol
 -funsafe-loop-optimizations -funsafe-math-optimizations -funswitch-loops @gol
 -fvariable-expansion-in-unroller -fvect-cost-model -fvpt -fweb @gol
--fwhole-program -fwhopr -fwpa -fuse-linker-plugin @gol
-+-fwhole-program -fwhopr -fwpa -fuse-linker-plugin -fuse-ld @gol
+--fwhole-program -fwpa -fuse-linker-plugin @gol
+-fwhole-program -fwpa -fuse-ld -fuse-linker-plugin @gol
 --param @var{name}=@var{value}
- -O  -O0  -O1  -O2  -O3  -Os}
+ -O  -O0  -O1  -O2  -O3  -Os -Ofast}
 
-@@ -7416,6 +7416,16 @@
+@@ -7743,6 +7743,16 @@
 
- Disabled by default.
+ Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}.
 
 +@item -fuse-ld=gold
 +Use the @command{gold} linker instead of the default linker.
 +This option is only necessary if GCC has been configured with
-+@option{--enable-gold=both} or @option{--enable-gold=both/ld}.
+@option{--enable-gold} and @option{--enable-ld=default}.
 +
 +@item -fuse-ld=bfd
 +Use the @command{ld.bfd} linker instead of the default linker.
 +This option is only necessary if GCC has been configured with
-+@option{--enable-gold=both/gold}.
+@option{--enable-gold} and @option{--enable-ld}.
 +
 @item -fcprop-registers
 @opindex fcprop-registers
 After register allocation and post-register allocation instruction splitting,
-diff -Naur gcc-4.5-20101118/gcc/doc/invoke.texi.orig gcc-4.5-20101118.patch/gcc/doc/invoke.texi.orig
-diff -Naur gcc-4.5-20101118/gcc/exec-tool.in gcc-4.5-20101118.patch/gcc/exec-tool.in
--- gcc-4.5-20101118/gcc/exec-tool.in	2009-11-08 23:36:51.000000000 +0100
-+++ gcc-4.5-20101118.patch/gcc/exec-tool.in	2010-11-26 03:42:31.226882250 +0100
+diff -Naur gcc-4.6.0-old/gcc/exec-tool.in gcc-4.6.0-new/gcc/exec-tool.in
+--- gcc-4.6.0-old/gcc/exec-tool.in	2011-01-03 12:52:22.000000000 -0800
+++ gcc-4.6.0-new/gcc/exec-tool.in	2011-03-28 21:52:29.000000000 -0700
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
-+# Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
+-# Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
+# Copyright (C) 2007, 2008, 2010, 2011 Free Software Foundation, Inc.
 # This file is part of GCC.
 
 # GCC is free software; you can redistribute it and/or modify
@ -494,29 +323,20 @@ diff -Naur gcc-4.5-20101118/gcc/exec-tool.in gcc-4.5-20101118.patch/gcc/exec-too
 +version="1.1"
 
 invoked=`basename "$0"`
- case "$invoked" in
-@@ -34,54 +36,110 @@
-     prog=as-new$exeext
+ id=$invoked
+@@ -36,15 +38,44 @@
     dir=gas
     ;;
-  collect-ld)
+   collect-ld)
 -    # when using a linker plugin, gcc will always pass '-plugin' as the
-    # first option to the linker.
-    if test x"$1" = "x-plugin"; then
+-    # first or second option to the linker.
+-    if test x"$1" = "x-plugin" || test x"$2" = "x-plugin"; then
 -      original=$ORIGINAL_PLUGIN_LD_FOR_TARGET
 -    else
 -      original=$ORIGINAL_LD_FOR_TARGET
 -    fi
-    prog=ld-new$exeext
+     prog=ld-new$exeext
 -    dir=ld
-    ;;
-   nm)
-     original=$ORIGINAL_NM_FOR_TARGET
-     prog=nm-new$exeext
-     dir=binutils
-     ;;
-+  collect-ld)
-+    prog=ld-new$exeext
 +    # Look for the a command line option
 +    # specifying the linker to be used.
 +    case " $* " in
@ -554,14 +374,10 @@ diff -Naur gcc-4.5-20101118/gcc/exec-tool.in gcc-4.5-20101118.patch/gcc/exec-too
 +      # will issue an error message for us.
 +      fi
 +    fi
-+    ;;
- esac
- 
- case "$original" in
-   ../*)
-    # compute absolute path of the location of this script
-+    # Compute absolute path to the location of this script.
-     tdir=`dirname "$0"`
+     id=ld
+     ;;
+   nm)
+@@ -61,29 +92,58 @@
     scriptdir=`cd "$tdir" && pwd`
 
     if test -x $scriptdir/../$dir/$prog; then
@ -574,9 +390,11 @@ diff -Naur gcc-4.5-20101118/gcc/exec-tool.in gcc-4.5-20101118.patch/gcc/exec-too
 -      # libtool has not relinked ld-new yet, but we cannot just use the
 -      # previous stage (because then the relinking would just never happen!).
 -      # So we take extra care to use prev-ld/ld-new *on recursive calls*.
+-      eval LT_RCU="\${LT_RCU_$id}"
 -      test x"$LT_RCU" = x"1" && exec $scriptdir/../prev-$dir/$prog ${1+"$@"}
 -
-      LT_RCU=1; export LT_RCU
+-      eval LT_RCU_$id=1
+-      export LT_RCU_$id
 -      $scriptdir/../$dir/$prog ${1+"$@"}
 -      result=$?
 -      exit $result
@ -591,10 +409,12 @@ diff -Naur gcc-4.5-20101118/gcc/exec-tool.in gcc-4.5-20101118.patch/gcc/exec-too
 +          # Libtool has not relinked ld-new yet, but we cannot just use the
 +          # previous stage (because then the relinking would just never happen!).
 +          # So we take extra care to use prev-ld/ld-new *on recursive calls*.
+          eval LT_RCU="\${LT_RCU_$id}"
 +          if test x"$LT_RCU" = x"1"; then
 +	    original=$scriptdir/../prev-$dir/$prog
 +          else
-+            LT_RCU=1; export LT_RCU
+            eval LT_RCU_$id=1
+            export LT_RCU_$id
 +            case " $* " in
 +              *\ -v\ *)
 +               echo "$invoked $version"
@ -615,13 +435,13 @@ diff -Naur gcc-4.5-20101118/gcc/exec-tool.in gcc-4.5-20101118.patch/gcc/exec-too
     fi
     ;;
 -  *)
-    exec "$original" ${1+"$@"}
+-    exec $original ${1+"$@"}
 +  "")
 +    echo "$invoked: executable not configured"
 +    exit 1
     ;;
 esac
- 
+
 +# If -v has been used then display our version number
 +# and then echo the command we are about to invoke.
 +case " $* " in
@ -630,31 +450,31 @@ diff -Naur gcc-4.5-20101118/gcc/exec-tool.in gcc-4.5-20101118.patch/gcc/exec-too
 +    echo $original $*
 +    ;;
 +esac
- 
+
 +if test -x $original; then
 +  exec "$original" ${1+"$@"}
 +else
 +  echo "$invoked: unable to locate executable: $original"
 +  exit 1
 +fi
-diff -Naur gcc-4.5-20101118/gcc/gcc.c gcc-4.5-20101118.patch/gcc/gcc.c
--- gcc-4.5-20101118/gcc/gcc.c	2010-04-18 19:46:08.000000000 +0200
-+++ gcc-4.5-20101118.patch/gcc/gcc.c	2010-11-26 03:42:31.230882305 +0100
-@@ -790,6 +790,9 @@
-     %{v:-plugin-opt=-v} \
-     } \
-     %{flto} %{fwhopr} %l " LINK_PIE_SPEC \
+diff -Naur gcc-4.6.0-old/gcc/gcc.c gcc-4.6.0-new/gcc/gcc.c
+--- gcc-4.6.0-old/gcc/gcc.c	2011-02-22 18:04:43.000000000 -0800
+++ gcc-4.6.0-new/gcc/gcc.c	2011-03-28 21:52:29.000000000 -0700
+@@ -657,6 +657,9 @@
+     }"PLUGIN_COND_CLOSE" \
+     %{flto|flto=*:%<fcompare-debug*} \
+     %{flto} %{flto=*} %l " LINK_PIE_SPEC \
 +   "%{fuse-ld=gold:%{fuse-ld=bfd:%e-fuse-ld=gold and -fuse-ld=bfd may not be used together}} \
 +    %{fuse-ld=gold:-use-gold} \
 +    %{fuse-ld=bfd:-use-ld}" \
-    "%X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{x} %{z} %{Z} %{!A:%{!nostdlib:%{!nostartfiles:%S}}}\
+    "%X %{o*} %{e*} %{N} %{n} %{r}\
+     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\
     %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
-diff -Naur gcc-4.5-20101118/gcc/opts.c gcc-4.5-20101118.patch/gcc/opts.c
--- gcc-4.5-20101118/gcc/opts.c	2010-05-17 12:13:28.000000000 +0200
-+++ gcc-4.5-20101118.patch/gcc/opts.c	2010-11-26 03:42:31.236882383 +0100
-@@ -2138,8 +2138,9 @@
-       /* These are no-ops, preserved for backward compatibility.  */
+diff -Naur gcc-4.6.0-old/gcc/opts.c gcc-4.6.0-new/gcc/opts.c
+--- gcc-4.6.0-old/gcc/opts.c	2011-02-17 14:51:57.000000000 -0800
+++ gcc-4.6.0-new/gcc/opts.c	2011-03-28 21:52:29.000000000 -0700
+@@ -1692,8 +1692,9 @@
+       dc->max_errors = value;
       break;
 
 +    case OPT_fuse_ld_:
--- a/packages/toolchain/lang/gcc/patches/gcc-4.6.1-disable_multilib_i386_linux64.patch
+++ b/packages/toolchain/lang/gcc/patches/gcc-4.6.1-disable_multilib_i386_linux64.patch
@ -1,6 +1,6 @@
-diff -Naur gcc-4.5-20100610-old/gcc/config/i386/t-linux64 gcc-4.5-20100610-new/gcc/config/i386/t-linux64
--- gcc-4.5-20100610-old/gcc/config/i386/t-linux64	2010-06-11 09:31:52.000000000 -0700
-+++ gcc-4.5-20100610-new/gcc/config/i386/t-linux64	2010-06-11 09:39:52.000000000 -0700
+diff -Naur gcc-4.6.0-old/gcc/config/i386/t-linux64 gcc-4.6.0-new/gcc/config/i386/t-linux64
+--- gcc-4.6.0-old/gcc/config/i386/t-linux64	2009-04-21 12:03:23.000000000 -0700
+++ gcc-4.6.0-new/gcc/config/i386/t-linux64	2011-03-28 21:12:19.000000000 -0700
@@ -23,13 +23,13 @@
 # it doesn't tell anything about the 32bit libraries on those systems.  Set
 # MULTILIB_OSDIRNAMES according to what is found on the target.
--- a/packages/toolchain/lang/gcc/patches/gcc-4.6.1-dynamic_linker.patch
+++ b/packages/toolchain/lang/gcc/patches/gcc-4.6.1-dynamic_linker.patch
@ -1,7 +1,7 @@
-diff -Naur gcc-4.5-20100610-old/gcc/config/i386/linux64.h gcc-4.5-20100610-new/gcc/config/i386/linux64.h
--- gcc-4.5-20100610-old/gcc/config/i386/linux64.h	2010-06-11 09:40:14.000000000 -0700
-+++ gcc-4.5-20100610-new/gcc/config/i386/linux64.h	2010-06-11 09:41:13.000000000 -0700
-@@ -59,7 +59,7 @@
+diff -Naur gcc-4.6.0-old/gcc/config/i386/linux64.h gcc-4.6.0-new/gcc/config/i386/linux64.h
+--- gcc-4.6.0-old/gcc/config/i386/linux64.h	2011-03-28 21:06:17.000000000 -0700
+++ gcc-4.6.0-new/gcc/config/i386/linux64.h	2011-03-28 21:07:35.000000000 -0700
+@@ -63,7 +63,7 @@
    done.  */
 
 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
@ -10,12 +10,12 @@ diff -Naur gcc-4.5-20100610-old/gcc/config/i386/linux64.h gcc-4.5-20100610-new/g
 
 #if TARGET_64BIT_DEFAULT
 #define SPEC_32 "m32"
-diff -Naur gcc-4.5-20100610-old/gcc/config/mips/iris6.h gcc-4.5-20100610-new/gcc/config/mips/iris6.h
--- gcc-4.5-20100610-old/gcc/config/mips/iris6.h	2010-06-11 09:40:14.000000000 -0700
-+++ gcc-4.5-20100610-new/gcc/config/mips/iris6.h	2010-06-11 09:41:13.000000000 -0700
-@@ -88,27 +88,27 @@
-      %{mabi=32:%{pg:gcrt1.o%s} \
-        %{!pg:%{p:mcrt1.o%s libprof1.a%s}%{!p:crt1.o%s}}} \
+diff -Naur gcc-4.6.0-old/gcc/config/mips/iris6.h gcc-4.6.0-new/gcc/config/mips/iris6.h
+--- gcc-4.6.0-old/gcc/config/mips/iris6.h	2011-03-28 21:06:17.000000000 -0700
+++ gcc-4.6.0-new/gcc/config/mips/iris6.h	2011-03-28 21:08:12.000000000 -0700
+@@ -226,27 +226,27 @@
+ #define STARTFILE_SPEC \
+   "%{!shared: \
      %{mabi=n32: \
 -       %{mips4:%{pg:/usr/lib32/mips4/gcrt1.o%s} \
 -         %{!pg:%{p:/usr/lib32/mips4/mcrt1.o%s /usr/lib32/mips4/libprof1.a%s} \
@ -57,10 +57,10 @@ diff -Naur gcc-4.5-20100610-old/gcc/config/mips/iris6.h gcc-4.5-20100610-new/gcc
    %{!shared:" \
      SUBTARGET_DONT_WARN_UNUSED_SPEC \
      " %{pthread:-lpthread} %{p:libprof1.a%s}%{pg:libprof1.a%s} -lc " \
-@@ -125,10 +125,10 @@
+@@ -262,10 +262,10 @@
+ #define ENDFILE_SPEC \
   "crtend.o%s irix-crtn.o%s \
    %{!shared: \
-      %{mabi=32:crtn.o%s}\
 -     %{mabi=n32:%{mips4:/usr/lib32/mips4/crtn.o%s}\
 -       %{!mips4:/usr/lib32/mips3/crtn.o%s}}\
 -     %{mabi=64:%{mips4:/usr/lib64/mips4/crtn.o%s}\
@ -70,11 +70,11 @@ diff -Naur gcc-4.5-20100610-old/gcc/config/mips/iris6.h gcc-4.5-20100610-new/gcc
 +     %{mabi=64:%{mips4:/usr/lib/mips4/crtn.o%s}\
 +       %{!mips4:/usr/lib/mips3/crtn.o%s}}}"
 
- #define MIPS_TFMODE_FORMAT mips_extended_format
- 
-diff -Naur gcc-4.5-20100610-old/gcc/config/mips/linux64.h gcc-4.5-20100610-new/gcc/config/mips/linux64.h
--- gcc-4.5-20100610-old/gcc/config/mips/linux64.h	2010-06-11 09:40:14.000000000 -0700
-+++ gcc-4.5-20100610-new/gcc/config/mips/linux64.h	2010-06-11 09:41:13.000000000 -0700
+ /* Generic part of the LINK_SPEC.  */
+ #undef LINK_SPEC
+diff -Naur gcc-4.6.0-old/gcc/config/mips/linux64.h gcc-4.6.0-new/gcc/config/mips/linux64.h
+--- gcc-4.6.0-old/gcc/config/mips/linux64.h	2011-03-28 21:06:17.000000000 -0700
+++ gcc-4.6.0-new/gcc/config/mips/linux64.h	2011-03-28 21:08:52.000000000 -0700
@@ -36,9 +36,9 @@
   %{profile:-lc_p} %{!profile:-lc}}"
 
@ -85,13 +85,13 @@ diff -Naur gcc-4.5-20100610-old/gcc/config/mips/linux64.h gcc-4.5-20100610-new/g
 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
 +#define GLIBC_DYNAMIC_LINKERN32 "/lib/ld.so.1"
 +#define UCLIBC_DYNAMIC_LINKERN32 "/lib/ld-uClibc.so.0"
+ #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
 #define LINUX_DYNAMIC_LINKERN32 \
-   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
- 
-diff -Naur gcc-4.5-20100610-old/gcc/config/rs6000/linux64.h gcc-4.5-20100610-new/gcc/config/rs6000/linux64.h
--- gcc-4.5-20100610-old/gcc/config/rs6000/linux64.h	2010-06-11 09:40:14.000000000 -0700
-+++ gcc-4.5-20100610-new/gcc/config/rs6000/linux64.h	2010-06-11 09:41:13.000000000 -0700
-@@ -349,7 +349,7 @@
+   CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
+diff -Naur gcc-4.6.0-old/gcc/config/rs6000/linux64.h gcc-4.6.0-new/gcc/config/rs6000/linux64.h
+--- gcc-4.6.0-old/gcc/config/rs6000/linux64.h	2011-03-28 21:06:17.000000000 -0700
+++ gcc-4.6.0-new/gcc/config/rs6000/linux64.h	2011-03-28 21:07:35.000000000 -0700
+@@ -373,7 +373,7 @@
 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
 
 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
@ -99,12 +99,12 @@ diff -Naur gcc-4.5-20100610-old/gcc/config/rs6000/linux64.h gcc-4.5-20100610-new
 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
- #if UCLIBC_DEFAULT
-diff -Naur gcc-4.5-20100610-old/gcc/config/sparc/linux64.h gcc-4.5-20100610-new/gcc/config/sparc/linux64.h
--- gcc-4.5-20100610-old/gcc/config/sparc/linux64.h	2010-06-11 09:40:14.000000000 -0700
-+++ gcc-4.5-20100610-new/gcc/config/sparc/linux64.h	2010-06-11 09:41:13.000000000 -0700
-@@ -110,7 +110,7 @@
- /* If ELF is the default format, we should not use /lib/elf.  */
+ #if DEFAULT_LIBC == LIBC_UCLIBC
+diff -Naur gcc-4.6.0-old/gcc/config/sparc/linux64.h gcc-4.6.0-new/gcc/config/sparc/linux64.h
+--- gcc-4.6.0-old/gcc/config/sparc/linux64.h	2011-03-28 21:06:17.000000000 -0700
+++ gcc-4.6.0-new/gcc/config/sparc/linux64.h	2011-03-28 21:07:35.000000000 -0700
+@@ -102,7 +102,7 @@
+    done.  */
 
 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
@ -112,21 +112,21 @@ diff -Naur gcc-4.5-20100610-old/gcc/config/sparc/linux64.h gcc-4.5-20100610-new/
 
 #ifdef SPARC_BI_ARCH
 
-@@ -130,7 +130,7 @@
-         %{static:-static}}} \
+@@ -121,7 +121,7 @@
+       %{static:-static}} \
 "
 
 -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
 +#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
-@@ -211,7 +211,7 @@
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
+@@ -193,7 +193,7 @@
 #else /* !SPARC_BI_ARCH */
 
 #undef LINK_SPEC
 -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
 +#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
   %{!shared: \
-     %{!ibcs: \
-       %{!static: \
+     %{!static: \
+       %{rdynamic:-export-dynamic} \
--- a/packages/toolchain/lang/gcc/patches/gcc-4.6.1-libstdc++-v3_config.patch
+++ b/packages/toolchain/lang/gcc/patches/gcc-4.6.1-libstdc++-v3_config.patch
@ -1,6 +1,6 @@
-diff -Naur gcc-4.5-20100610-old/libstdc++-v3/config.h.in gcc-4.5-20100610-new/libstdc++-v3/config.h.in
--- gcc-4.5-20100610-old/libstdc++-v3/config.h.in	2010-06-11 09:40:55.000000000 -0700
-+++ gcc-4.5-20100610-new/libstdc++-v3/config.h.in	2010-06-11 09:41:44.000000000 -0700
+diff -Naur gcc-4.6.0-old/libstdc++-v3/config.h.in gcc-4.6.0-new/libstdc++-v3/config.h.in
+--- gcc-4.6.0-old/libstdc++-v3/config.h.in	2011-03-28 21:07:18.000000000 -0700
+++ gcc-4.6.0-new/libstdc++-v3/config.h.in	2011-03-28 21:10:03.000000000 -0700
@@ -115,7 +115,7 @@
 #undef HAVE_FABSL
 
@ -46,7 +46,7 @@ diff -Naur gcc-4.5-20100610-old/libstdc++-v3/config.h.in gcc-4.5-20100610-new/li
 
 /* Define if strerror_r is available in <string.h>. */
 #undef HAVE_STRERROR_R
-@@ -356,7 +356,7 @@
+@@ -360,7 +360,7 @@
 #undef HAVE_SYS_IOCTL_H
 
 /* Define to 1 if you have the <sys/ipc.h> header file. */
@ -55,7 +55,7 @@ diff -Naur gcc-4.5-20100610-old/libstdc++-v3/config.h.in gcc-4.5-20100610-new/li
 
 /* Define to 1 if you have the <sys/isa_defs.h> header file. */
 #undef HAVE_SYS_ISA_DEFS_H
-@@ -368,16 +368,16 @@
+@@ -372,16 +372,16 @@
 #undef HAVE_SYS_PARAM_H
 
 /* Define to 1 if you have the <sys/resource.h> header file. */
@ -75,7 +75,7 @@ diff -Naur gcc-4.5-20100610-old/libstdc++-v3/config.h.in gcc-4.5-20100610-new/li
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #undef HAVE_SYS_TYPES_H
-@@ -407,7 +407,7 @@
+@@ -411,7 +411,7 @@
 #undef HAVE_TGMATH_H
 
 /* Define to 1 if the target supports thread-local storage. */
@ -84,7 +84,7 @@ diff -Naur gcc-4.5-20100610-old/libstdc++-v3/config.h.in gcc-4.5-20100610-new/li
 
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
-@@ -620,7 +620,7 @@
+@@ -624,7 +624,7 @@
 #undef HAVE__TANL
 
 /* Define as const if the declaration of iconv() needs const. */
--- a/packages/toolchain/math/gmp/meta
+++ b/packages/toolchain/math/gmp/meta
@ -23,7 +23,7 @@ PKG_VERSION="5.0.2"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
-PKG_SITE="http://www.swox.com/gmp/"
+PKG_SITE="http://gmplib.org/"
 PKG_URL="http://ftp.sunet.se/pub/gnu/gmp/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="ccache"
--- a/packages/toolchain/math/mpfr/meta
+++ b/packages/toolchain/math/mpfr/meta
@ -24,7 +24,7 @@ PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="LGPL"
 PKG_SITE="http://www.mpfr.org/"
-PKG_URL="http://ftp.gnu.org/gnu/mpfr/$PKG_NAME-$PKG_VERSION.tar.bz2"
+PKG_URL="http://ftp.gnu.org/gnu/mpfr/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS=""
 PKG_BUILD_DEPENDS="ccache gmp"
 PKG_PRIORITY="optional"
--- a/packages/tools/flashrom/build
+++ b/packages/tools/flashrom/build
@ -24,4 +24,4 @@

 cd $PKG_BUILD

-$MAKE CC=$TARGET_CC STRIP=$STRIP
+$MAKE CC=$TARGET_CC STRIP=$STRIP WARNERROR=no
--- a/packages/x11/driver/xf86-video-intel/build
+++ b/packages/x11/driver/xf86-video-intel/build
@ -24,8 +24,8 @@

 xorg_drv_configure_prepend

-#PKG_CONFIG="$PKG_CONFIG --define-variable=sdkdir=$SYSROOT_PREFIX/usr/include/xorg"
-#CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/xorg/"
+PKG_CONFIG="$PKG_CONFIG --define-variable=sdkdir=$SYSROOT_PREFIX/usr/include/xorg"
+CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/xorg/"

 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
@ -37,8 +37,6 @@ cd $PKG_BUILD
            --enable-dri \
            --enable-kms-only \
            --disable-xvmc \
-            --enable-sna \
-            --enable-vmap \
            --with-xorg-module-dir=$XORG_PATH_MODULES

 make
--- a/packages/x11/driver/xf86-video-intel/meta
+++ b/packages/x11/driver/xf86-video-intel/meta
@ -19,13 +19,12 @@
 ################################################################################

 PKG_NAME="xf86-video-intel"
-PKG_VERSION="98f2e38"
+PKG_VERSION="2.15.0"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="OSS"
 PKG_SITE="http://intellinuxgraphics.org/"
-#PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
-PKG_URL="$OPENELEC_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
+PKG_URL="http://xorg.freedesktop.org/archive/individual/driver/$PKG_NAME-$PKG_VERSION.tar.bz2"
 PKG_DEPENDS="udev"
 PKG_BUILD_DEPENDS="toolchain util-macros util-macros fontsproto udev xorg-server"
 PKG_PRIORITY="optional"
--- a/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf
+++ b/packages/x11/driver/xf86-video-nvidia/config/xorg-nvidia.conf
@ -14,9 +14,10 @@ Section "Screen"
    Identifier     "screen"
    Device         "nvidia"
    DefaultDepth    24
-    Option         "ColorRange" "Full"
+#    Option         "ColorRange" "Full"
 #    Option         "ColorRange" "Limited"
-    Option         "ColorSpace" "RGB"
+#    Option         "ColorSpace" "RGB"
+    Option         "ColorSpace" "YCbCr444"
    SubSection     "Display"
        Depth       24
    EndSubSection
@ -24,4 +25,4 @@ EndSection

 Section "Extensions"
    Option         "Composite" "false"
-EndSection
+EndSection
--- a/packages/x11/driver/xf86-video-nvidia/meta
+++ b/packages/x11/driver/xf86-video-nvidia/meta
@ -19,7 +19,8 @@
 ################################################################################

 PKG_NAME="xf86-video-nvidia"
-PKG_VERSION="280.04"
+#PKG_VERSION="280.04"
+PKG_VERSION="270.41.19"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="nonfree"
--- a/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-270.41.19-linux-3.0_compat.patch
+++ b/packages/x11/driver/xf86-video-nvidia/patches.upstream/xf86-video-nvidia-270.41.19-linux-3.0_compat.patch
@ -0,0 +1,24 @@
+diff -Naur NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/conftest.sh NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/conftest.sh
+--- NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/conftest.sh	2011-05-17 08:32:19.000000000 +0200
+++ NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/conftest.sh	2011-07-09 18:21:30.602664961 +0200
+@@ -76,7 +76,7 @@
+ }
+ 
+ build_cflags() {
+-    BASE_CFLAGS="-D__KERNEL__ \
+    BASE_CFLAGS="-O2 -D__KERNEL__ \
+ -DKBUILD_BASENAME=\"#conftest$$\" -DKBUILD_MODNAME=\"#conftest$$\" \
+ -nostdinc -isystem $ISYSTEM"
+ 
+diff -Naur NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/nv-linux.h NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/nv-linux.h
+--- NVIDIA-Linux-x86_64-270.41.19-no-compat32/kernel/nv-linux.h	2011-05-17 08:32:19.000000000 +0200
+++ NVIDIA-Linux-x86_64-270.41.19-no-compat32.patch/kernel/nv-linux.h	2011-07-09 18:22:16.317252983 +0200
+@@ -34,6 +34,8 @@
+ #  error This driver does not support 2.5 kernels!
+ #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 7, 0)
+ #  define KERNEL_2_6
+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)
+#  define KERNEL_2_6
+ #else
+ #  error This driver does not support development kernels!
+ #endif
--- a/projects/ATV/options
+++ b/projects/ATV/options
@ -71,12 +71,24 @@
      ;;
  esac

-# Build optimizations (size/speed)
-  OPTIMIZATIONS="speed"
+# Build optimizations (size/normal/speed/fast)
+  OPTIMIZATIONS="fast"

 # Project CFLAGS
  PROJECT_CFLAGS=""

+# LTO (Link Time Optimazion) support
+  LTO_SUPPORT="no"
+
+# GOLD (Google Linker) support
+  GOLD_SUPPORT="yes"
+
+# Graphite Support
+  GRAPHITE_SUPPORT="yes"
+
+# LOOP optimazion support
+  LOOP_SUPPORT="yes"
+
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
  BOOTLOADER="atv-bootloader"

--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@ -71,12 +71,24 @@
      ;;
  esac

-# Build optimizations (size/normal/speed)
-  OPTIMIZATIONS="speed"
+# Build optimizations (size/normal/speed/fast)
+  OPTIMIZATIONS="fast"

 # Project CFLAGS
  PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"

+# LTO (Link Time Optimazion) support
+  LTO_SUPPORT="no"
+
+# GOLD (Google Linker) support
+  GOLD_SUPPORT="yes"
+
+# Graphite Support
+  GRAPHITE_SUPPORT="yes"
+
+# LOOP optimazion support
+  LOOP_SUPPORT="yes"
+
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
  BOOTLOADER="syslinux"

--- a/projects/Generic/options
+++ b/projects/Generic/options
@ -71,12 +71,24 @@
      ;;
  esac

-# Build optimizations (size/speed)
-  OPTIMIZATIONS="speed"
+# Build optimizations (size/normal/speed/fast)
+  OPTIMIZATIONS="fast"

 # Project CFLAGS
  PROJECT_CFLAGS="-mmmx -msse -msse2 -mfpmath=sse"

+# LTO (Link Time Optimazion) support
+  LTO_SUPPORT="no"
+
+# GOLD (Google Linker) support
+  GOLD_SUPPORT="yes"
+
+# Graphite Support
+  GRAPHITE_SUPPORT="yes"
+
+# LOOP optimazion support
+  LOOP_SUPPORT="yes"
+
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
  BOOTLOADER="syslinux"

--- a/projects/ION/options
+++ b/projects/ION/options
@ -71,12 +71,24 @@
      ;;
  esac

-# Build optimizations (size/normal/speed)
-  OPTIMIZATIONS="speed"
+# Build optimizations (size/normal/speed/fast)
+  OPTIMIZATIONS="fast"

 # Project CFLAGS
  PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"

+# LTO (Link Time Optimazion) support
+  LTO_SUPPORT="no"
+
+# GOLD (Google Linker) support
+  GOLD_SUPPORT="yes"
+
+# Graphite Support
+  GRAPHITE_SUPPORT="yes"
+
+# LOOP optimazion support
+  LOOP_SUPPORT="yes"
+
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
  BOOTLOADER="syslinux"

--- a/projects/Intel/options
+++ b/projects/Intel/options
@ -71,12 +71,24 @@
      ;;
  esac

-# Build optimizations (size/speed)
-  OPTIMIZATIONS="speed"
+# Build optimizations (size/normal/speed/fast)
+  OPTIMIZATIONS="fast"

 # Project CFLAGS
  PROJECT_CFLAGS=""

+# LTO (Link Time Optimazion) support
+  LTO_SUPPORT="no"
+
+# GOLD (Google Linker) support
+  GOLD_SUPPORT="yes"
+
+# Graphite Support
+  GRAPHITE_SUPPORT="yes"
+
+# LOOP optimazion support
+  LOOP_SUPPORT="yes"
+
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
  BOOTLOADER="syslinux"

--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@ -71,12 +71,24 @@
      ;;
  esac

-# Build optimizations (size/normal/speed)
-  OPTIMIZATIONS="speed"
+# Build optimizations (size/normal/speed/fast)
+  OPTIMIZATIONS="fast"

 # Project CFLAGS
  PROJECT_CFLAGS="-mfpmath=sse -ftree-vectorize -mmovbe"

+# LTO (Link Time Optimazion) support
+  LTO_SUPPORT="no"
+
+# GOLD (Google Linker) support
+  GOLD_SUPPORT="yes"
+
+# Graphite Support
+  GRAPHITE_SUPPORT="yes"
+
+# LOOP optimazion support
+  LOOP_SUPPORT="yes"
+
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
  BOOTLOADER="syslinux"

--- a/packages/network/libnfsidmap/install
+++ b/packages/network/libnfsidmap/install
@ -1,5 +1,4 @@
 #!/bin/sh
-
 ################################################################################
 #      This file is part of OpenELEC - http://www.openelec.tv
 #      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
@ -20,11 +19,25 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################

-. config/options $1
+echo "getting sources..."
+  if [ ! -d libbluray.git ]; then
+    git clone git://git.videolan.org/libbluray.git libbluray.git
+  fi

-mkdir -p $INSTALL/usr/lib
-  cp -P $PKG_BUILD/.libs/libnfsidmap.so* $INSTALL/usr/lib/
+  cd libbluray.git
+    git pull
+    GIT_REV=`git log -n1 --format=%h`
+  cd ..

-mkdir -p $INSTALL/usr/lib/libnfsidmap
-  cp -P $PKG_BUILD/.libs/nsswitch.so $INSTALL/usr/lib/libnfsidmap/
-  cp -P $PKG_BUILD/.libs/static.so $INSTALL/usr/lib/libnfsidmap/
+echo "copying sources..."
+  rm -rf libbluray-$GIT_REV
+  cp -R libbluray.git libbluray-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf libbluray-$GIT_REV/.git
+
+echo "packing sources..."
+  tar cvJf libbluray-$GIT_REV.tar.xz libbluray-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf libbluray-$GIT_REV