Update linaro toolchain version and sources

Fixes #1903.

--
Change-Id: Ifd8f3676ed8cf6cef514a0294a22330cc326e6b5
Reviewed-on: https://bazel-review.googlesource.com/#/c/6590/
MOS_MIGRATED_REVID=136348803

14 files changed, 53 insertions, 50 deletions

diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 8b54e5a19b..d815e5e97a 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -123,6 +123,9 @@ sh_test(
         ":test-deps",
         "//src/test/shell/bazel/testdata:bazel_toolchain_test_project_pkg",
     ],
+    tags = [
+        "requires-network",
+    ],
 )
 
 # TODO(bazel-team): zip is non-deterministic because of file timestamp,
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/WORKSPACE.linaro b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/WORKSPACE.linaro
index 3360657f3a..ad61e0f6c5 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/WORKSPACE.linaro
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/WORKSPACE.linaro
@@ -1,6 +1,6 @@
 new_http_archive(
-  name = 'linaroLinuxGcc49Repo',
-  build_file = 'compilers/linaro_linux_gcc_4.9.BUILD',
-  url = 'https://releases.linaro.org/15.05/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.05-x86_64_arm-linux-gnueabihf.tar.xz',
-  strip_prefix = 'gcc-linaro-4.9-2015.05-x86_64_arm-linux-gnueabihf',
+  name = 'org_linaro_components_toolchain_gcc_5_3_1',
+  build_file = 'compilers/linaro_linux_gcc_5.3.1.BUILD',
+  url = 'https://bazel-mirror.storage.googleapis.com/releases.linaro.org/components/toolchain/binaries/latest-5/arm-linux-gnueabihf/gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf.tar.xz',
+  strip_prefix = 'gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf',
 )
\ No newline at end of file
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/compilers/linaro_linux_gcc_4.9.BUILD b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/compilers/linaro_linux_gcc_5.3.1.BUILD
index b231d0180e..b231d0180e 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/compilers/linaro_linux_gcc_4.9.BUILD
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/compilers/linaro_linux_gcc_5.3.1.BUILD
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/BUILD b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/BUILD
index e065b2203d..9cbb253084 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/BUILD
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/BUILD
@@ -14,7 +14,7 @@ filegroup(
         ":cc-compiler-armeabi-v7a",
         ":cc-compiler-k8",
         ":linaro_linux_all_files",
-        "@linaroLinuxGcc49Repo//:compiler_components",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:compiler_components",
     ],
 )
 
@@ -39,7 +39,7 @@ filegroup(
     name = "linaro_linux_all_files",
     srcs = [
         "//tools/arm_compiler/linaro_linux_gcc:tool-wrappers",
-        "@linaroLinuxGcc49Repo//:compiler_pieces",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:compiler_pieces",
     ],
 )
 
@@ -49,7 +49,7 @@ filegroup(
         "//tools/arm_compiler/linaro_linux_gcc:ar",
         "//tools/arm_compiler/linaro_linux_gcc:gcc",
         "//tools/arm_compiler/linaro_linux_gcc:ld",
-        "@linaroLinuxGcc49Repo//:compiler_pieces",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:compiler_pieces",
     ],
 )
 
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL
index 829148b904..bbd9c4d7e5 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/CROSSTOOL
@@ -47,48 +47,48 @@ toolchain {
   tool_path { name: "objdump" path: "linaro_linux_gcc/arm-linux-gnueabihf-objdump" }
   tool_path { name: "strip" path: "linaro_linux_gcc/arm-linux-gnueabihf-strip" }
 
-  compiler_flag: "--sysroot=external/linaroLinuxGcc49Repo/arm-linux-gnueabihf/libc"
+  compiler_flag: "--sysroot=external/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/libc"
   compiler_flag: "-mfloat-abi=hard"
 
   compiler_flag: "-nostdinc"
   compiler_flag: "-isystem"
-  compiler_flag: "external/linaroLinuxGcc49Repo/lib/gcc/arm-linux-gnueabihf/4.9.3/include"
+  compiler_flag: "external/org_linaro_components_toolchain_gcc_5_3_1/lib/gcc/arm-linux-gnueabihf/5.3.1/include"
   compiler_flag: "-isystem"
-  compiler_flag: "external/linaroLinuxGcc49Repo/arm-linux-gnueabihf/libc/usr/include"
+  compiler_flag: "external/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/libc/usr/include"
   compiler_flag: "-isystem"
-  compiler_flag: "external/linaroLinuxGcc49Repo/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed"
+  compiler_flag: "external/org_linaro_components_toolchain_gcc_5_3_1/lib/gcc/arm-linux-gnueabihf/5.3.1/include-fixed"
   compiler_flag: "-isystem"
-  compiler_flag: "external/linaroLinuxGcc49Repo/arm-linux-gnueabihf/libc/usr/include"
+  compiler_flag: "external/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/libc/usr/include"
   cxx_flag: "-isystem"
-  cxx_flag: "external/linaroLinuxGcc49Repo/arm-linux-gnueabihf/include/c++/4.9.3/arm-linux-gnueabihf"
+  cxx_flag: "external/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/include/c++/5.3.1/arm-linux-gnueabihf"
   cxx_flag: "-isystem"
-  cxx_flag: "external/linaroLinuxGcc49Repo/arm-linux-gnueabihf/include/c++/4.9.3"
+  cxx_flag: "external/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/include/c++/5.3.1"
   cxx_flag: "-isystem"
-  cxx_flag: "external/linaroLinuxGcc49Repo/include/c++/4.9.3/arm-linux-gnueabihf"
+  cxx_flag: "external/org_linaro_components_toolchain_gcc_5_3_1/include/c++/5.3.1/arm-linux-gnueabihf"
   cxx_flag: "-isystem"
-  cxx_flag: "external/linaroLinuxGcc49Repo/include/c++/4.9.3"
-
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//include)%"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//arm-linux-gnueabihf/libc/usr/include)%"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//arm-linux-gnueabihf/libc/usr/lib/include)%"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//include)%/c++/4.9.3"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include)%"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//lib/gcc/arm-linux-gnueabihf/4.9.3/include)%"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//lib/gcc/arm-linux-gnueabihf/4.9.3/include-fixed)%"
-  cxx_builtin_include_directory: "%package(@linaroLinuxGcc49Repo//arm-linux-gnueabihf/include)%/c++/4.9.3"
-
-  linker_flag: "--sysroot=external/linaroLinuxGcc49Repo/arm-linux-gnueabihf/libc"
+  cxx_flag: "external/org_linaro_components_toolchain_gcc_5_3_1/include/c++/5.3.1"
+
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//include)%"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//arm-linux-gnueabihf/libc/usr/include)%"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//arm-linux-gnueabihf/libc/usr/lib/include)%"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/5.3.1/include-fixed)%"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//include)%/c++/5.3.1"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/5.3.1/include)%"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/5.3.1/include-fixed)%"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//lib/gcc/arm-linux-gnueabihf/5.3.1/include)%"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//lib/gcc/arm-linux-gnueabihf/5.3.1/include-fixed)%"
+  cxx_builtin_include_directory: "%package(@org_linaro_components_toolchain_gcc_5_3_1//arm-linux-gnueabihf/include)%/c++/5.3.1"
+
+  linker_flag: "--sysroot=external/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/libc"
   linker_flag: "-lstdc++"
   linker_flag: "-latomic"
   linker_flag: "-lm"
   linker_flag: "-lpthread"
   linker_flag: "-Ltools/arm_compiler/linaro_linux_gcc/clang_more_libs"
-  linker_flag: "-Lexternal/linaroLinuxGcc49Repo/arm-linux-gnueabihf/lib"
-  linker_flag: "-Lexternal/linaroLinuxGcc49Repo/arm-linux-gnueabihf/libc/lib"
-  linker_flag: "-Lexternal/linaroLinuxGcc49Repo/arm-linux-gnueabihf/libc/usr/lib"
-  linker_flag: "-Bexternal/linaroLinuxGcc49Repo/arm-linux-gnueabihf/bin"
+  linker_flag: "-Lexternal/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/lib"
+  linker_flag: "-Lexternal/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/libc/lib"
+  linker_flag: "-Lexternal/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/libc/usr/lib"
+  linker_flag: "-Bexternal/org_linaro_components_toolchain_gcc_5_3_1/arm-linux-gnueabihf/bin"
   linker_flag: "-Wl,--dynamic-linker=/lib/ld-linux-armhf.so.3"
 
   # Anticipated future default.
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/BUILD b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/BUILD
index 832c6ac0a3..eb686e8899 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/BUILD
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/BUILD
@@ -10,7 +10,7 @@ filegroup(
     name = "gcc",
     srcs = [
         "arm-linux-gnueabihf-gcc",
-        "@linaroLinuxGcc49Repo//:gcc",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:gcc",
     ],
 )
 
@@ -18,7 +18,7 @@ filegroup(
     name = "ar",
     srcs = [
         "arm-linux-gnueabihf-ar",
-        "@linaroLinuxGcc49Repo//:ar",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:ar",
     ],
 )
 
@@ -26,7 +26,7 @@ filegroup(
     name = "ld",
     srcs = [
         "arm-linux-gnueabihf-ld",
-        "@linaroLinuxGcc49Repo//:ld",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:ld",
     ],
 )
 
@@ -34,7 +34,7 @@ filegroup(
     name = "nm",
     srcs = [
         "arm-linux-gnueabihf-nm",
-        "@linaroLinuxGcc49Repo//:nm",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:nm",
     ],
 )
 
@@ -42,7 +42,7 @@ filegroup(
     name = "objcopy",
     srcs = [
         "arm-linux-gnueabihf-objcopy",
-        "@linaroLinuxGcc49Repo//:objcopy",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:objcopy",
     ],
 )
 
@@ -50,7 +50,7 @@ filegroup(
     name = "objdump",
     srcs = [
         "arm-linux-gnueabihf-objdump",
-        "@linaroLinuxGcc49Repo//:objdump",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:objdump",
     ],
 )
 
@@ -58,7 +58,7 @@ filegroup(
     name = "strip",
     srcs = [
         "arm-linux-gnueabihf-strip",
-        "@linaroLinuxGcc49Repo//:strip",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:strip",
     ],
 )
 
@@ -66,7 +66,7 @@ filegroup(
     name = "as",
     srcs = [
         "arm-linux-gnueabihf-as",
-        "@linaroLinuxGcc49Repo//:as",
+        "@org_linaro_components_toolchain_gcc_5_3_1//:as",
     ],
 )
 
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-ar b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-ar
index 59c293a2ad..c84ed2792c 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-ar
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-ar
@@ -1,5 +1,5 @@
 #!/bin/bash --norc
 
 exec -a arm-linux-gnueabihf-ar \
-    external/linaroLinuxGcc49Repo/bin/arm-linux-gnueabihf-ar \
+    external/org_linaro_components_toolchain_gcc_5_3_1/bin/arm-linux-gnueabihf-ar \
     "$@"
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-as b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-as
index 6b84a72d23..7738e76f97 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-as
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-as
@@ -1,5 +1,5 @@
 #!/bin/bash --norc
 
 exec -a arm-linux-gnueabihf-as \
-    external/linaroLinuxGcc49Repo/bin/arm-linux-gnueabihf-as \
+    external/org_linaro_components_toolchain_gcc_5_3_1/bin/arm-linux-gnueabihf-as \
     "$@"
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-gcc b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-gcc
index c4d1fef021..ffc39672c9 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-gcc
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-gcc
@@ -1,6 +1,6 @@
 #!/bin/bash --norc
 
-PATH="external/linaroLinuxGcc49Repo/libexec/gcc/arm-linux-gnueabihf/4.9.3:$PATH" \
+PATH="external/org_linaro_components_toolchain_gcc_5_3_1/libexec/gcc/arm-linux-gnueabihf/4.9.3:$PATH" \
     exec \
-    external/linaroLinuxGcc49Repo/bin/arm-linux-gnueabihf-gcc \
+    external/org_linaro_components_toolchain_gcc_5_3_1/bin/arm-linux-gnueabihf-gcc \
     "$@"
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-ld b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-ld
index 1ffe8e20b7..b56a1c1a8a 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-ld
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-ld
@@ -1,5 +1,5 @@
 #!/bin/bash --norc
 
 exec -a arm-linux-gnueabihf-ld \
-    external/linaroLinuxGcc49Repo/bin/arm-linux-gnueabihf-ld \
+    external/org_linaro_components_toolchain_gcc_5_3_1/bin/arm-linux-gnueabihf-ld \
     "$@"
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-nm b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-nm
index 29fd89bf9b..c802e5bf86 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-nm
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-nm
@@ -1,5 +1,5 @@
 #!/bin/bash --norc
 
 exec -a arm-linux-gnueabihf-nm \
-    external/linaroLinuxGcc49Repo/bin/arm-linux-gnueabihf-nm \
+    external/org_linaro_components_toolchain_gcc_5_3_1/bin/arm-linux-gnueabihf-nm \
     "$@"
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-objcopy b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-objcopy
index c34969ebb7..503184b97e 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-objcopy
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-objcopy
@@ -1,5 +1,5 @@
 #!/bin/bash --norc
 
 exec -a arm-linux-gnueabihf-objcopy \
-    external/linaroLinuxGcc49Repo/bin/arm-linux-gnueabihf-objcopy \
+    external/org_linaro_components_toolchain_gcc_5_3_1/bin/arm-linux-gnueabihf-objcopy \
     "$@"
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-objdump b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-objdump
index 3c0275e116..5c9667a9c3 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-objdump
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-objdump
@@ -1,5 +1,5 @@
 #!/bin/bash --norc
 
 exec -a arm-linux-gnueabihf-objdump \
-    external/linaroLinuxGcc49Repo/bin/arm-linux-gnueabihf-objdump \
+    external/org_linaro_components_toolchain_gcc_5_3_1/bin/arm-linux-gnueabihf-objdump \
     "$@"
diff --git a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-strip b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-strip
index 8023109b84..9e71cbfef7 100644
--- a/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-strip
+++ b/src/test/shell/bazel/testdata/bazel_toolchain_test_data/tools/arm_compiler/linaro_linux_gcc/arm-linux-gnueabihf-strip
@@ -1,5 +1,5 @@
 #!/bin/bash --norc
 
 exec -a arm-linux-gnueabihf-strip \
-    external/linaroLinuxGcc49Repo/bin/arm-linux-gnueabihf-strip \
+    external/org_linaro_components_toolchain_gcc_5_3_1/bin/arm-linux-gnueabihf-strip \
     "$@"