Skip to content

Commit

Permalink
cpu/esp32: cleanup of C++ hacks
Browse files Browse the repository at this point in the history
Since former ESP32 toolchain versions used POSIX threads, module `pthread` was required. The built-in `cxa_ctor_guards` had to be replaced since they used the `pthread_once` function for singleton objects initialization where the parameter `once` was of incompatible type with that provided by RIOT's `pthread` module. The current ESP32 toolchain version no longer uses POSIX threads. The dependency on module `pthread` as well as according C++ hacks can be removed.
  • Loading branch information
gschorcht committed Jul 29, 2020
1 parent 107356e commit 2ed4486
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 125 deletions.
4 changes: 0 additions & 4 deletions cpu/esp32/Makefile
Expand Up @@ -6,10 +6,6 @@ DIRS += $(RIOTCPU)/esp_common
DIRS += periph
DIRS += vendor

ifneq (, $(filter esp_cxx, $(USEMODULE)))
DIRS += cxx
endif

ifneq (, $(filter esp_eth, $(USEMODULE)))
DIRS += esp-eth
endif
Expand Down
6 changes: 0 additions & 6 deletions cpu/esp32/Makefile.dep
Expand Up @@ -8,11 +8,6 @@ USEMODULE += esp_idf_soc
USEMODULE += newlib_nano
USEMODULE += pm_layered

ifneq (,$(filter cpp,$(FEATURES_USED)))
USEMODULE += pthread
USEMODULE += esp_cxx
endif

ifneq (,$(filter esp_eth,$(USEMODULE)))
USEMODULE += esp_freertos
USEMODULE += esp_idf_eth
Expand Down Expand Up @@ -41,7 +36,6 @@ endif
ifneq (,$(filter esp_idf_nvs_flash,$(USEMODULE)))
# add additional modules required by esp_idf_nvs_flash
USEMODULE += mtd
USEMODULE += pthread
endif

ifneq (,$(filter periph_rtc,$(USEMODULE)))
Expand Down
1 change: 0 additions & 1 deletion cpu/esp32/Makefile.include
Expand Up @@ -71,7 +71,6 @@ ifneq (,$(filter esp_now,$(USEMODULE)))
endif

ifneq (,$(filter cpp,$(FEATURES_USED)))
UNDEF += $(BINDIR)/esp_cxx/cxa_guard.o
BASELIBS += -lstdc++
endif

Expand Down
3 changes: 0 additions & 3 deletions cpu/esp32/cxx/Makefile

This file was deleted.

111 changes: 0 additions & 111 deletions cpu/esp32/cxx/cxa_guard.cpp

This file was deleted.

0 comments on commit 2ed4486

Please sign in to comment.