From: Angus Gratton <angus@espressif.com>
Date: Wed, 10 Jan 2018 23:30:36 +0000 (+1100)
Subject: build: Remove explict -lstdc++-psram-workaround
X-Git-Tag: v3.0~76^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b523660199d1d07040af428a61009a776b6e06b5;p=esp-idf

build: Remove explict -lstdc++-psram-workaround

This is now handled internally to the toolchain.
---

diff --git a/components/esp32/Makefile.projbuild b/components/esp32/Makefile.projbuild
index e832f2984d..63318dd66b 100644
--- a/components/esp32/Makefile.projbuild
+++ b/components/esp32/Makefile.projbuild
@@ -36,8 +36,5 @@ endif # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION
 ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
 CFLAGS+=-mfix-esp32-psram-cache-issue
 CXXFLAGS+=-mfix-esp32-psram-cache-issue
-#Filter out the standard libstdc++ linkage. The component.mk will add a specific 
-#cache-workaround-enabled version.
-LDFLAGS:=$(filter-out -lstdc++,$(LDFLAGS))
 endif
 
diff --git a/components/esp32/component.mk b/components/esp32/component.mk
index ee7b39f83b..cdd1747792 100644
--- a/components/esp32/component.mk
+++ b/components/esp32/component.mk
@@ -38,11 +38,6 @@ COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/libhal.a \
                          -u ld_include_panic_highint_hdl \
                          $(addprefix -T ,$(LINKER_SCRIPTS))
 
-#The cache workaround also needs a c++ standard library recompiled with the workaround.
-ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
-COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/libstdc++-psram-workaround.a
-endif
-
 ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))
 
 COMPONENT_SUBMODULES += lib
diff --git a/components/esp32/libstdc++-psram-workaround.a b/components/esp32/libstdc++-psram-workaround.a
deleted file mode 100644
index 808cb03c4d..0000000000
Binary files a/components/esp32/libstdc++-psram-workaround.a and /dev/null differ