summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2020-08-27 20:50:18 +0200
committerPatrick Georgi <pgeorgi@google.com>2021-07-06 06:09:13 +0000
commitadcf7827bd00757cd52e87693c8bbfbe08ed6b13 (patch)
tree30d823ebe33966e2367e3f4c7aab9a4dae05fffe /src/include
parente85e7af6d02cb7d5acc51a10d0a1abbd7980ce12 (diff)
arch/x86: Use ENV_X86_64 instead of _x86_64_
Tested on Intel Sandybridge x86_64 and x86_32. Change-Id: I152483d24af0512c0ee4fbbe8931b7312e487ac6 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/44867 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/include')
-rw-r--r--src/include/assert.h2
-rw-r--r--src/include/cpu/x86/cr.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/include/assert.h b/src/include/assert.h
index 829e73207e..93d6bfc412 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -94,7 +94,7 @@ extern void _dead_code_assertion_failed(void) __attribute__((noreturn));
*(type *)(uintptr_t)0; \
})
-#ifdef __x86_64__
+#if ENV_X86_64
#define pointer_to_uint32_safe(x) ({ \
if ((uintptr_t)(x) > 0xffffffffUL) \
die("Cast from pointer to uint32_t overflows"); \
diff --git a/src/include/cpu/x86/cr.h b/src/include/cpu/x86/cr.h
index 3508505a7c..c70f35c103 100644
--- a/src/include/cpu/x86/cr.h
+++ b/src/include/cpu/x86/cr.h
@@ -9,7 +9,7 @@
#define COMPILER_BARRIER "memory"
-#ifdef __x86_64__
+#if ENV_X86_64
#define CRx_TYPE uint64_t
#define CRx_IN "q"
#define CRx_RET "=q"