alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
This is now handled internally to the toolchain.
This commit is contained in:
Angus Gratton 2018-01-11 10:30:36 +11:00 committed by Angus Gratton
parent 32eeac0b12
commit b523660199
3 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/esp32/Makefile.projbuild
View File

@ -36,8 +36,5 @@ endif # CONFIG_ESP32_PHY_INIT_DATA_IN_PARTITION
ifdef CONFIG_SPIRAM_CACHE_WORKAROUND ifdef CONFIG_SPIRAM_CACHE_WORKAROUND
CFLAGS+=-mfix-esp32-psram-cache-issue CFLAGS+=-mfix-esp32-psram-cache-issue
CXXFLAGS+=-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 endif

5
components/esp32/component.mk
View File

@ -38,11 +38,6 @@ COMPONENT_ADD_LDFLAGS += $(COMPONENT_PATH)/libhal.a \
-u ld_include_panic_highint_hdl \ -u ld_include_panic_highint_hdl \
$(addprefix -T ,$(LINKER_SCRIPTS)) $(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)) ALL_LIB_FILES := $(patsubst %,$(COMPONENT_PATH)/lib/lib%.a,$(LIBS))
COMPONENT_SUBMODULES += lib COMPONENT_SUBMODULES += lib

BIN
components/esp32/libstdc++-psram-workaround.a
View File

Binary file not shown.