From e8741fe95461da8836ff3d8af258bed80dcd13b6 Mon Sep 17 00:00:00 2001
From: Patrick Georgi <pgeorgi@chromium.org>
Date: Mon, 4 Sep 2017 17:37:31 +0200
Subject: Move ADDR32() hack to arch/x86
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/arch/x86/include/arch/registers.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/arch/x86/include')

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
-- 
cgit v1.2.3