From a8a1d38131276da0f0aed41690fc46d6c9ad7bfc Mon Sep 17 00:00:00 2001
From: =?utf8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se>
Date: Thu, 26 Aug 2021 19:22:37 +0200
Subject: [PATCH] Fixes for ELFV2_ABI

---
 config.m4.in | 2 +-
 configure.ac | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/config.m4.in b/config.m4.in
index 2ac19a84..b98a5817 100644
--- a/config.m4.in
+++ b/config.m4.in
@@ -5,7 +5,7 @@ define(`COFF_STYLE', `@ASM_COFF_STYLE@')dnl
 define(`TYPE_FUNCTION', `@ASM_TYPE_FUNCTION@')dnl
 define(`TYPE_PROGBITS', `@ASM_TYPE_PROGBITS@')dnl
 define(`ALIGN_LOG', `@ASM_ALIGN_LOG@')dnl
-define(`ABI', `@ABI@')dnl
+define(`ELFV2_ABI', `@ELFV2_ABI@')dnl
 define(`W64_ABI', `@W64_ABI@')dnl
 define(`RODATA', `@ASM_RODATA@')dnl
 define(`WORDS_BIGENDIAN', `@ASM_WORDS_BIGENDIAN@')dnl
diff --git a/configure.ac b/configure.ac
index a35b91d5..2ed4ab4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,6 +311,9 @@ AC_SUBST([GMP_NUMB_BITS])
 # Figure out ABI. Currently, configurable only by setting CFLAGS.
 ABI=standard
 
+ELFV2_ABI=no # For powerpc64
+W64_ABI=no   # For x86_64 windows
+
 case "$host_cpu" in
   [x86_64 | amd64])
     AC_TRY_COMPILE([
@@ -759,8 +762,6 @@ IF_DLL='#'
 LIBNETTLE_FILE_SRC='$(LIBNETTLE_FORLINK)'
 LIBHOGWEED_FILE_SRC='$(LIBHOGWEED_FORLINK)'
 EMULATOR=''
-ELFV2_ABI=no # For powerpc64
-W64_ABI=no   # For x86_64 windows
 
 case "$host_os" in
   mingw32*|cygwin*)
-- 
2.47.2