Upgrade linaro versions to 7.3.1 (#2)

curtismuntz · Nov 28, 2019 · bba1446 · bba1446
1 parent 1d7d846
commit bba1446
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 39 deletions.
diff --git a/compilers/arm_compiler/cc_toolchain_config.bzl b/compilers/arm_compiler/cc_toolchain_config.bzl
@@ -266,11 +266,13 @@ def _impl(ctx):
                                 "-mfloat-abi=hard",
                                 "-nostdinc",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_armv7/lib/gcc/arm-linux-gnueabihf/5.3.1/include",
+                                "external/org_linaro_components_toolchain_gcc_armv7/lib/gcc/arm-linux-gnueabihf/7.3.1/include",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_armv7/arm-linux-gnueabihf/libc/usr/include",
+                                "external/org_linaro_components_toolchain_gcc_armv7/lib/gcc/arm-linux-gnueabihf/7.3.1/include-fixed",
+                                "-isystem",
+                                "external/org_linaro_components_toolchain_gcc_armv7/arm-linux-gnueabihf/include/c++/7.3.1",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_armv7/lib/gcc/arm-linux-gnueabihf/5.3.1/include-fixed",
+                                "external/org_linaro_components_toolchain_gcc_armv7/arm-linux-gnueabihf/libc/usr/include",
                                 "-isystem",
                                 "external/org_linaro_components_toolchain_gcc_armv7/arm-linux-gnueabihf/libc/usr/include",
                                 "-U_FORTIFY_SOURCE",
@@ -341,13 +343,15 @@ def _impl(ctx):
                         flag_group(
                             flags = [
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_armv7/arm-linux-gnueabihf/include/c++/5.3.1/arm-linux-gnueabihf",
+                                "external/org_linaro_components_toolchain_gcc_armv7/arm-linux-gnueabihf/include/c++/7.3.1/arm-linux-gnueabihf",
+                                "-isystem",
+                                "external/org_linaro_components_toolchain_gcc_armv7/arm-linux-gnueabihf/include/c++/7.3.1",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_armv7/arm-linux-gnueabihf/include/c++/5.3.1",
+                                "external/org_linaro_components_toolchain_gcc_armv7/include/c++/7.3.1/arm-linux-gnueabihf",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_armv7/include/c++/5.3.1/arm-linux-gnueabihf",
+                                "external/org_linaro_components_toolchain_gcc_armv7/include/c++/7.3.1",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_armv7/include/c++/5.3.1",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/arm-linux-gnueabihf/include/c++/7.3.1",
                             ],
                         ),
                     ],
@@ -469,11 +473,13 @@ def _impl(ctx):
                                 # "-mfloat-abi=hard",
                                 "-nostdinc",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_aarch64/lib/gcc/aarch64-linux-gnu/5.3.1/include",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/lib/gcc/aarch64-linux-gnu/7.3.1/include",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_aarch64/aarch64-linux-gnu/libc/usr/include",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/lib/gcc/aarch64-linux-gnu/7.3.1/include-fixed",
+                                "-isystem",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/aarch64-linux-gnu/include/c++/7.3.1",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_aarch64/lib/gcc/aarch64-linux-gnu/5.3.1/include-fixed",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/aarch64-linux-gnu/libc/usr/include",
                                 "-isystem",
                                 "external/org_linaro_components_toolchain_gcc_aarch64/aarch64-linux-gnu/libc/usr/include",
                                 "-U_FORTIFY_SOURCE",
@@ -544,13 +550,13 @@ def _impl(ctx):
                         flag_group(
                             flags = [
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_aarch64/aarch64-linux-gnu/include/c++/5.3.1/aarch64-linux-gnu",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/aarch64-linux-gnu/include/c++/7.3.1/aarch64-linux-gnu",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_aarch64/aarch64-linux-gnu/include/c++/5.3.1",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/aarch64-linux-gnu/include/c++/7.3.1",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_aarch64/include/c++/5.3.1/aarch64-linux-gnu",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/include/c++/7.3.1/aarch64-linux-gnu",
                                 "-isystem",
-                                "external/org_linaro_components_toolchain_gcc_aarch64/include/c++/5.3.1",
+                                "external/org_linaro_components_toolchain_gcc_aarch64/include/c++/7.3.1",
                             ],
                         ),
                     ],
@@ -778,26 +784,26 @@ def _impl(ctx):
             "%package(@org_linaro_components_toolchain_gcc_armv7//include)%",
             "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/libc/usr/include)%",
             "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/libc/usr/lib/include)%",
-            "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/5.3.1/include-fixed)%",
-            "%package(@org_linaro_components_toolchain_gcc_armv7//include)%/c++/5.3.1",
-            "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/5.3.1/include)%",
-            "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/5.3.1/include-fixed)%",
-            "%package(@org_linaro_components_toolchain_gcc_armv7//lib/gcc/arm-linux-gnueabihf/5.3.1/include)%",
-            "%package(@org_linaro_components_toolchain_gcc_armv7//lib/gcc/arm-linux-gnueabihf/5.3.1/include-fixed)%",
-            "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/include)%/c++/5.3.1",
+            "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/7.3.1/include-fixed)%",
+            "%package(@org_linaro_components_toolchain_gcc_armv7//include)%/c++/7.3.1",
+            "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/7.3.1/include)%",
+            "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/libc/lib/gcc/arm-linux-gnueabihf/7.3.1/include-fixed)%",
+            "%package(@org_linaro_components_toolchain_gcc_armv7//lib/gcc/arm-linux-gnueabihf/7.3.1/include)%",
+            "%package(@org_linaro_components_toolchain_gcc_armv7//lib/gcc/arm-linux-gnueabihf/7.3.1/include-fixed)%",
+            "%package(@org_linaro_components_toolchain_gcc_armv7//arm-linux-gnueabihf/include)%/c++/7.3.1",
         ]
     elif (ctx.attr.cpu == "aarch64-linux-gnu"):
         cxx_builtin_include_directories = [
             "%package(@org_linaro_components_toolchain_gcc_aarch64//include)%",
             "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/libc/usr/include)%",
             "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/libc/usr/lib/include)%",
-            "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/libc/lib/gcc/aarch64-linux-gnu/5.3.1/include-fixed)%",
-            "%package(@org_linaro_components_toolchain_gcc_aarch64//include)%/c++/5.3.1",
-            "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/libc/lib/gcc/aarch64-linux-gnu/5.3.1/include)%",
-            "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/libc/lib/gcc/aarch64-linux-gnu/5.3.1/include-fixed)%",
-            "%package(@org_linaro_components_toolchain_gcc_aarch64//lib/gcc/aarch64-linux-gnu/5.3.1/include)%",
-            "%package(@org_linaro_components_toolchain_gcc_aarch64//lib/gcc/aarch64-linux-gnu/5.3.1/include-fixed)%",
-            "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/include)%/c++/5.3.1",
+            "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/libc/lib/gcc/aarch64-linux-gnu/7.3.1/include-fixed)%",
+            "%package(@org_linaro_components_toolchain_gcc_aarch64//include)%/c++/7.3.1",
+            "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/libc/lib/gcc/aarch64-linux-gnu/7.3.1/include)%",
+            "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/libc/lib/gcc/aarch64-linux-gnu/7.3.1/include-fixed)%",
+            "%package(@org_linaro_components_toolchain_gcc_aarch64//lib/gcc/aarch64-linux-gnu/7.3.1/include)%",
+            "%package(@org_linaro_components_toolchain_gcc_aarch64//lib/gcc/aarch64-linux-gnu/7.3.1/include-fixed)%",
+            "%package(@org_linaro_components_toolchain_gcc_aarch64//aarch64-linux-gnu/include)%/c++/7.3.1",
         ]
     elif (ctx.attr.cpu == "k8"):
         cxx_builtin_include_directories = [

diff --git a/compilers/arm_compiler/linaro_linux_gcc_aarch64/aarch64-linux-gnu-gcc b/compilers/arm_compiler/linaro_linux_gcc_aarch64/aarch64-linux-gnu-gcc
@@ -1,6 +1,6 @@
 #!/bin/bash --norc
 
-PATH="external/org_linaro_components_toolchain_gcc_aarch64/libexec/gcc/aarch64-linux-gnu/5.3.1:$PATH" \
+PATH="external/org_linaro_components_toolchain_gcc_aarch64/libexec/gcc/aarch64-linux-gnu/7.3.1:$PATH" \
     exec \
     external/org_linaro_components_toolchain_gcc_aarch64/bin/aarch64-linux-gnu-gcc \
     "$@"
diff --git a/compilers/arm_compiler/linaro_linux_gcc_armv7/arm-linux-gnueabihf-gcc b/compilers/arm_compiler/linaro_linux_gcc_armv7/arm-linux-gnueabihf-gcc
@@ -1,6 +1,6 @@
 #!/bin/bash --norc
 
-PATH="external/org_linaro_components_toolchain_gcc_armv7/libexec/gcc/arm-linux-gnueabihf/5.3.1:$PATH" \
+PATH="external/org_linaro_components_toolchain_gcc_armv7/libexec/gcc/arm-linux-gnueabihf/7.3.1:$PATH" \
     exec \
     external/org_linaro_components_toolchain_gcc_armv7/bin/arm-linux-gnueabihf-gcc \
     "$@"
diff --git a/compilers/dependencies.bzl b/compilers/dependencies.bzl
@@ -2,9 +2,9 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 def cross_compiler_dependencies(**kwargs):
     armv7_name = "org_linaro_components_toolchain_gcc_armv7"
-    armv7_sha256 = "987941c9fffdf56ffcbe90e8984673c16648c477b537fcf43add22fa62f161cd"
-    armv7_prefix = "gcc-linaro-5.3.1-2016.05-x86_64_arm-linux-gnueabihf"
-    armv7_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"
+    armv7_sha256 = "7248bf105d0d468887a9b8a7120bb281ac8ad0223d9cb3d00dc7c2d498485d91"
+    armv7_prefix = "gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf"
+    armv7_url = "https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/arm-linux-gnueabihf/gcc-linaro-7.3.1-2018.05-x86_64_arm-linux-gnueabihf.tar.xz"
 
     if armv7_name not in native.existing_rules():
         http_archive(
@@ -98,12 +98,9 @@ filegroup(
         )
 
     aarch64_name = "org_linaro_components_toolchain_gcc_aarch64"
-    # aarch64_sha266 = "73eed74e593e2267504efbcf3678918bb22409ab7afa3dc7c135d2c6790c2345"
-    # aarch64_prefix = "gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu"
-    # aarch64_url = "https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/aarch64-linux-gnu/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz"
-    aarch64_sha266 = "1941dcf6229d6706bcb89b7976d5d43d170efdd17c27d5fe1738e7ecf22adc37"
-    aarch64_prefix = "gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu"
-    aarch64_url = "https://releases.linaro.org/components/toolchain/binaries/5.3-2016.05/aarch64-linux-gnu/gcc-linaro-5.3.1-2016.05-x86_64_aarch64-linux-gnu.tar.xz"
+    aarch64_sha266 = "73eed74e593e2267504efbcf3678918bb22409ab7afa3dc7c135d2c6790c2345"
+    aarch64_prefix = "gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu"
+    aarch64_url = "https://releases.linaro.org/components/toolchain/binaries/7.3-2018.05/aarch64-linux-gnu/gcc-linaro-7.3.1-2018.05-x86_64_aarch64-linux-gnu.tar.xz"
 
     if aarch64_name not in native.existing_rules():
         http_archive(