Skip to content

Commit 87e3613

Browse files
committed
ESP32 disable C++ exceptions and RTTI
1 parent 963d911 commit 87e3613

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

platforms/esp32/Makefile.build

+2-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ CFLAGS += -Wall -Werror -pipe -mtext-section-literals \
139139
-DMGOS_ROOT_FS_TYPE='$(MGOS_ROOT_FS_TYPE)' \
140140
-DMGOS_ROOT_FS_OPTS='$(MGOS_ROOT_FS_OPTS)' \
141141
-DMGOS_ROOT_FS_EXTRACT='$(MGOS_ROOT_FS_EXTRACT)'
142-
CXXFLAGS += -pipe -fno-jump-tables -fno-tree-switch-conversion \
142+
CXXFLAGS += -pipe -fno-exceptions -fno-rtti \
143+
-fno-jump-tables -fno-tree-switch-conversion \
143144
$(APP_CXXFLAGS) $(addprefix -I ,$(APP_INCLUDES))
144145

145146
# Settings for the ESP-IDF build system

platforms/esp32/sdkconfig

+3
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,6 @@ CONFIG_ESP_NETIF_TCPIP_ADAPTER_COMPATIBLE_LAYER=n
4646

4747
# Required to be able to update boot loader.
4848
CONFIG_SPI_FLASH_DANGEROUS_WRITE_ALLOWED=y
49+
50+
CONFIG_COMPILER_CXX_EXCEPTIONS=n
51+
CONFIG_COMPILER_CXX_RTTI=n

platforms/esp32/src/esp32_src.mk

+4-3
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,18 @@ MGOS_OBJS = $(addsuffix .o,$(MGOS_SRCS)) esp32_nsleep100.S.o
6363
APP_OBJS = $(addsuffix .o,$(APP_SRCS))
6464
BUILD_INFO_OBJS = $(addsuffix .o,$(notdir $(BUILD_INFO_C)) $(notdir $(MG_BUILD_INFO_C)))
6565

66-
C_CXX_CFLAGS += -DMGOS_APP=\"$(APP)\" -DFW_ARCHITECTURE=$(APP_PLATFORM) \
66+
C_CXX_CFLAGS += -pipe -DMGOS_APP=\"$(APP)\" -DFW_ARCHITECTURE=$(APP_PLATFORM) \
6767
-DMGOS_ESP32 -include mgos_iram.h \
6868
$(MG_FEATURES_TINY) -DMG_NET_IF=MG_NET_IF_LWIP_LOW_LEVEL \
6969
$(MGOS_FEATURES) -DMGOS_MAX_NUM_UARTS=3 \
7070
-DMGOS_DEBUG_UART=$(MGOS_DEBUG_UART) \
7171
-DMG_ENABLE_FILESYSTEM \
7272
-DMG_ENABLE_DIRECTORY_LISTING \
73-
-DMGOS_NUM_HW_TIMERS=4
73+
-DMGOS_NUM_HW_TIMERS=4 \
74+
-fno-jump-tables -fno-tree-switch-conversion
7475

7576
CFLAGS += $(C_CXX_CFLAGS)
76-
CXXFLAGS += $(C_CXX_CFLAGS)
77+
CXXFLAGS += $(C_CXX_CFLAGS) -fno-exceptions -fno-rtti
7778

7879
$(BUILD_INFO_C): $(MGOS_OBJS) $(APP_OBJS)
7980
$(call gen_build_info,$@,$(APP_PATH),$(APP_BUILD_ID),$(APP_VERSION),,$(BUILD_INFO_C),$(BUILD_INFO_JSON))

0 commit comments

Comments
 (0)