Switch to GCC7.2 for ARMv7 and ARM64

mozilla · Oct 11, 2018 · a093848 · a093848
1 parent f009ad0
commit a093848
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/native_client/BUILD b/native_client/BUILD
@@ -33,6 +33,14 @@ tf_cc_shared_object(
     # -Wno-sign-compare to silent a lot of warnings from tensorflow itself,
     # which makes it harder to see our own warnings
     copts = ["-Wno-sign-compare", "-fvisibility=hidden"],
+    linkopts = select({
+        "//tensorflow:darwin": [],
+        "//conditions:default": [
+            "-Wl,-Bsymbolic",
+            "-Wl,-Bsymbolic-functions",
+            "-Wl,-export-dynamic",
+        ],
+    }),
     deps = [
         "//tensorflow/core:core_cpu",
         "//tensorflow/core:direct_session",

diff --git a/native_client/definitions.mk b/native_client/definitions.mk
@@ -19,7 +19,7 @@ endif
 endif
 
 ifeq ($(TARGET),rpi3)
-TOOLCHAIN   ?= ${TFDIR}/bazel-$(shell basename "${TFDIR}")/external/LinaroArmGcc49/bin/arm-linux-gnueabihf-
+TOOLCHAIN   ?= ${TFDIR}/bazel-$(shell basename "${TFDIR}")/external/LinaroArmGcc72/bin/arm-linux-gnueabihf-
 RASPBIAN    ?= $(abspath $(NC_DIR)/../multistrap-raspbian-stretch)
 CFLAGS      := -march=armv7-a -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard -D_GLIBCXX_USE_CXX11_ABI=0 --sysroot $(RASPBIAN)
 CXXFLAGS    := $(CXXFLAGS)
@@ -38,7 +38,7 @@ TOOLCHAIN_LDD_OPTS   := --root $(RASPBIAN)/
 endif # ($(TARGET),rpi3)
 
 ifeq ($(TARGET),rpi3-armv8)
-TOOLCHAIN   ?= ${TFDIR}/bazel-$(shell basename "${TFDIR}")/external/LinaroAarch64Gcc49/bin/aarch64-linux-gnu-
+TOOLCHAIN   ?= ${TFDIR}/bazel-$(shell basename "${TFDIR}")/external/LinaroAarch64Gcc72/bin/aarch64-linux-gnu-
 RASPBIAN    ?= $(abspath $(NC_DIR)/../multistrap-raspbian64-stretch)
 CFLAGS      := -march=armv8-a -mtune=cortex-a53 -D_GLIBCXX_USE_CXX11_ABI=0 --sysroot $(RASPBIAN)
 CXXFLAGS    := $(CFLAGS)