From 10c31c29553641672698e326cd545f425ae5ba92 Mon Sep 17 00:00:00 2001 From: Matthew Kennedy Date: Sun, 31 Jan 2021 11:13:55 -0800 Subject: [PATCH] -g3 to -g (#2256) Co-authored-by: Matthew Kennedy --- firmware/Makefile | 4 ++-- firmware/bootloader/src/Makefile | 2 +- firmware/config/boards/microrusefi/compile_mre_f4.sh | 2 +- .../microrusefi/compile_mre_f4_hardware_QC_special_build.sh | 2 +- firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh | 2 +- firmware/config/boards/proteus/compile_proteus_f4.sh | 2 +- .../proteus/compile_proteus_f4_hardware_QC_special_build.sh | 2 +- .../proteus/compile_proteus_f7_hardware_QC_special_build.sh | 2 +- simulator/Makefile | 4 ++-- unit_tests/Makefile | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/firmware/Makefile b/firmware/Makefile index bf62582b53..0ba687f90e 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -23,10 +23,10 @@ include rusefi.mk ifeq ($(DEBUG_LEVEL_OPT),) # Default to a release build - but leave in debug info. It doesn't change the hex/bin output. - DEBUG_LEVEL_OPT = -O2 -ggdb -g3 + DEBUG_LEVEL_OPT = -O2 -ggdb -g # Comment the above and uncomment the line below if you want to debug the firmware (it's difficult-to-impossible # to debug firmware with optimization enabled). - # DEBUG_LEVEL_OPT = -O0 -ggdb -g3 + # DEBUG_LEVEL_OPT = -O0 -ggdb -g endif diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile index e542c28ee9..a94cf78af4 100644 --- a/firmware/bootloader/src/Makefile +++ b/firmware/bootloader/src/Makefile @@ -7,7 +7,7 @@ # for 'release' options see 'clean_compile_two_versions.bat' file ifeq ($(DEBUG_LEVEL_OPT),) - # this value would be used by default. For 'debug' configuration override with '-O0 -ggdb -g3' or something along these lines + # this value would be used by default. For 'debug' configuration override with '-O0 -ggdb -g' or something along these lines DEBUG_LEVEL_OPT = -O2 DDEFS += -DEFI_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_ASSERTS=FALSE -DCH_DBG_ENABLE_STACK_CHECK=FALSE -DCH_DBG_FILL_THREADS=FALSE -DCH_DBG_THREADS_PROFILING=FALSE endif diff --git a/firmware/config/boards/microrusefi/compile_mre_f4.sh b/firmware/config/boards/microrusefi/compile_mre_f4.sh index 5144be586a..57f98ae95b 100644 --- a/firmware/config/boards/microrusefi/compile_mre_f4.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f4.sh @@ -4,6 +4,6 @@ export PROJECT_BOARD=microrusefi export PROJECT_CPU=ARCH_STM32F4 export EXTRA_PARAMS="-DSHORT_BOARD_NAME=mre_f4" -# export DEBUG_LEVEL_OPT="-O0 -ggdb -g3" +# export DEBUG_LEVEL_OPT="-O0 -ggdb -g" bash ../common_make.sh diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh index 2b58eafc0d..10b9864e50 100644 --- a/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f4_hardware_QC_special_build.sh @@ -7,7 +7,7 @@ export EXTRA_PARAMS="-DHW_CHECK_MODE=TRUE -DANALOG_HW_CHECK_MODE=TRUE -DHW_CHECK export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=MRE_BOARD_NEW_TEST # this QC configuration is used to assert our status with debug info -export DEBUG_LEVEL_OPT="-O0 -ggdb -g3" +export DEBUG_LEVEL_OPT="-O0 -ggdb -g" bash ../common_make.sh diff --git a/firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh b/firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh index cb8469dc59..a33d29285b 100644 --- a/firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh +++ b/firmware/config/boards/microrusefi/compile_mre_f4_recovery.sh @@ -4,6 +4,6 @@ export PROJECT_BOARD=microrusefi export PROJECT_CPU=ARCH_STM32F4 export EXTRA_PARAMS="-DSHORT_BOARD_NAME=mre_f4 -DIGNORE_FLASH_CONFIGURATION=TRUE" -# export DEBUG_LEVEL_OPT="-O0 -ggdb -g3" +# export DEBUG_LEVEL_OPT="-O0 -ggdb -g" bash ../common_make.sh diff --git a/firmware/config/boards/proteus/compile_proteus_f4.sh b/firmware/config/boards/proteus/compile_proteus_f4.sh index 4b886a80c9..d513d80fd6 100644 --- a/firmware/config/boards/proteus/compile_proteus_f4.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4.sh @@ -4,6 +4,6 @@ export PROJECT_BOARD=proteus export PROJECT_CPU=ARCH_STM32F4 export EXTRA_PARAMS=-DSHORT_BOARD_NAME=proteus_f4 -# export DEBUG_LEVEL_OPT="-O0 -ggdb -g3" +# export DEBUG_LEVEL_OPT="-O0 -ggdb -g" bash ../common_make.sh diff --git a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh index 637a8a7fa9..9a6ecb4cc1 100644 --- a/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh +++ b/firmware/config/boards/proteus/compile_proteus_f4_hardware_QC_special_build.sh @@ -6,6 +6,6 @@ export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE -D export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD -# export DEBUG_LEVEL_OPT="-O0 -ggdb -g3" +# export DEBUG_LEVEL_OPT="-O0 -ggdb -g" bash ../common_make.sh diff --git a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh index 868143e066..e27f3aa266 100644 --- a/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh +++ b/firmware/config/boards/proteus/compile_proteus_f7_hardware_QC_special_build.sh @@ -8,6 +8,6 @@ export EXTRA_PARAMS="-DVR_HW_CHECK_MODE=TRUE -DHW_CHECK_ALWAYS_STIMULATE=TRUE -D export DEFAULT_ENGINE_TYPE=-DDEFAULT_ENGINE_TYPE=PROTEUS_QC_TEST_BOARD -# export DEBUG_LEVEL_OPT="-O0 -ggdb -g3" +# export DEBUG_LEVEL_OPT="-O0 -ggdb -g" bash ../common_make.sh diff --git a/simulator/Makefile b/simulator/Makefile index 08c68e78fe..cf422cbb84 100644 --- a/simulator/Makefile +++ b/simulator/Makefile @@ -27,8 +27,8 @@ CONFDIR = . # Compiler options here. ifeq ($(USE_OPT),) # this config if debugging is needed, but the binary is about 50M -# USE_OPT = -Wall -ggdb -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Wno-error=write-strings -Wno-error=strict-aliasing -# USE_OPT = -Wall -O0 -ggdb -g3 -Wno-error=implicit-fallthrough -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Wno-error=write-strings +# USE_OPT = -Wall -ggdb -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Wno-error=write-strings -Wno-error=strict-aliasing +# USE_OPT = -Wall -O0 -ggdb -g -Wno-error=implicit-fallthrough -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers -Wno-error=write-strings # this config producec a smaller binary file # 7.3 compiler would want -Wno-error=implicit-fallthrough while 6.4 does not know about it # see https://github.com/rusefi/rusefi/issues/517 diff --git a/unit_tests/Makefile b/unit_tests/Makefile index b3fa7310a4..103bd32cc3 100644 --- a/unit_tests/Makefile +++ b/unit_tests/Makefile @@ -20,7 +20,7 @@ include $(PROJECT_DIR)/rusefi_rules.mk ifeq ($(USE_OPT),) # -O2 is needed for mingw, without it there is a linking issue to isnanf?!?! #USE_OPT = $(RFLAGS) -O2 -fgnu89-inline -ggdb -fomit-frame-pointer -falign-functions=16 -std=gnu99 -Werror-implicit-function-declaration -Werror -Wno-error=pointer-sign -Wno-error=unused-function -Wno-error=unused-variable -Wno-error=sign-compare -Wno-error=unused-parameter -Wno-error=missing-field-initializers - USE_OPT = -c -Wall -O0 -ggdb -g3 + USE_OPT = -c -Wall -O0 -ggdb -g USE_OPT += -fprofile-arcs -ftest-coverage USE_OPT += -Werror=missing-field-initializers endif