[PATCH 2/5] configure.ac, arch/x86_64: handle x32 as subarch of x86_64 and don't specify -mcmodel=large there

[Ahelenia Ziemiańska]

Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli at nabijaczleweli.xyz>
---
 configure.ac                   | 8 ++++++++
 purgatory/arch/x86_64/Makefile | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/configure.ac b/configure.ac
index f025823..4e8f7c5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -54,6 +54,14 @@ case $target_cpu in
 		;;
 	ia64|x86_64|alpha|m68k )
 		ARCH="$target_cpu"
+		case $target in
+			*x32 )
+				SUBARCH="x32"
+				;;
+			* )
+				SUBARCH=""
+				;;
+		esac
 		;;
 	hppa*)
 		ARCH="hppa"
diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile
index 7300937..b0e277a 100644
--- a/purgatory/arch/x86_64/Makefile
+++ b/purgatory/arch/x86_64/Makefile
@@ -23,4 +23,6 @@ x86_64_PURGATORY_SRCS += purgatory/arch/i386/console-x86.c
 x86_64_PURGATORY_SRCS += purgatory/arch/i386/vga.c
 x86_64_PURGATORY_SRCS += purgatory/arch/i386/pic.c
 
+ifneq ($(SUBARCH),x32)
 x86_64_PURGATORY_EXTRA_CFLAGS = -mcmodel=large
+endif
-- 
2.28.0

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/kexec/attachments/20201009/c861606e/attachment-0001.sig>