diff options
| author | Patrick Georgi <pgeorgi@chromium.org> | 2017-09-04 17:37:31 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2017-09-05 17:24:46 +0000 |
| commit | e8741fe95461da8836ff3d8af258bed80dcd13b6 (patch) | |
| tree | f5e9e1da458979c3bb726d93974fe2bdfcb0d1c4 | |
| parent | faf7a8e8592f47dc9c92ab1672e30bbf60bc3581 (diff) | |
Move ADDR32() hack to arch/x86
It's arch specific, so no need to pollute non-x86 with it.
Change-Id: I99ec76d591789db186e8a33774565e5a04fc4e47
Signed-off-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-on: https://review.coreboot.org/21392
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
| -rw-r--r-- | src/arch/x86/include/arch/registers.h | 8 | ||||
| -rw-r--r-- | src/cpu/x86/smm/smmrelocate.S | 2 | ||||
| -rw-r--r-- | src/include/compiler.h | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/arch/x86/include/arch/registers.h b/src/arch/x86/include/arch/registers.h index 76fda2851d..9a618f4870 100644 --- a/src/arch/x86/include/arch/registers.h +++ b/src/arch/x86/include/arch/registers.h @@ -18,6 +18,7 @@ #include <compiler.h> +#if !defined(__ASSEMBLER__) #define DOWNTO8(A) \ union { \ struct { \ @@ -57,5 +58,12 @@ struct eregs { uint32_t cs; uint32_t eflags; }; +#endif // !ASSEMBLER + +#if IS_ENABLED(CONFIG_COMPILER_LLVM_CLANG) +#define ADDR32(opcode) opcode +#else +#define ADDR32(opcode) addr32 opcode +#endif #endif diff --git a/src/cpu/x86/smm/smmrelocate.S b/src/cpu/x86/smm/smmrelocate.S index b3be51d9c1..230c78d079 100644 --- a/src/cpu/x86/smm/smmrelocate.S +++ b/src/cpu/x86/smm/smmrelocate.S @@ -37,7 +37,7 @@ #endif // ADDR32() macro -#include <compiler.h> +#include <arch/registers.h> #if IS_ENABLED(CONFIG_SMM_TSEG) #error "Don't use this file with TSEG." diff --git a/src/include/compiler.h b/src/include/compiler.h index 268064d0c2..a830239009 100644 --- a/src/include/compiler.h +++ b/src/include/compiler.h @@ -26,10 +26,4 @@ #define __always_unused __attribute__((unused)) #define __must_check __attribute__((warn_unused_result)) -#if IS_ENABLED(CONFIG_COMPILER_LLVM_CLANG) -#define ADDR32(opcode) opcode -#else -#define ADDR32(opcode) addr32 opcode -#endif - #endif |