diff options
| author | Konstantin Đorđević <vomindoraan@gmail.com> | 2020-04-09 01:18:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-09 00:18:30 +0100 |
| commit | be2f5816b6cf6513591f825df1d0438729b83388 (patch) | |
| tree | 86d00fbf766521955ab50706b8d109d800e4b052 /quantum/template | |
| parent | ff213d5fe1a74f345dd2263c6fb4bc9280f74e0f (diff) | |
| download | firmware-be2f5816b6cf6513591f825df1d0438729b83388.tar.gz firmware-be2f5816b6cf6513591f825df1d0438729b83388.tar.bz2 firmware-be2f5816b6cf6513591f825df1d0438729b83388.zip | |
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
Diffstat (limited to 'quantum/template')
| -rw-r--r-- | quantum/template/avr/config.h | 7 | ||||
| -rw-r--r-- | quantum/template/ps2avrgb/config.h | 6 |
2 files changed, 5 insertions, 8 deletions
diff --git a/quantum/template/avr/config.h b/quantum/template/avr/config.h index 7e4a01449..88402fbdd 100644 --- a/quantum/template/avr/config.h +++ b/quantum/template/avr/config.h @@ -192,10 +192,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_ONESHOT /* disable these deprecated features by default */ -#ifndef LINK_TIME_OPTIMIZATION_ENABLE - #define NO_ACTION_MACRO - #define NO_ACTION_FUNCTION -#endif +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION + /* * MIDI options */ diff --git a/quantum/template/ps2avrgb/config.h b/quantum/template/ps2avrgb/config.h index 2eb484422..3f3fd5fd7 100644 --- a/quantum/template/ps2avrgb/config.h +++ b/quantum/template/ps2avrgb/config.h @@ -43,10 +43,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_ANIMATIONS /* disable these deprecated features by default */ -#ifndef LINK_TIME_OPTIMIZATION_ENABLE - #define NO_ACTION_MACRO - #define NO_ACTION_FUNCTION -#endif +#define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION /* key combination for magic key command */ /* defined by default; to change, uncomment and set to the combination you want */ |