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 e832f2984d5ab5a8bea6fb86ebba2ce7cb51a8c3..63318dd66bb3ee8a4a71ca686fb0159b59ecd54f 100644 (file)
--- 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 ee7b39f83bd7e23f076b6e07716875cb5e39fc30..cdd174779271f8992a4915fa3fce784d639ac447 100644 (file)
--- 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 (file)
index 808cb03..0000000
Binary files a/components/esp32/libstdc++-psram-workaround.a and /dev/null differ