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

scripts/common.sh

 #!/bin/sh
 
 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script contains some functions useful to build
 # Valgrind and ThreadSanitizer for use with chromium
 
 THISDIR=$(dirname "${0}")
@@ skipping 90 matching lines @@
 
   sh autogen.sh || autoreconf -fvi
   if test -L install-sh
   then
     # replace symlink with actual contents!
     cp install-sh install-sh.new
     mv -f install-sh.new install-sh
     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
 
   # Test if Valgrind binary works on a simple program {{{2
 cat > simpletest.c <<EOF
 #include <stdio.h>
 int main(void) {
   printf("OK\n");
   return 0;
 }
@@ skipping 104 matching lines @@
 # Check that the binaries directory exists.
 BINARIES_DIR="$THISDIR/../binaries"
 if ! [ -a "$BINARIES_DIR" ]
 then
   echo "Error: $BINARIES_DIR doesn't exist!" >&2
   exit 1
 fi
 
 set -e
 set -x