Bug 1451104 - part 4 - sync up gcc-related toolchains and linux64-binutils binutils version; r=glandium
☠☠ backed out by 779dcbea91ce ☠ ☠
authorNathan Froyd <froydnj@mozilla.com>
Tue, 12 Mar 2019 00:25:33 +0000
changeset 521814 5179c80669144b6f9da38bc3c2560b1224918eaa
parent 521813 675f73d41eb4467f106f5c0a60043f5ec34c0ead
child 521815 7c116f85ede6dc06f962ec8ac644cc2aa591f3ee
push id10867
push userdvarga@mozilla.com
push dateThu, 14 Mar 2019 15:20:45 +0000
treeherdermozilla-beta@abad13547875 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1451104
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1451104 - part 4 - sync up gcc-related toolchains and linux64-binutils binutils version; r=glandium We're going to copy an x86_64-unknown-linux-gnu ld into the clang build, which clang will then use in preference to things on PATH. We therefore need to ensure that this ld is the same ld as would be used for other builds, such as PGO. This change is the most expedient way to do that; future work will make the gcc job(s) depend on linux64-binutils directly. Depends on D22881 Differential Revision: https://phabricator.services.mozilla.com/D22882
taskcluster/ci/fetch/toolchains.yml
taskcluster/ci/toolchain/gcc.yml
taskcluster/scripts/misc/build-gcc-6-linux.sh
taskcluster/scripts/misc/build-gcc-7-linux.sh
taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
--- a/taskcluster/ci/fetch/toolchains.yml
+++ b/taskcluster/ci/fetch/toolchains.yml
@@ -15,27 +15,16 @@ binutils-2.27:
     type: static-url
     url: ftp://ftp.gnu.org/gnu/binutils/binutils-2.27.tar.bz2
     sha256: 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
     size: 26099568
     gpg-signature:
       sig-url: "{url}.sig"
       key-path: build/unix/build-gcc/EAF1C276A747E9ED86210CBAC3126D3B4AE55E93.key
 
-binutils-2.28.1:
-  description: binutils 2.28.1 source code
-  fetch:
-    type: static-url
-    url: ftp://ftp.gnu.org/gnu/binutils/binutils-2.28.1.tar.xz
-    sha256: 16328a906e55a3c633854beec8e9e255a639b366436470b4f6245eb0d2fde942
-    size: 19440112
-    gpg-signature:
-      sig-url: "{url}.sig"
-      key-path: build/unix/build-gcc/EAF1C276A747E9ED86210CBAC3126D3B4AE55E93.key
-
 binutils-2.31.1:
   description: binutils 2.31.1 source code
   fetch:
     type: static-url
     url: ftp://ftp.gnu.org/gnu/binutils/binutils-2.31.1.tar.xz
     sha256: 5d20086ecf5752cc7d9134246e9588fa201740d540f7eb84d795b1f7a93bca86
     size: 20467996
     gpg-signature:
--- a/taskcluster/ci/toolchain/gcc.yml
+++ b/taskcluster/ci/toolchain/gcc.yml
@@ -31,32 +31,32 @@ linux64-gcc-6:
     description: "GCC 6 toolchain build"
     treeherder:
         symbol: TL(gcc6)
     run:
         script: build-gcc-6-linux.sh
         toolchain-alias: linux64-gcc
     fetches:
         fetch:
-            - binutils-2.28.1
+            - binutils-2.31.1
             - gcc-6.4.0
             - gmp-5.1.3
             - isl-0.15
             - mpc-0.8.2
             - mpfr-3.1.5
 
 linux64-gcc-7:
     description: "GCC 7 toolchain build"
     treeherder:
         symbol: TL(gcc7)
     run:
         script: build-gcc-7-linux.sh
     fetches:
         fetch:
-            - binutils-2.28.1
+            - binutils-2.31.1
             - gcc-7.3.0
             - gmp-6.1.0
             - isl-0.16.1
             - mpc-1.0.3
             - mpfr-3.1.4
 
 linux64-gcc-sixgill:
     description: "sixgill GCC plugin build"
@@ -66,14 +66,14 @@ linux64-gcc-sixgill:
         script: build-gcc-sixgill-plugin-linux.sh
         resources:
             - 'taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh'
         toolchain-artifact: public/build/sixgill.tar.xz
     toolchains:
         - linux64-gcc-6
     fetches:
         fetch:
-            - binutils-2.28.1
+            - binutils-2.31.1
             - isl-0.15
             - gcc-6.4.0
             - gmp-5.1.3
             - mpc-0.8.2
             - mpfr-3.1.5
--- a/taskcluster/scripts/misc/build-gcc-6-linux.sh
+++ b/taskcluster/scripts/misc/build-gcc-6-linux.sh
@@ -9,17 +9,17 @@ UPLOAD_DIR=$HOME/artifacts
 
 root_dir=$HOME_DIR
 data_dir=$HOME_DIR/src/build/unix/build-gcc
 
 . $data_dir/build-gcc.sh
 
 gcc_version=6.4.0
 gcc_ext=xz
-binutils_version=2.28.1
+binutils_version=2.31.1
 binutils_ext=xz
 
 pushd $root_dir/gcc-$gcc_version
 ln -sf ../gmp-5.1.3 gmp
 ln -sf ../isl-0.15 isl
 ln -sf ../mpc-0.8.2 mpc
 ln -sf ../mpfr-3.1.5 mpfr
 popd
--- a/taskcluster/scripts/misc/build-gcc-7-linux.sh
+++ b/taskcluster/scripts/misc/build-gcc-7-linux.sh
@@ -9,17 +9,17 @@ UPLOAD_DIR=$HOME/artifacts
 
 root_dir=$HOME_DIR
 data_dir=$HOME_DIR/src/build/unix/build-gcc
 
 . $data_dir/build-gcc.sh
 
 gcc_version=7.3.0
 gcc_ext=xz
-binutils_version=2.28.1
+binutils_version=2.31.1
 binutils_ext=xz
 
 pushd $root_dir/gcc-$gcc_version
 ln -sf ../gmp-6.1.0 gmp
 ln -sf ../isl-0.16.1 isl
 ln -sf ../mpc-1.0.3 mpc
 ln -sf ../mpfr-3.1.4 mpfr
 popd
--- a/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
+++ b/taskcluster/scripts/misc/build-gcc-sixgill-plugin-linux.sh
@@ -23,17 +23,17 @@ gcc_ext=xz
 binutils_version=2.28.1
 binutils_ext=xz
 sixgill_rev=bc0ef9258470
 sixgill_repo=https://hg.mozilla.org/users/sfink_mozilla.com/sixgill
 
 . $data_dir/build-gcc.sh
 
 pushd $root_dir/gcc-$gcc_version
-ln -sf ../binutils-2.28.1 binutils
+ln -sf ../binutils-2.31.1 binutils
 ln -sf ../gmp-5.1.3 gmp
 ln -sf ../isl-0.15 isl
 ln -sf ../mpc-0.8.2 mpc
 ln -sf ../mpfr-3.1.5 mpfr
 popd
 
 export TMPDIR=${TMPDIR:-/tmp/}
 export gcc_bindir=$root_dir/src/gcc/bin