From 8d0da7d8e006beda6c72c437545bca9f20086b28 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 11 May 2018 09:41:32 -0400 Subject: Propagate ASM_DIRECT --> NAKED renaming --- include/global.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include') diff --git a/include/global.h b/include/global.h index b73baf2ce..5e742d732 100644 --- a/include/global.h +++ b/include/global.h @@ -12,6 +12,11 @@ #define asm_comment(x) asm volatile("@ -- " x " -- ") #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided") #define NAKED __attribute__((naked)) +// While this nomenclature change is being rolled out, the following +// redundant define will be used to prevent build errors when merging +// from master. +// TODO: Remove this before merging the pull request. +#define ASM_DIRECT NAKED // IDE support #if defined (__APPLE__) || defined (__CYGWIN__) -- cgit v1.2.3