Don't replace gold with default ld - we don't need it since... ages ago....

scripts/common.sh

Index: scripts/common.sh
===================================================================
--- scripts/common.sh	(revision 69705)
+++ scripts/common.sh	(working copy)
@@ -108,32 +108,6 @@
     chmod +x install-sh
   fi
 
-  # If gold is installed as a linker, use the old one
-  OVERRIDE_LD_DIR="${THISDIR}/override_ld"
-  if ld --version | grep gold
-  then
-    # build/install-build-deps leaves original ld around, try using that
-    if test -x /usr/bin/ld.orig
-    then
-      echo "Using /usr/bin/ld.orig instead of gold to link valgrind"
-      test -d "${OVERRIDE_LD_DIR}" && rm -rf "${OVERRIDE_LD_DIR}"
-      mkdir "${OVERRIDE_LD_DIR}"
-      ln -s /usr/bin/ld.orig "${OVERRIDE_LD_DIR}/ld"
-      PATH="${OVERRIDE_LD_DIR}:${PATH}"
-    # Ubuntu diverts original ld to ld.single when it installs binutils-gold
-    elif test -x /usr/bin/ld.single
-    then
-      echo "Using /usr/bin/ld.single instead of gold to link valgrind"
-      test -d "${OVERRIDE_LD_DIR}" && rm -rf "${OVERRIDE_LD_DIR}"
-      mkdir "${OVERRIDE_LD_DIR}"
-      ln -s /usr/bin/ld.single "${OVERRIDE_LD_DIR}/ld"
-      PATH="${OVERRIDE_LD_DIR}:${PATH}"
-    else
-      echo "Cannot build valgrind with gold.  Please switch to normal /usr/bin/ld, rerun this script, then switch back to gold."
-      exit 1
-    fi
-  fi
-
   ./configure $CONFIGURE_FLAGS --prefix="${OUTPUT_DIR}"
   make -j4