From e4828fe68d9d8348259607010b1c23350004b576 Mon Sep 17 00:00:00 2001
From: Advait Jain <advaitjain@users.noreply.github.com>
Date: Tue, 20 Oct 2020 22:49:39 -0700
Subject: [PATCH] Add gcc specific linker flag only when building for gcc.

The additional linker flag for fatal-warnings should not be used whe
cross compiling with armclang, or on MacOS.

Fixes #43885 #42049 #44181 #43887 #43865
---
 .../lite/micro/cortex_m_generic/README.md     |  2 +-
 tensorflow/lite/micro/tools/make/Makefile     | 19 ++++++++++++-------
 .../targets/cortex_m_generic_makefile.inc     |  5 ++---
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tensorflow/lite/micro/cortex_m_generic/README.md b/tensorflow/lite/micro/cortex_m_generic/README.md
index b2a561ee8f6..69e65944d4f 100644
--- a/tensorflow/lite/micro/cortex_m_generic/README.md
+++ b/tensorflow/lite/micro/cortex_m_generic/README.md
@@ -22,7 +22,7 @@ Required parameters:
 
 Optional parameters:
 
-  - TOOLCHAIN: armgcc (default) or armmclang
+  - TOOLCHAIN: gcc (default) or armmclang
   - For Cortex-M55, ARM Compiler 6.14 or later is required.
 
 Some examples:
diff --git a/tensorflow/lite/micro/tools/make/Makefile b/tensorflow/lite/micro/tools/make/Makefile
index c7ec3203146..49d7b66ce0b 100644
--- a/tensorflow/lite/micro/tools/make/Makefile
+++ b/tensorflow/lite/micro/tools/make/Makefile
@@ -37,6 +37,7 @@ TARGET := $(HOST_OS)
 TARGET_ARCH := $(HOST_ARCH)
 
 # Default compiler and tool names:
+TOOLCHAIN:=gcc
 CXX_TOOL := g++
 CC_TOOL := gcc
 AR_TOOL := ar
@@ -123,16 +124,20 @@ CXXFLAGS := \
   -fno-threadsafe-statics \
   $(COMMON_FLAGS)
 
-CCFLAGS  := \
-	-std=c11 \
-	$(COMMON_FLAGS)
+CCFLAGS := \
+  -std=c11 \
+  $(COMMON_FLAGS)
 
 ARFLAGS := -r
 
-ifeq ($(filter armclang,$(ALL_TAGS)),)
-LDFLAGS += \
-  -Wl,--fatal-warnings \
-  -Wl,--gc-sections
+ifeq ($(TOOLCHAIN), gcc)
+  ifneq ($(TARGET), osx)
+    # GCC on MacOS uses an LLVM backend so we avoid the additional linker flags
+    # that are unsupported with LLVM.
+    LDFLAGS += \
+      -Wl,--fatal-warnings \
+      -Wl,--gc-sections
+  endif
 endif
 
 # override these in the makefile.inc for specific compiler targets
diff --git a/tensorflow/lite/micro/tools/make/targets/cortex_m_generic_makefile.inc b/tensorflow/lite/micro/tools/make/targets/cortex_m_generic_makefile.inc
index fcaa8afb6fc..6747ab9fc36 100644
--- a/tensorflow/lite/micro/tools/make/targets/cortex_m_generic_makefile.inc
+++ b/tensorflow/lite/micro/tools/make/targets/cortex_m_generic_makefile.inc
@@ -1,7 +1,6 @@
 # Generic Makefile target for ARM Cortex M builds.
 # For more info see: tensorflow/lite/micro/cortex_m_generic/README.md
 
-TOOLCHAIN:=armgcc
 FLOAT := soft
 GCC_TARGET_ARCH := $(TARGET_ARCH)
 
@@ -64,7 +63,7 @@ else
 endif
 
 ifneq ($(filter cortex-m55%,$(TARGET_ARCH)),)
-  ifeq ($(TOOLCHAIN), armgcc)
+  ifeq ($(TOOLCHAIN), gcc)
     $(error "Micro architecure support is not available for arm-gcc for TARGET_ARCH=$(TARGET_ARCH)")
   endif
 
@@ -97,7 +96,7 @@ ifeq ($(TOOLCHAIN), armclang)
   # https://developer.arm.com/documentation/100891/0611/troubleshooting/general-troubleshooting-advice
   MICROLITE_LIBS := $(filter-out -lm,$(MICROLITE_LIBS))
 
-else ifeq ($(TOOLCHAIN), armgcc)
+else ifeq ($(TOOLCHAIN), gcc)
   export PATH := $(MAKEFILE_DIR)/downloads/gcc_embedded/bin/:$(PATH)
   $(eval $(call add_third_party_download,$(GCC_EMBEDDED_URL),$(GCC_EMBEDDED_MD5),gcc_embedded,))