Skip to content

Commit

Permalink
[build] update build to use gnu++17 (#147)
Browse files Browse the repository at this point in the history 
* [build] remove error-mapping from build

* [build] update build to use gnu++17

* remove register keyword
  • Loading branch information
@step0035
step0035 authored Aug 14, 2023
1 parent a928cef commit aa6fe51
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 43 deletions.
3 changes: 1 addition & 2 deletions component/common/application/matter/example/aircon/lib_chip_aircon_core.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ CXXFLAGS += -Wno-format
CXXFLAGS += -Wno-format-nonliteral
CXXFLAGS += -Wno-format-security

CXXFLAGS += -std=gnu++14
#CXXFLAGS += -std=c++14
CXXFLAGS += -std=gnu++17
CXXFLAGS += -fno-rtti

CHIP_CFLAGS = $(CFLAGS)
Expand Down
4 changes: 1 addition & 3 deletions component/common/application/matter/example/aircon/lib_chip_aircon_main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ SRC_CPP += $(CHIPDIR)/src/app/util/ember-compatibility-functions.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/generic-callback-stubs.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/message.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/util.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/error-mapping.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/privilege-storage.cpp

SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp
Expand Down Expand Up @@ -301,8 +300,7 @@ CPPFLAGS += -Wno-deprecated-declarations
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-format

CPPFLAGS += -std=gnu++14
#CPPFLAGS += -std=c++14
CPPFLAGS += -std=gnu++17
CPPFLAGS += -fno-rtti

# Compile
Expand Down
3 changes: 1 addition & 2 deletions component/common/application/matter/example/light/lib_chip_light_core.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ CXXFLAGS += -Wno-format
CXXFLAGS += -Wno-format-nonliteral
CXXFLAGS += -Wno-format-security

CXXFLAGS += -std=gnu++14
#CXXFLAGS += -std=c++14
CXXFLAGS += -std=gnu++17
CXXFLAGS += -fno-rtti

CHIP_CFLAGS = $(CFLAGS)
Expand Down
4 changes: 1 addition & 3 deletions component/common/application/matter/example/light/lib_chip_light_main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ SRC_CPP += $(CHIPDIR)/src/app/util/ember-compatibility-functions.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/generic-callback-stubs.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/message.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/util.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/error-mapping.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/privilege-storage.cpp

SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp
Expand Down Expand Up @@ -301,8 +300,7 @@ CPPFLAGS += -Wno-deprecated-declarations
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-format

CPPFLAGS += -std=gnu++14
#CPPFLAGS += -std=c++14
CPPFLAGS += -std=gnu++17
CPPFLAGS += -fno-rtti

# Compile
Expand Down
3 changes: 1 addition & 2 deletions component/common/application/matter/example/thermostat/lib_chip_thermostat_core.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ CXXFLAGS += -Wno-format
CXXFLAGS += -Wno-format-nonliteral
CXXFLAGS += -Wno-format-security

CXXFLAGS += -std=gnu++14
#CXXFLAGS += -std=c++14
CXXFLAGS += -std=gnu++17
CXXFLAGS += -fno-rtti

CHIP_CFLAGS = $(CFLAGS)
Expand Down
4 changes: 1 addition & 3 deletions component/common/application/matter/example/thermostat/lib_chip_thermostat_main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ SRC_CPP += $(CHIPDIR)/src/app/util/ember-compatibility-functions.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/generic-callback-stubs.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/message.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/util.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/error-mapping.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/privilege-storage.cpp

SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp
Expand Down Expand Up @@ -302,8 +301,7 @@ CPPFLAGS += -Wno-deprecated-declarations
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-format

CPPFLAGS += -std=gnu++14
#CPPFLAGS += -std=c++14
CPPFLAGS += -std=gnu++17
CPPFLAGS += -fno-rtti

# Compile
Expand Down
6 changes: 3 additions & 3 deletions component/soc/realtek/8710c/cmsis/rtl8710c/include/core_tm9_cache.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,9 @@ __STATIC_INLINE void SCB_NS_EnableDCache (void)
__STATIC_INLINE void SCB_DisableDCache (void)
{
#if defined (__DCACHE_PRESENT) && (__DCACHE_PRESENT == 1U)
register uint32_t ccsidr;
register uint32_t sets;
register uint32_t ways;
uint32_t ccsidr;
uint32_t sets;
uint32_t ways;

SCB->CSSELR = 0U; /*(0U << 1U) | 0U;*/ /* Level 1 data cache */
__DSB();
Expand Down
3 changes: 1 addition & 2 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ CXXFLAGS += -Wno-deprecated-declarations
CXXFLAGS += -Wno-unused-parameter
CXXFLAGS += -Wno-format

CXXFLAGS += -std=gnu++14
#CXXFLAGS += -std=c++14
CXXFLAGS += -std=gnu++17
CXXFLAGS += -fno-rtti
CXXFLAGS += -Wno-format-nonliteral
CXXFLAGS += -Wno-format-security
Expand Down
3 changes: 1 addition & 2 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_chef_core.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ CXXFLAGS += -Wno-format
CXXFLAGS += -Wno-format-nonliteral
CXXFLAGS += -Wno-format-security

CXXFLAGS += -std=gnu++11
CXXFLAGS += -std=c++14
CXXFLAGS += -std=gnu++17
CXXFLAGS += -fno-rtti

CHIP_CFLAGS = $(CFLAGS)
Expand Down
4 changes: 1 addition & 3 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_chef_main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,6 @@ SRC_CPP += $(CHIPDIR)/src/app/util/ember-compatibility-functions.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/generic-callback-stubs.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/message.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/util.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/error-mapping.cpp

SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp

Expand Down Expand Up @@ -295,8 +294,7 @@ CPPFLAGS += -Wno-deprecated-declarations
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-format

#CPPFLAGS += -std=gnu++11
CPPFLAGS += -std=c++14
CPPFLAGS += -std=gnu++17
CPPFLAGS += -fno-rtti

include toolchain.mk
Expand Down
3 changes: 1 addition & 2 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_light_core.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,7 @@ CXXFLAGS += -Wno-format
CXXFLAGS += -Wno-format-nonliteral
CXXFLAGS += -Wno-format-security

CXXFLAGS += -std=gnu++14
#CXXFLAGS += -std=c++14
CXXFLAGS += -std=gnu++17
CXXFLAGS += -fno-rtti

CHIP_CFLAGS = $(CFLAGS)
Expand Down
4 changes: 1 addition & 3 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_light_main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ SRC_CPP += $(CHIPDIR)/src/app/util/ember-compatibility-functions.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/generic-callback-stubs.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/message.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/util.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/error-mapping.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/privilege-storage.cpp

SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp
Expand Down Expand Up @@ -296,8 +295,7 @@ CPPFLAGS += -Wno-deprecated-declarations
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-format

CPPFLAGS += -std=gnu++14
#CPPFLAGS += -std=c++14
CPPFLAGS += -std=gnu++17
CPPFLAGS += -fno-rtti

include toolchain.mk
Expand Down
4 changes: 1 addition & 3 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ SRC_CPP += $(CHIPDIR)/src/app/util/ember-compatibility-functions.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/generic-callback-stubs.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/message.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/util.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/error-mapping.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/privilege-storage.cpp

SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp
Expand Down Expand Up @@ -307,8 +306,7 @@ CPPFLAGS += -Wno-deprecated-declarations
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-format

CPPFLAGS += -std=gnu++14
#CPPFLAGS += -std=c++14
CPPFLAGS += -std=gnu++17
CPPFLAGS += -fno-rtti

include toolchain.mk
Expand Down
3 changes: 1 addition & 2 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_otar_core.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,7 @@ CXXFLAGS += -Wno-format
CXXFLAGS += -Wno-format-nonliteral
CXXFLAGS += -Wno-format-security

CXXFLAGS += -std=gnu++14
#CXXFLAGS += -std=c++14
CXXFLAGS += -std=gnu++17
CXXFLAGS += -fno-rtti

CHIP_CFLAGS = $(CFLAGS)
Expand Down
4 changes: 1 addition & 3 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_otar_main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ SRC_CPP += $(CHIPDIR)/src/app/util/ember-compatibility-functions.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/generic-callback-stubs.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/message.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/util.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/error-mapping.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/privilege-storage.cpp

SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp
Expand Down Expand Up @@ -298,8 +297,7 @@ CPPFLAGS += -Wno-deprecated-declarations
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-format

CPPFLAGS += -std=gnu++14
#CPPFLAGS += -std=c++14
CPPFLAGS += -std=gnu++17
CPPFLAGS += -fno-rtti

include toolchain.mk
Expand Down
3 changes: 1 addition & 2 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_switch_core.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,7 @@ CXXFLAGS += -Wno-deprecated-declarations
CXXFLAGS += -Wno-unused-parameter
CXXFLAGS += -Wno-format

CXXFLAGS += -std=gnu++14
#CXXFLAGS += -std=c++14
CXXFLAGS += -std=gnu++17
CXXFLAGS += -fno-rtti
CXXFLAGS += -Wno-format-nonliteral
CXXFLAGS += -Wno-format-security
Expand Down
4 changes: 1 addition & 3 deletions project/realtek_amebaz2_v0_example/GCC-RELEASE/lib_chip_switch_main.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ SRC_CPP += $(CHIPDIR)/src/app/util/ember-compatibility-functions.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/generic-callback-stubs.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/message.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/util.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/error-mapping.cpp
SRC_CPP += $(CHIPDIR)/src/app/util/privilege-storage.cpp

SRC_CPP += $(CHIPDIR)/src/app/reporting/Engine.cpp
Expand Down Expand Up @@ -301,8 +300,7 @@ CPPFLAGS += -Wno-deprecated-declarations
CPPFLAGS += -Wno-unused-parameter
CPPFLAGS += -Wno-format

CPPFLAGS += -std=gnu++14
#CPPFLAGS += -std=c++14
CPPFLAGS += -std=gnu++17
CPPFLAGS += -fno-rtti

include toolchain.mk
Expand Down

0 comments on commit aa6fe51

Please sign in to comment.