On Fri, Oct 23, 2020 at 08:40:26PM +0200, Simon Horman wrote: > On Fri, Oct 23, 2020 at 05:41:03PM +0200, Ahelenia Ziemiańska wrote: > > There is, indeed, no x32 equivalent for non-amd64, > > but I just put this here like this because there aren't > > any other triples that end in "x32". Would you rather this go > > in a separate "if ARCH=x86_64 && target=*x32" clause below? > > Yes, I think that would be slightly nicer. Updated patch below. -- >8 -- Subject: [PATCH 2/5] configure.ac, arch/x86_64: handle x32 as subarch of x86_64 and don't specify -mcmodel=large there Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@xxxxxxxxxxxxxxxxxx> --- configure.ac | 11 +++++++++++ purgatory/arch/x86_64/Makefile | 2 ++ 2 files changed, 13 insertions(+) diff --git a/configure.ac b/configure.ac index f025823..eb3ecac 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 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.29.1
Attachment:
signature.asc
Description: PGP signature
_______________________________________________ kexec mailing list kexec@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/kexec
