From 6caad4c497726983864401545aa7a29934ddd67d Mon Sep 17 00:00:00 2001 From: Ahelenia Ziemiańska Date: Fri, 9 Oct 2020 17:39:42 +0200 Subject: configure.ac, arch/x86_64: handle x32 as subarch of x86_64 and don't specify -mcmodel=large there MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ahelenia Ziemiańska Signed-off-by: Simon Horman --- configure.ac | 11 +++++++++++ purgatory/arch/x86_64/Makefile | 2 ++ 2 files changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac index f0258231..eb3ecac5 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,17 @@ case $target_cpu in ;; esac +if test "$ARCH" = "x86_64" ; then + case $target in + *x32 ) + SUBARCH="x32" + ;; + * ) + SUBARCH="" + ;; + esac +fi + dnl ---Options OBJDIR=`pwd`/objdir diff --git a/purgatory/arch/x86_64/Makefile b/purgatory/arch/x86_64/Makefile index 73009375..b0e277a3 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 -- cgit 1.2.3-korg