From 6059f3a1f6950bd2aa9724ab917f2bc01343a076 Mon Sep 17 00:00:00 2001 From: наб Date: Mon, 18 May 2020 00:00:49 +0200 Subject: Correctly handle the x32 ABI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit __x86_64__ && _ILP32 => don't forcibly define _LP64 Reviewed-by: Brian Behlendorf Reviewed-by: Ryan Moeller Signed-off-by: Ahelenia Ziemiańska Closes #10357 Closes #844 --- include/os/linux/spl/sys/isa_defs.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'include/os/linux') diff --git a/include/os/linux/spl/sys/isa_defs.h b/include/os/linux/spl/sys/isa_defs.h index e36afef31..c19943b85 100644 --- a/include/os/linux/spl/sys/isa_defs.h +++ b/include/os/linux/spl/sys/isa_defs.h @@ -40,9 +40,13 @@ #define __x86 #endif +#if defined(_ILP32) +/* x32-specific defines; careful to *not* define _LP64 here */ +#else #if !defined(_LP64) #define _LP64 #endif +#endif #define _ALIGNMENT_REQUIRED 1 @@ -216,7 +220,7 @@ #else /* * Currently supported: - * x86_64, i386, arm, powerpc, s390, sparc, mips, and RV64G + * x86_64, x32, i386, arm, powerpc, s390, sparc, mips, and RV64G */ #error "Unsupported ISA type" #endif -- cgit v1.2.3