summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--show_options.mk3
-rw-r--r--tmk_core/common.mk9
-rw-r--r--tmk_core/common/action.h2
-rw-r--r--tmk_core/common/command.c2
4 files changed, 6 insertions, 10 deletions
diff --git a/show_options.mk b/show_options.mk
index 9a46bb9a8c..8eef258778 100644
--- a/show_options.mk
+++ b/show_options.mk
@@ -84,8 +84,7 @@ OTHER_OPTION_NAMES = \
RGB_MATRIX_KEYPRESSES \
LED_MIRRORED \
RGBLIGHT_FULL_POWER \
- Link_Time_Optimization \
- LINK_TIME_OPTIMIZATION_ENABLE
+ LTO_ENABLE
define NAME_ECHO
@echo " $1 = $($1) # $(origin $1)"
diff --git a/tmk_core/common.mk b/tmk_core/common.mk
index c9d6b1d40b..8e144e530f 100644
--- a/tmk_core/common.mk
+++ b/tmk_core/common.mk
@@ -165,16 +165,13 @@ ifeq ($(strip $(SHARED_EP_ENABLE)), yes)
endif
ifeq ($(strip $(LTO_ENABLE)), yes)
- LINK_TIME_OPTIMIZATION_ENABLE = yes
-endif
-
-ifeq ($(strip $(LINK_TIME_OPTIMIZATION_ENABLE)), yes)
ifeq ($(PLATFORM),CHIBIOS)
$(info Enabling LTO on ChibiOS-targeting boards is known to have a high likelihood of failure.)
- $(info If unsure, set LINK_TIME_OPTIMIZATION_ENABLE = no.)
+ $(info If unsure, set LTO_ENABLE = no.)
endif
EXTRAFLAGS += -flto
- TMK_COMMON_DEFS += -DLINK_TIME_OPTIMIZATION_ENABLE
+ TMK_COMMON_DEFS += -DLTO_ENABLE
+ TMK_COMMON_DEFS += -DLINK_TIME_OPTIMIZATON_ENABLE
endif
# Search Path
diff --git a/tmk_core/common/action.h b/tmk_core/common/action.h
index c82c9c81be..345c030c94 100644
--- a/tmk_core/common/action.h
+++ b/tmk_core/common/action.h
@@ -29,7 +29,7 @@ extern "C" {
#endif
/* Disable macro and function features when LTO is enabled, since they break */
-#ifdef LINK_TIME_OPTIMIZATION_ENABLE
+#ifdef LTO_ENABLE
# ifndef NO_ACTION_MACRO
# define NO_ACTION_MACRO
# endif
diff --git a/tmk_core/common/command.c b/tmk_core/common/command.c
index 3cfcba3058..ab8da55b16 100644
--- a/tmk_core/common/command.c
+++ b/tmk_core/common/command.c
@@ -181,7 +181,7 @@ static void print_version(void) {
#ifdef NKRO_ENABLE
" NKRO"
#endif
-#ifdef LINK_TIME_OPTIMIZATION_ENABLE
+#ifdef LTO_ENABLE
" LTO"
#endif