Linux: change install-build-deps.sh to install gold linker from binutils 2.21...

build/install-build-deps.sh

 #!/bin/bash -e
 
 # Copyright (c) 2009 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.
 
 # Script to install everything needed to build chromium (well, ideally, anyway)
 # See http://code.google.com/p/chromium/wiki/LinuxBuildInstructions
 # and http://code.google.com/p/chromium/wiki/LinuxBuild64Bit
 
@@ skipping 28 matching lines @@
   # First make sure root can access this directory, as that's tripped
   # up some folks.
   if sudo touch xyz.$$
   then
     sudo rm xyz.$$
   else
     echo root cannot write to the current directory, not installing gold
     return
   fi
 
-  BINUTILS=binutils-2.20.1
+  BINUTILS=binutils-2.21
   BINUTILS_URL=http://ftp.gnu.org/gnu/binutils/$BINUTILS.tar.bz2
-  BINUTILS_SHA1=fd2ba806e6f3a55cee453cb25c86991b26a75dee
+  BINUTILS_SHA1=ef93235588eb443e4c4a77f229a8d131bccaecc6
 
   test -f $BINUTILS.tar.bz2 || wget $BINUTILS_URL
   if test "`sha1sum $BINUTILS.tar.bz2|cut -d' ' -f1`" != "$BINUTILS_SHA1"
   then
     echo Bad sha1sum for $BINUTILS.tar.bz2
     exit 1
   fi
 
   tar -xjvf $BINUTILS.tar.bz2
   cd $BINUTILS
-  ./configure --prefix=/usr/local/gold --enable-gold
+  patch -p1 <<EOF
+diff -u -r1.103 -r1.103.2.1
+--- src/gold/object.h   2010/09/08 23:54:51     1.103
++++ src/gold/object.h   2011/02/10 01:15:28     1.103.2.1
+@@ -1,6 +1,6 @@
+ // object.h -- support for an object file for linking in gold  -*- C++ -*-
+ 
+-// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ // Written by Ian Lance Taylor <iant@google.com>.
+ 
+ // This file is part of gold.
+@@ -2165,15 +2165,6 @@
+                      Output_symtab_xindex*,
+                      Output_symtab_xindex*);
+ 
+-  // Clear the local symbol information.
+-  void
+-  clear_local_symbols()
+-  {
+-    this->local_values_.clear();
+-    this->local_got_offsets_.clear();
+-    this->local_plt_offsets_.clear();
+-  }
+-
+   // Record a mapping from discarded section SHNDX to the corresponding
+   // kept section.
+   void
+diff -u -r1.60 -r1.60.2.1
+--- src/gold/reloc.cc   2010/10/14 22:10:22     1.60
++++ src/gold/reloc.cc   2011/02/10 01:15:28     1.60.2.1
+@@ -1,6 +1,6 @@
+ // reloc.cc -- relocate input files for gold.
+ 
+-// Copyright 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
++// Copyright 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ // Written by Ian Lance Taylor <iant@google.com>.
+ 
+ // This file is part of gold.
+@@ -685,9 +685,6 @@
+   // Write out the local symbols.
+   this->write_local_symbols(of, layout->sympool(), layout->dynpool(),
+                            layout->symtab_xindex(), layout->dynsym_xindex());
+-
+-  // We should no longer need the local symbol values.
+-  this->clear_local_symbols();
+ }
+ 
+ // Sort a Read_multiple vector by file offset.
+EOF
+  ./configure --prefix=/usr/local/gold --enable-gold --enable-threads
   make maybe-all-binutils maybe-all-gold -j4
   if sudo make maybe-install-binutils maybe-install-gold
   then
     # Still need to figure out graceful way of pointing gyp to use
     # /usr/local/gold/bin/ld without requiring him to set environment
     # variables.  That will go into bootstrap-linux.sh when it's ready.
     echo "Installing gold as /usr/bin/ld."
     echo "To uninstall, do 'cd /usr/bin; sudo rm ld; sudo mv ld.orig ld'"
     test -f /usr/bin/ld && test ! -f /usr/bin/ld.orig && \
         sudo mv /usr/bin/ld /usr/bin/ld.orig
@@ skipping 160 matching lines @@
   yes n | $new_list_cmd || true
   echo
   echo "You will have to install the above packages yourself."
   echo
   exit 100
 fi
 
 # Some operating systems already ship gold (on recent Debian and
 # Ubuntu you can do "apt-get install binutils-gold" to get it), but
 # older releases didn't.  Additionally, gold 2.20 (included in Ubuntu
-# Lucid) makes binaries that just segfault.
+# Lucid) makes binaries that just segfault, and 2.20.1 does not support
+# --map-whole-files.
 # So install from source if we don't have a good version.
 
 case `ld --version` in
-*gold*2.20.1*) ;;
-*gold*2.2[1-9]*) ;;
+*gold*2.2[1-9].*) ;;
 * )
   if test "$do_inst_gold" = ""
   then
     echo "Gold is a new linker that links Chrome 5x faster than ld."
     echo "Don't use it if you need to link other apps (e.g. valgrind, wine)"
     echo -n "REPLACE SYSTEM LINKER ld with gold and back up ld? (y/N) "
     if yes_no 1; then
       do_inst_gold=1
     fi
   fi
   if test "$do_inst_gold" = "1"
   then
     # If the system provides a good version of gold, just install it.
-    if apt-cache show binutils-gold | grep -Eq 'Version: 2.2(0.1|[1-9]*)'; then
+    if apt-cache show binutils-gold | grep -Eq 'Version: 2.2[1-9].*'; then
       echo "Installing binutils-gold. Backing up ld as ld.single."
       sudo apt-get install binutils-gold
     else
       # FIXME: avoid installing as /usr/bin/ld
       echo "Building binutils. Backing up ld as ld.orig."
       install_gold || exit 99
     fi
   else
     echo "Not installing gold."
   fi
@@ skipping 176 matching lines @@
              sed -e 's/[.]so[.][0-9].*/.so/' |
              sort -u); do
     [ "x${i##*/}" = "xld-linux.so" ] && continue
     [ -r "$i" ] && continue
     j="$(ls "$i."* | sed -e 's/.*[.]so[.]\([^.]*\)$/\1/;t;d' |
          sort -n | tail -n 1)"
     [ -r "$i.$j" ] || continue
     sudo ln -s "${i##*/}.$j" "$i"
   done
 fi