From 83cd009af23b0f4a9dc230abe5bf375a29143cbb Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Thu, 29 Mar 2012 17:02:32 +0200
Subject: [PATCH] config/optimize: remove GOLD support

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 config/functions                              |   7 -
 config/optimize                               |   9 +-
 packages/3rdparty/multimedia/vdr/build        |   1 -
 packages/addons/debugging/tools/htop/build    |   3 -
 packages/addons/shell/texteditor/nano/build   |   3 -
 packages/compress/unrar/build                 |   3 -
 packages/devel/libplist/build                 |   3 -
 packages/graphics/Mesa/build                  |   3 -
 packages/mediacenter/xbmc-pvr/build           |   1 -
 packages/mediacenter/xbmc/build               |   1 -
 packages/network/samba/build                  |   3 +-
 packages/sysutils/parted/build                |   3 -
 packages/toolchain/devel/binutils/build       |   7 +-
 .../patches/binutils-2.22-visibility.patch    |  71 ---
 packages/toolchain/devel/eglibc/build         |   4 +-
 packages/toolchain/lang/gcc-core/build        |   6 +-
 packages/toolchain/lang/gcc-final/build       |   4 +-
 .../gcc/patches/gcc-4.6.3-bfd_and_gold.patch  | 486 ------------------
 packages/tools/dialog/build                   |   4 -
 projects/ATV/options                          |   3 -
 projects/Fusion/options                       |   3 -
 projects/Generic/options                      |   3 -
 projects/Generic_OSS/options                  |   3 -
 projects/ION/options                          |   3 -
 projects/Intel/options                        |   3 -
 projects/Ultra/options                        |   3 -
 projects/Virtual/options                      |   3 -
 27 files changed, 11 insertions(+), 635 deletions(-)
 delete mode 100644 packages/toolchain/devel/binutils/patches/binutils-2.22-visibility.patch
 delete mode 100644 packages/toolchain/lang/gcc/patches/gcc-4.6.3-bfd_and_gold.patch

diff --git a/config/functions b/config/functions
index dd98ad88de..e6d38cb8a2 100644
--- a/config/functions
+++ b/config/functions
@@ -169,12 +169,6 @@ strip_linker_plugin() {
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-linker-plugin||g"`
 }
 
-strip_gold() {
-  # strip out usage from GOLD linker
-  strip_linker_plugin
-  LDFLAGS=`echo $LDFLAGS | sed -e "s|-fuse-ld=gold||g"`
-}
-
 fix_module_depends() {
   # modify .modinfo section in kernel module to depends on other required modules
   local MODULE="$1"
@@ -237,7 +231,6 @@ show_config() {
   config_message="$config_message\n - FPU:\t\t\t\t\t $TARGET_FPU"
   config_message="$config_message\n - Optimizations:\t\t\t $OPTIMIZATIONS"
   config_message="$config_message\n - LTO (Link Time Optimization) support: $LTO_SUPPORT"
-  config_message="$config_message\n - GOLD (Google Linker) Support:\t $GOLD_SUPPORT"
   config_message="$config_message\n - LLVM support:\t\t\t $LLVM_SUPPORT"
 
   # config_message="$config_message\n - CFLAGS:\t $TARGET_CFLAGS"
diff --git a/config/optimize b/config/optimize
index c2ef91af12..83db6124da 100644
--- a/config/optimize
+++ b/config/optimize
@@ -21,19 +21,12 @@ if [ "$OPTIMIZATIONS" = size ];then
   LD_OPTIM=""
 fi
 
-if [ "$LTO_SUPPORT" = yes -o "$GOLD_SUPPORT" = yes ];then
-  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
-fi
-
 if [ "$LTO_SUPPORT" = yes ];then
   GCC_OPTIM="$GCC_OPTIM -flto"
+  LD_OPTIM="$LD_OPTIM -fuse-linker-plugin"
   LD_OPTIM="$LD_OPTIM -flto"
 fi
 
-if [ "$GOLD_SUPPORT" = yes ];then
-  LD_OPTIM="$LD_OPTIM -fuse-ld=gold"
-fi
-
 if [ "$DEBUG" = yes ]; then
   TARGET_CFLAGS="$TARGET_CFLAGS -ggdb"
   TARGET_CXXFLAGS="$TARGET_CXXFLAGS -ggdb"
diff --git a/packages/3rdparty/multimedia/vdr/build b/packages/3rdparty/multimedia/vdr/build
index b9122ab20e..575be56866 100755
--- a/packages/3rdparty/multimedia/vdr/build
+++ b/packages/3rdparty/multimedia/vdr/build
@@ -25,7 +25,6 @@
 
 # vdr fails to build with LTO optimization
   strip_lto
-  strip_gold
 
   LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
 
diff --git a/packages/addons/debugging/tools/htop/build b/packages/addons/debugging/tools/htop/build
index decbab8c2b..a45764a479 100755
--- a/packages/addons/debugging/tools/htop/build
+++ b/packages/addons/debugging/tools/htop/build
@@ -22,9 +22,6 @@
 
 . config/options $1
 
-# htop fails to build with GOLD linker
-  strip_gold
-
 LDFLAGS="$LDFLAGS -ltinfo"
 
 cd $PKG_BUILD
diff --git a/packages/addons/shell/texteditor/nano/build b/packages/addons/shell/texteditor/nano/build
index db2cdc3627..ee623e9098 100755
--- a/packages/addons/shell/texteditor/nano/build
+++ b/packages/addons/shell/texteditor/nano/build
@@ -22,9 +22,6 @@
 
 . config/options $1
 
-# nano fails to build with GOLD linker
-  strip_gold
-
 LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
 LDFLAGS="$LDFLAGS -ltinfo"
 
diff --git a/packages/compress/unrar/build b/packages/compress/unrar/build
index b865f28d00..c077f71a7f 100755
--- 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 \
diff --git a/packages/devel/libplist/build b/packages/devel/libplist/build
index 11fa4e3756..d3d11c20ff 100755
--- 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
 
diff --git a/packages/graphics/Mesa/build b/packages/graphics/Mesa/build
index 3cc1252cde..57ff4edf0b 100755
--- a/packages/graphics/Mesa/build
+++ b/packages/graphics/Mesa/build
@@ -24,9 +24,6 @@
 
 get_graphicdrivers
 
-# dont use gold linker because of compiling issues
-  strip_gold
-
 # Mesa fails to build with LTO optimization
   strip_lto
 
diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build
index ad5fbb50c1..4f8722ed55 100755
--- a/packages/mediacenter/xbmc-pvr/build
+++ b/packages/mediacenter/xbmc-pvr/build
@@ -166,7 +166,6 @@ fi
 
 # xbmc (ffmpeg) fails to build with LTO optimization
   strip_lto
-  strip_gold
 
 # dont use some optimizations because of problems
 # this fixes problems with faac implementation of ffmpeg
diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build
index ad5fbb50c1..4f8722ed55 100755
--- a/packages/mediacenter/xbmc/build
+++ b/packages/mediacenter/xbmc/build
@@ -166,7 +166,6 @@ fi
 
 # xbmc (ffmpeg) fails to build with LTO optimization
   strip_lto
-  strip_gold
 
 # dont use some optimizations because of problems
 # this fixes problems with faac implementation of ffmpeg
diff --git a/packages/network/samba/build b/packages/network/samba/build
index 6c8ac50e68..16c689bada 100755
--- a/packages/network/samba/build
+++ b/packages/network/samba/build
@@ -22,9 +22,8 @@
 
 . config/options $1
 
-# dont build with GOLD and LTO support
+# dont build with LTO support
   strip_lto
-  strip_gold
 
 if [ "$AVAHI_DAEMON" = yes ]; then
   SMB_AVAHI="--enable-avahi"
diff --git a/packages/sysutils/parted/build b/packages/sysutils/parted/build
index 6cb4fa23cd..c7c975618f 100755
--- 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 \
diff --git a/packages/toolchain/devel/binutils/build b/packages/toolchain/devel/binutils/build
index 28aa15d877..e6bb8134f7 100755
--- a/packages/toolchain/devel/binutils/build
+++ b/packages/toolchain/devel/binutils/build
@@ -53,8 +53,8 @@ mkdir -p objdir && cd objdir
              --enable-version-specific-runtime-libs \
              $WITH_64B_BFD \
              --enable-plugins \
-             --enable-gold=yes \
-             --enable-ld=default \
+             --disable-gold \
+             --enable-ld \
              --enable-lto \
              --disable-nls
 
@@ -64,6 +64,3 @@ make
 cp -v ../include/libiberty.h $SYSROOT_PREFIX/usr/include
 
 make install
-
-cp ${TARGET_PREFIX}ld.gold ${TARGET_PREFIX}gold
-cp $ROOT/$TOOLCHAIN/$TARGET_NAME/bin/ld.gold $ROOT/$TOOLCHAIN/$TARGET_NAME/bin/gold
diff --git a/packages/toolchain/devel/binutils/patches/binutils-2.22-visibility.patch b/packages/toolchain/devel/binutils/patches/binutils-2.22-visibility.patch
deleted file mode 100644
index b58aa75087..0000000000
--- a/packages/toolchain/devel/binutils/patches/binutils-2.22-visibility.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -Naur binutils-2.21-old/gold/plugin.cc binutils-2.21-new/gold/plugin.cc
---- binutils-2.21-old/gold/plugin.cc	2010-10-14 15:10:22.000000000 -0700
-+++ binutils-2.21-new/gold/plugin.cc	2010-12-08 07:11:30.000000000 -0800
-@@ -668,28 +668,50 @@
-           break;
-         }
- 
--      switch (isym->visibility)
--        {
--        case LDPV_PROTECTED:
--          vis = elfcpp::STV_PROTECTED;
--          break;
--        case LDPV_INTERNAL:
--          vis = elfcpp::STV_INTERNAL;
--          break;
--        case LDPV_HIDDEN:
--          vis = elfcpp::STV_HIDDEN;
--          break;
--        case LDPV_DEFAULT:
--        default:
--          vis = elfcpp::STV_DEFAULT;
--          break;
--        }
--
-       if (isym->comdat_key != NULL
-           && isym->comdat_key[0] != '\0'
-           && !this->include_comdat_group(isym->comdat_key, layout))
-         shndx = elfcpp::SHN_UNDEF;
- 
-+      if (shndx == elfcpp::SHN_UNDEF)
-+      {
-+        switch (isym->visibility)
-+          {
-+          case LDPV_PROTECTED:
-+            vis = elfcpp::STV_DEFAULT;
-+            break;
-+          case LDPV_INTERNAL:
-+            vis = elfcpp::STV_DEFAULT;
-+            break;
-+          case LDPV_HIDDEN:
-+            vis = elfcpp::STV_DEFAULT;
-+            break;
-+          case LDPV_DEFAULT:
-+          default:
-+            vis = elfcpp::STV_DEFAULT;
-+            break;
-+          }
-+      }
-+      else
-+      {
-+        switch (isym->visibility)
-+          {
-+          case LDPV_PROTECTED:
-+            vis = elfcpp::STV_PROTECTED;
-+            break;
-+          case LDPV_INTERNAL:
-+            vis = elfcpp::STV_INTERNAL;
-+            break;
-+          case LDPV_HIDDEN:
-+            vis = elfcpp::STV_HIDDEN;
-+            break;
-+          case LDPV_DEFAULT:
-+          default:
-+            vis = elfcpp::STV_DEFAULT;
-+            break;
-+          }
-+      }
-+
-       osym.put_st_name(0);
-       osym.put_st_value(0);
-       osym.put_st_size(static_cast<Elf_size_type>(isym->size));
diff --git a/packages/toolchain/devel/eglibc/build b/packages/toolchain/devel/eglibc/build
index 06a554c82c..c897178c90 100755
--- a/packages/toolchain/devel/eglibc/build
+++ b/packages/toolchain/devel/eglibc/build
@@ -23,7 +23,6 @@
 . config/options $1
 
 strip_lto  # Fails to compile with GCC's link time optimization.
-strip_gold # Fails to compile using the gold linker.
 
 # Filter out some problematic *FLAGS
   CFLAGS=`echo $CFLAGS | sed -e "s|-ffast-math||g"`
@@ -111,6 +110,7 @@ libc_cv_forced_unwind=yes
 libc_cv_c_cleanup=yes
 libc_cv_gnu89_inline=yes
 libc_cv_ssp=no
+libc_cv_ctors_header=yes
 EOF
 
 cat >configparms <<EOF
@@ -121,6 +121,7 @@ EOF
              --build=$HOST_NAME \
              --prefix=/usr \
              --libexecdir=/usr/lib/eglibc \
+             --cache-file=config.cache \
              --disable-profile \
              --disable-sanity-checks \
              --enable-add-ons \
@@ -131,7 +132,6 @@ EOF
              --with-__thread \
              --with-binutils=$BUILD/toolchain/bin \
              --with-headers=$SYSROOT_PREFIX/usr/include \
-             --cache-file=config.cache \
              --without-cvs \
              --without-gd \
              $DEBUG_CONFIG \
diff --git a/packages/toolchain/lang/gcc-core/build b/packages/toolchain/lang/gcc-core/build
index 5358a66e2b..5e9f513aa8 100755
--- a/packages/toolchain/lang/gcc-core/build
+++ b/packages/toolchain/lang/gcc-core/build
@@ -28,7 +28,7 @@ setup_toolchain host
 
 cd $BUILD/gcc*
 
-autoconf-2.64
+#autoconf-2.64
 
 mkdir -p objdir-$1 && cd objdir-$1
 ../configure --host=$HOST_NAME \
@@ -49,8 +49,8 @@ mkdir -p objdir-$1 && cd objdir-$1
              --disable-__cxa_atexit \
              --disable-libada \
              --disable-libmudflap \
-             --enable-gold=yes \
-             --enable-ld=default \
+             --disable-gold \
+             --enable-ld \
              --enable-plugin \
              --enable-lto \
              --disable-libquadmath \
diff --git a/packages/toolchain/lang/gcc-final/build b/packages/toolchain/lang/gcc-final/build
index 402bff664b..2c09b9f354 100755
--- a/packages/toolchain/lang/gcc-final/build
+++ b/packages/toolchain/lang/gcc-final/build
@@ -49,8 +49,8 @@ mkdir -p objdir-$1 && cd objdir-$1
              --disable-libmudflap \
              --disable-libssp \
              --disable-multilib \
-             --enable-gold=yes \
-             --enable-ld=default \
+             --disable-gold \
+             --enable-ld \
              --enable-plugin \
              --enable-lto \
              --disable-libquadmath \
diff --git a/packages/toolchain/lang/gcc/patches/gcc-4.6.3-bfd_and_gold.patch b/packages/toolchain/lang/gcc/patches/gcc-4.6.3-bfd_and_gold.patch
deleted file mode 100644
index 61f397ae40..0000000000
--- a/packages/toolchain/lang/gcc/patches/gcc-4.6.3-bfd_and_gold.patch
+++ /dev/null
@@ -1,486 +0,0 @@
-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)
- {
--  static const char *const ld_suffix	= "ld";
--  static const char *const plugin_ld_suffix = PLUGIN_LD;
--  static const char *const real_ld_suffix = "real-ld";
-+  static const char *const ld_suffix	     = "ld";
-+  static const char *const gold_suffix       = "gold";
-+  static const char *const bfd_ld_suffix     = "ld.bfd";
-+  static const char *const plugin_ld_suffix  = PLUGIN_LD;
-+  static const char *const real_ld_suffix    = "real-ld";
-   static const char *const collect_ld_suffix = "collect-ld";
--  static const char *const nm_suffix	= "nm";
--  static const char *const gnm_suffix	= "gnm";
-+  static const char *const nm_suffix	     = "nm";
-+  static const char *const gnm_suffix	     = "gnm";
- #ifdef LDD_SUFFIX
--  static const char *const ldd_suffix	= LDD_SUFFIX;
-+  static const char *const ldd_suffix	     = LDD_SUFFIX;
- #endif
--  static const char *const strip_suffix = "strip";
--  static const char *const gstrip_suffix = "gstrip";
-+  static const char *const strip_suffix      = "strip";
-+  static const char *const gstrip_suffix     = "gstrip";
- 
- #ifdef CROSS_DIRECTORY_STRUCTURE
-   /* If we look for a program in the compiler directories, we just use
-@@ -1095,6 +1097,10 @@
- 
-   const char *const full_ld_suffix =
-     concat(target_machine, "-", ld_suffix, NULL);
-+  const char *const full_gold_suffix =
-+    concat (target_machine, "-", gold_suffix, NULL);
-+  const char *const full_bfd_ld_suffix =
-+    concat (target_machine, "-", bfd_ld_suffix, NULL);
-   const char *const full_plugin_ld_suffix =
-     concat(target_machine, "-", plugin_ld_suffix, NULL);
-   const char *const full_nm_suffix =
-@@ -1110,15 +1116,17 @@
-   const char *const full_gstrip_suffix =
-     concat (target_machine, "-", gstrip_suffix, NULL);
- #else
--  const char *const full_ld_suffix	= ld_suffix;
-+  const char *const full_ld_suffix	  = ld_suffix;
-+  const char *const full_gold_suffix	  = gold_suffix;
-+  const char *const full_bfd_ld_suffix	  = bfd_ld_suffix;
-   const char *const full_plugin_ld_suffix = plugin_ld_suffix;
--  const char *const full_nm_suffix	= nm_suffix;
--  const char *const full_gnm_suffix	= gnm_suffix;
-+  const char *const full_nm_suffix	  = nm_suffix;
-+  const char *const full_gnm_suffix	  = gnm_suffix;
- #ifdef LDD_SUFFIX
--  const char *const full_ldd_suffix	= ldd_suffix;
-+  const char *const full_ldd_suffix	  = ldd_suffix;
- #endif
--  const char *const full_strip_suffix	= strip_suffix;
--  const char *const full_gstrip_suffix	= gstrip_suffix;
-+  const char *const full_strip_suffix	  = strip_suffix;
-+  const char *const full_gstrip_suffix	  = gstrip_suffix;
- #endif /* CROSS_DIRECTORY_STRUCTURE */
- 
-   const char *arg;
-@@ -1132,7 +1140,13 @@
-   const char **c_ptr;
-   char **ld1_argv;
-   const char **ld1;
--  bool use_plugin = false;
-+  enum linker_select
-+  {
-+    DFLT_LINKER,
-+    PLUGIN_LINKER,
-+    GOLD_LINKER,
-+    BFD_LINKER
-+  } selected_linker = DFLT_LINKER;
- 
-   /* 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
-@@ -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)
- 	  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;
- 	    lto_mode = LTO_MODE_NONE;
- 	  }
-+	else if (! strcmp (argv[i], "-use-gold"))
-+	  selected_linker = GOLD_LINKER;
-+	else if (! strcmp (argv[i], "-use-ld"))
-+	  selected_linker = BFD_LINKER;
-+
- #ifdef COLLECT_EXPORT_LIST
- 	/* since -brtl, -bexport, -b64 are not position dependent
- 	   also check for them here */
-@@ -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).  */
--  ld_file_name = 0;
-+  ld_file_name = NULL;
- #ifdef DEFAULT_LINKER
-   if (access (DEFAULT_LINKER, X_OK) == 0)
-     ld_file_name = DEFAULT_LINKER;
--  if (ld_file_name == 0)
-+  if (ld_file_name == NULL)
- #endif
- #ifdef REAL_LD_FILE_NAME
-   ld_file_name = find_a_file (&path, REAL_LD_FILE_NAME);
--  if (ld_file_name == 0)
-+  if (ld_file_name == NULL)
- #endif
-   /* Search the (target-specific) compiler dirs for ld'.  */
-   ld_file_name = find_a_file (&cpath, real_ld_suffix);
-   /* Likewise for `collect-ld'.  */
--  if (ld_file_name == 0)
-+  if (ld_file_name == NULL)
-     ld_file_name = find_a_file (&cpath, collect_ld_suffix);
-   /* Search the compiler directories for `ld'.  We have protection against
-      recursive calls in find_a_file.  */
--  if (ld_file_name == 0)
--    ld_file_name = find_a_file (&cpath,
--				use_plugin
--				? plugin_ld_suffix
--				: ld_suffix);
-+  if (ld_file_name == NULL)
-+    switch (selected_linker)
-+      {
-+      default:
-+      case DFLT_LINKER:
-+	ld_file_name = find_a_file (&cpath, ld_suffix);
-+	break;
-+      case PLUGIN_LINKER:
-+	ld_file_name = find_a_file (&cpath, plugin_ld_suffix);
-+	break;
-+      case GOLD_LINKER:
-+	ld_file_name = find_a_file (&cpath, gold_suffix);
-+	break;
-+      case BFD_LINKER:
-+	ld_file_name = find_a_file (&cpath, bfd_ld_suffix);
-+	break;
-+      }
-   /* Search the ordinary system bin directories
-      for `ld' (if native linking) or `TARGET-ld' (if cross).  */
--  if (ld_file_name == 0)
--    ld_file_name = find_a_file (&path,
--				use_plugin
--				? full_plugin_ld_suffix
--				: full_ld_suffix);
-+  if (ld_file_name == NULL)
-+    switch (selected_linker)
-+      {
-+      default:
-+      case DFLT_LINKER:
-+	ld_file_name = find_a_file (&path, full_ld_suffix);
-+	break;
-+      case PLUGIN_LINKER:
-+	ld_file_name = find_a_file (&path, full_plugin_ld_suffix);
-+	break;
-+      case GOLD_LINKER:
-+	ld_file_name = find_a_file (&path, full_gold_suffix);
-+	break;
-+      case BFD_LINKER:
-+	ld_file_name = find_a_file (&path, full_bfd_ld_suffix);
-+	break;
-+      }
-+  /* If we failed to find a plugin-capable linker, try the ordinary one.  */
-+  if (ld_file_name == NULL && selected_linker == PLUGIN_LINKER)
-+    ld_file_name = find_a_file (&cpath, ld_suffix);
-+
-+  if ((vflag || debug) && ld_file_name == NULL)
-+    {
-+      struct prefix_list * p;
-+      const char * s;
-+
-+      notice ("collect2: warning: unable to find linker.\n");
-+
-+#ifdef DEFAULT_LINKER
-+      notice (" Searched for this absolute executable:\n");
-+      notice (" %s\n", DEFAULT_LINKER);
-+#endif
-+
-+      notice (" Searched in these paths:\n");
-+      for (p = cpath.plist; p != NULL; p = p->next)
-+	notice ("  %s\n", p->prefix);
-+      notice (" For these executables:\n");
-+      notice ("  %s\n", real_ld_suffix);
-+      notice ("  %s\n", collect_ld_suffix);
-+      switch (selected_linker)
-+      {
-+      default:
-+      case DFLT_LINKER:    s = ld_suffix; break;
-+      case PLUGIN_LINKER:  s = plugin_ld_suffix; break;
-+      case GOLD_LINKER:    s = gold_suffix; break;
-+      case BFD_LINKER:     s = bfd_ld_suffix; break;
-+      }
-+      notice ("  %s\n", s);
-+
-+      notice (" And searched in these paths:\n");
-+      for (p = path.plist; p != NULL; p = p->next)
-+	notice ("  %s\n", p->prefix);
-+      notice (" For these executables:\n");
-+#ifdef REAL_LD_FILE_NAME
-+      notice (" %s\n", REAL_LD_FILE_NAME);
-+#endif
-+      switch (selected_linker)
-+      {
-+      default:
-+      case DFLT_LINKER:    s = full_ld_suffix; break;
-+      case PLUGIN_LINKER:  s = full_plugin_ld_suffix; break;
-+      case GOLD_LINKER:    s = full_gold_suffix; break;
-+      case BFD_LINKER:     s = full_bfd_ld_suffix; break;
-+      }
-+      notice ("  %s\n", s);
-+    }
- 
- #ifdef REAL_NM_FILE_NAME
-   nm_file_name = find_a_file (&path, REAL_NM_FILE_NAME);
-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
- 
-+fuse-ld=
-+Common Joined Undocumented
-+
- fuse-linker-plugin
- Common Undocumented
- 
-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])
- 
-+gcc_cv_ld_gold_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/gold
-+
-+AS_VAR_SET_IF(gcc_cv_gold,, [
-+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])
-+
- ORIGINAL_PLUGIN_LD_FOR_TARGET=$gcc_cv_ld
- PLUGIN_LD=`basename $gcc_cv_ld`
- AC_ARG_WITH(plugin-ld,
-@@ -1966,6 +1977,9 @@
-   *) AC_CONFIG_FILES(collect-ld:exec-tool.in, [chmod +x collect-ld]) ;;
- esac 
- 
-+ORIGINAL_GOLD_FOR_TARGET=$gcc_cv_gold
-+AC_SUBST(ORIGINAL_GOLD_FOR_TARGET)
-+
- 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.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 -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 -Ofast}
- 
-@@ -7743,6 +7743,16 @@
- 
- 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} 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} and @option{--enable-ld}.
-+
- @item -fcprop-registers
- @opindex fcprop-registers
- After register allocation and post-register allocation instruction splitting,
-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, 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
-@@ -21,11 +21,13 @@
- 
- ORIGINAL_AS_FOR_TARGET="@ORIGINAL_AS_FOR_TARGET@"
- ORIGINAL_LD_FOR_TARGET="@ORIGINAL_LD_FOR_TARGET@"
-+ORIGINAL_GOLD_FOR_TARGET="@ORIGINAL_GOLD_FOR_TARGET@"
- ORIGINAL_PLUGIN_LD_FOR_TARGET="@ORIGINAL_PLUGIN_LD_FOR_TARGET@"
- ORIGINAL_NM_FOR_TARGET="@ORIGINAL_NM_FOR_TARGET@"
- exeext=@host_exeext@
- fast_install=@enable_fast_install@
- objdir=@objdir@
-+version="1.1"
- 
- invoked=`basename "$0"`
- id=$invoked
-@@ -36,15 +38,44 @@
-     dir=gas
-     ;;
-   collect-ld)
--    # when using a linker plugin, gcc will always pass '-plugin' as the
--    # 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
--    dir=ld
-+    # Look for the a command line option
-+    # specifying the linker to be used.
-+    case " $* " in
-+      *\ -use-gold\ *)
-+        original=$ORIGINAL_GOLD_FOR_TARGET
-+	dir=gold
-+        ;;
-+      *\ -use-ld\ * | *\ -use-ld.bfd\ *)
-+        original=$ORIGINAL_LD_FOR_TARGET
-+        dir=ld
-+        ;;
-+      *\ -plugin\ *)
-+        original=$ORIGINAL_PLUGIN_LD_FOR_TARGET
-+        dir=ld
-+	;;
-+      *)
-+        original=$ORIGINAL_LD_FOR_TARGET
-+        dir=ld
-+	;;
-+    esac
-+
-+    # If the selected linker has not been configured then
-+    # try using the others, in the order PLUGIN-LD, LD, GOLD.
-+    if test x"$original" = x; then
-+      if test x"$ORIGINAL_PLUGIN_LD_FOR_TARGET" != x; then
-+        original=$ORIGINAL_PLUGIN_LD_FOR_TARGET
-+        dir=ld
-+      elif test x"$ORIGINAL_LD_FOR_TARGET" != x; then
-+        original=$ORIGINAL_LD_FOR_TARGET
-+        dir=ld
-+      elif test x"$ORIGINAL_GOLD_FOR_TARGET" != x; then
-+        original=$ORIGINAL_GOLD_FOR_TARGET
-+        dir=gold
-+      # Otherwise do nothing - the case statement below
-+      # will issue an error message for us.
-+      fi
-+    fi
-     id=ld
-     ;;
-   nm)
-@@ -61,29 +92,58 @@
-     scriptdir=`cd "$tdir" && pwd`
- 
-     if test -x $scriptdir/../$dir/$prog; then
--      test "$fast_install" = yes || exec $scriptdir/../$dir/$prog ${1+"$@"}
--
--      # if libtool did everything it needs to do, there's a fast path
--      lt_prog=$scriptdir/../$dir/$objdir/lt-$prog 
--      test -x $lt_prog && exec $lt_prog ${1+"$@"}
--
--      # 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+"$@"}
--
--      eval LT_RCU_$id=1
--      export LT_RCU_$id
--      $scriptdir/../$dir/$prog ${1+"$@"}
--      result=$?
--      exit $result
--
-+      if test "$fast_install" = yes; then
-+        # If libtool did everything it needs to do, there's a fast path.
-+        lt_prog=$scriptdir/../$dir/$objdir/lt-$prog 
-+
-+	if test -x $lt_prog; then
-+	  original=$lt_prog
-+        else
-+          # 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
-+            eval LT_RCU_$id=1
-+            export LT_RCU_$id
-+            case " $* " in
-+              *\ -v\ *)
-+               echo "$invoked $version"
-+               echo $scriptdir/../$dir/$prog $*
-+               ;;
-+            esac
-+            $scriptdir/../$dir/$prog ${1+"$@"}
-+            result=$?
-+            exit $result
-+          fi
-+        fi
-+      else
-+	original=$scriptdir/../$dir/$prog
-+      fi
-     else
--      exec $scriptdir/../prev-$dir/$prog ${1+"$@"}
-+      original=$scriptdir/../prev-$dir/$prog
-     fi
-     ;;
--  *)
--    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
-+  *\ -v\ *)
-+    echo "$invoked $version"
-+    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.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*} %{e*} %{N} %{n} %{r}\
-     %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}}\
-     %{static:} %{L*} %(mfwrap) %(link_libgcc) %o\
-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_:
-     case OPT_fuse_linker_plugin:
--      /* No-op. Used by the driver and passed to us because it starts with f.*/
-+      /* No-op. Used by the driver and passed to us because it starts with f.  */
-       break;
- 
-     default:
diff --git a/packages/tools/dialog/build b/packages/tools/dialog/build
index 4ba6d58600..3d9a4e0e89 100755
--- a/packages/tools/dialog/build
+++ b/packages/tools/dialog/build
@@ -25,10 +25,6 @@
 export LDFLAGS="$LDFLAGS -ltinfo"
 
 cd $PKG_BUILD
-
-# dialog fails to build with GOLD linker
-  strip_gold
-
 ac_cv_path_NCURSES_CONFIG="$ROOT/$TOOLCHAIN/bin/ncurses-config" \
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
diff --git a/projects/ATV/options b/projects/ATV/options
index 968b973fcc..e622b52f4b 100755
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -84,9 +84,6 @@
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="no"
-
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="atv-bootloader"
 
diff --git a/projects/Fusion/options b/projects/Fusion/options
index f2c1518cd5..0b5179ffdf 100755
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -84,9 +84,6 @@
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="no"
-
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
diff --git a/projects/Generic/options b/projects/Generic/options
index cb569d626b..7b1b69e702 100755
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -84,9 +84,6 @@
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="no"
-
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index 022afec117..938ac6f7ad 100755
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -84,9 +84,6 @@
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="no"
-
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
diff --git a/projects/ION/options b/projects/ION/options
index d7c86fadd9..6ae90d8b1a 100755
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -84,9 +84,6 @@
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="no"
-
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
diff --git a/projects/Intel/options b/projects/Intel/options
index 6aa01c51ac..38a662b915 100755
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -84,9 +84,6 @@
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="no"
-
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 1c0ba3e5f9..84f366077c 100755
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -84,9 +84,6 @@
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="no"
-
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"
 
diff --git a/projects/Virtual/options b/projects/Virtual/options
index be6e84c9e9..086a24403e 100755
--- a/projects/Virtual/options
+++ b/projects/Virtual/options
@@ -84,9 +84,6 @@
 # LTO (Link Time Optimization) support
   LTO_SUPPORT="no"
 
-# GOLD (Google Linker) support
-  GOLD_SUPPORT="no"
-
 # Bootloader to use (syslinux / u-boot / atv-bootloader)
   BOOTLOADER="syslinux"