masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile issues related to NO_ACTION_MACRO/FUNCTION and LTO_ENABLE (#8663) 

* Define NO_ACTION_MACRO/FUNCTION in header instead of makefile when LTO is enabled

Currently, boards and keymaps that define NO_ACTION_MACRO/FUNCTION unconditionally
will not compile with LTO_ENABLE (#8604). This fixes the issue by moving the
definitions from common.mk to action.h, which enables us to check for previous
definitions of those macros (this cannot be done in a makefile).

* Remove LTO checks in templates

Since now NO_ACTION_MACRO/FUNCTION are defined as needed in action.h (which is
included by quantum.h), checking for LTO in keyboard and user code is no
longer required.

* Update LTO_ENABLE docs
This commit is contained in:
Konstantin Đorđević 2020-04-09 01:18:30 +02:00 committed by GitHub
parent ff213d5fe1
commit be2f5816b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/config_options.md
View File

@ -115,9 +115,9 @@ If you define these options you will disable the associated feature, which can s
* `#define NO_ACTION_ONESHOT` * `#define NO_ACTION_ONESHOT`
* disable one-shot modifiers * disable one-shot modifiers
* `#define NO_ACTION_MACRO` * `#define NO_ACTION_MACRO`
* disable old style macro handling: MACRO() & action_get_macro * disable old-style macro handling using `MACRO()`, `action_get_macro()` _(deprecated)_
* `#define NO_ACTION_FUNCTION` * `#define NO_ACTION_FUNCTION`
* disable calling of action_function() from the fn_actions array (deprecated) * disable old-style function handling using `fn_actions`, `action_function()` _(deprecated)_
## Features That Can Be Enabled ## Features That Can Be Enabled
@ -317,10 +317,10 @@ This is a [make](https://www.gnu.org/software/make/manual/make.html) file that i
* `LAYOUTS` * `LAYOUTS`
* A list of [layouts](feature_layouts.md) this keyboard supports. * A list of [layouts](feature_layouts.md) this keyboard supports.
* `LINK_TIME_OPTIMIZATION_ENABLE` * `LINK_TIME_OPTIMIZATION_ENABLE`
* Enables Link Time Optimization (`LTO`) when compiling the keyboard. This makes the process take longer, but can significantly reduce the compiled size (and since the firmware is small, the added time is not noticeable). However, this will automatically disable the old Macros and Functions features automatically, as these break when `LTO` is enabled. * Enables Link Time Optimization (LTO) when compiling the keyboard. This makes the process take longer, but it can significantly reduce the compiled size (and since the firmware is small, the added time is not noticeable).
It does this by automatically defining `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION` However, this will automatically disable the legacy TMK Macros and Functions features, as these break when LTO is enabled. It does this by automatically defining `NO_ACTION_MACRO` and `NO_ACTION_FUNCTION`. (Note: This does not affect QMK [Macros](feature_macros.md) and [Layers](feature_layers.md).)
* `LTO_ENABLE` * `LTO_ENABLE`
* It has the same meaning as LINK_TIME_OPTIMIZATION_ENABLE. You can use `LTO_ENABLE` instead of `LINK_TIME_OPTIMIZATION_ENABLE`. * Has the same meaning as `LINK_TIME_OPTIMIZATION_ENABLE`. You can use `LTO_ENABLE` instead of `LINK_TIME_OPTIMIZATION_ENABLE`.
## AVR MCU Options ## AVR MCU Options
* `MCU = atmega32u4` * `MCU = atmega32u4`

7
quantum/template/avr/config.h
View File

@ -192,10 +192,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT //#define NO_ACTION_ONESHOT
/* disable these deprecated features by default */ /* disable these deprecated features by default */
#ifndef LINK_TIME_OPTIMIZATION_ENABLE #define NO_ACTION_MACRO
#define NO_ACTION_MACRO #define NO_ACTION_FUNCTION
#define NO_ACTION_FUNCTION
#endif
/* /*
* MIDI options * MIDI options
*/ */

6
quantum/template/ps2avrgb/config.h
View File

@ -43,10 +43,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS
/* disable these deprecated features by default */ /* disable these deprecated features by default */
#ifndef LINK_TIME_OPTIMIZATION_ENABLE #define NO_ACTION_MACRO
#define NO_ACTION_MACRO #define NO_ACTION_FUNCTION
#define NO_ACTION_FUNCTION
#endif
/* key combination for magic key command */ /* key combination for magic key command */
/* defined by default; to change, uncomment and set to the combination you want */ /* defined by default; to change, uncomment and set to the combination you want */

2
tmk_core/common.mk
View File

@ -162,8 +162,6 @@ ifeq ($(strip $(LINK_TIME_OPTIMIZATION_ENABLE)), yes)
endif endif
EXTRAFLAGS += -flto EXTRAFLAGS += -flto
TMK_COMMON_DEFS += -DLINK_TIME_OPTIMIZATION_ENABLE TMK_COMMON_DEFS += -DLINK_TIME_OPTIMIZATION_ENABLE
TMK_COMMON_DEFS += -DNO_ACTION_MACRO
TMK_COMMON_DEFS += -DNO_ACTION_FUNCTION
endif endif
# Search Path # Search Path

10
tmk_core/common/action.h
View File

@ -28,6 +28,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
extern "C" { extern "C" {
#endif #endif
/* Disable macro and function features when LTO is enabled, since they break */
#ifdef LINK_TIME_OPTIMIZATION_ENABLE
# ifndef NO_ACTION_MACRO
# define NO_ACTION_MACRO
# endif
# ifndef NO_ACTION_FUNCTION
# define NO_ACTION_FUNCTION
# endif
#endif
/* tapping count and state */ /* tapping count and state */
typedef struct { typedef struct {
bool interrupted : 1; bool interrupted : 1;