X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=deps%2Flightning%2Fconfigure.ac;h=76457b45ed55d611d6d3884119f2ce0a2cbc3432;hb=016c6e93f6db684211f5c8b05433cb500715ba50;hp=63bbadb56ad9e42232f1ad66a8555e035e501665;hpb=8622c9dcd0abc62601ff6c64f93f9294c520ed58;p=pcsx_rearmed.git

diff --git a/deps/lightning/configure.ac b/deps/lightning/configure.ac
index 63bbadb5..76457b45 100644
--- a/deps/lightning/configure.ac
+++ b/deps/lightning/configure.ac
@@ -1,5 +1,5 @@
 dnl
-dnl Copyright 2000, 2001, 2002, 2012-2019 Free Software Foundation, Inc.
+dnl Copyright 2000, 2001, 2002, 2012-2023 Free Software Foundation, Inc.
 dnl
 dnl This file is part of GNU lightning.
 dnl
@@ -14,8 +14,8 @@ dnl or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
 dnl License for more details.
 dnl
 
-AC_PREREQ(2.64)
-AC_INIT([GNU lightning], 2.1.3, pcpa@gnu.org, lightning)
+AC_PREREQ([2.71])
+AC_INIT([GNU lightning],[2.2.2],[pcpa@gnu.org],[lightning])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CANONICAL_TARGET
 AC_CONFIG_SRCDIR([Makefile.am])
@@ -60,6 +60,12 @@ case "$target_cpu" in
 		fi				;;
 	    *)					;;
 	esac					;;
+    aarch64)
+	case "$host_os" in
+	    darwin*)
+		LIGHTNING_CFLAGS="$LIGHTNING_CFLAGS -DPACKED_STACK=1"			;;
+	    *)					;;
+	esac					;;
     *)						;;
 esac
 
@@ -163,29 +169,43 @@ if test "x$DEVEL_DISASSEMBLER" != "xno"; then
     LIGHTNING_CFLAGS="$LIGHTNING_CFLAGS -DDEVEL_DISASSEMBLER=1"
 fi
 
+# This option is only useful during development.
+AC_ARG_ENABLE(devel-get-jit-size,
+	      AS_HELP_STRING([--enable-devel-get-jit-size],
+			     [Devel mode to regenerate jit size information]),
+	      [GET_JIT_SIZE=$enableval], [GET_JIT_SIZE=no])
+AM_CONDITIONAL(get_jit_size, [test $GET_JIT_SIZE = yes])
+
 AC_ARG_ENABLE(assertions,
 	      AS_HELP_STRING([--enable-assertions],
 			     [Enable runtime code generation assertions]),
 	      [DEBUG=$enableval], [DEBUG=auto])
-if test "x$DEBUG" = xyes; then
+
+# This option might be made default in the future
+# Currently it is only useful to ensure existing code will work
+# if PACKED_STACK is also defined.
+AC_ARG_ENABLE(devel-strong-type-checking,
+	      AS_HELP_STRING([--enable-devel-strong-type-checking],
+			     [Devel mode for strong type checking]),
+	      [STRONG_TYPE_CHECKING=$enableval], [STRONG_TYPE_CHECKING=no])
+if test "x$DEBUG" = xyes -o x"$STRONG_TYPE_CHECKING" = xyes; then
     LIGHTNING_CFLAGS="$LIGHTNING_CFLAGS -DDEBUG=1"
 else
     LIGHTNING_CFLAGS="$LIGHTNING_CFLAGS -DNDEBUG"
     DEBUG=no
 fi
+AM_CONDITIONAL(strong_type_checking, [test $STRONG_TYPE_CHECKING = yes])
 
-# This option is only useful during development.
-AC_ARG_ENABLE(devel-get-jit-size,
-	      AS_HELP_STRING([--enable-devel-get-jit-size],
-			     [Devel mode to regenerate jit size information]),
-	      [GET_JIT_SIZE=$enableval], [GET_JIT_SIZE=no])
-AM_CONDITIONAL(get_jit_size, [test $GET_JIT_SIZE = yes])
+AC_CHECK_LIB(dl, dlopen, [HAVE_LIBDL="yes"])
+AC_CHECK_LIB(dld, dlopen, [HAVE_LIBDLD="yes"])
 
-case "$host_os" in
-    *bsd*|osf*)		SHLIB=""	;;
-    *hpux*)		SHLIB="-ldld"	;;
-    *)			SHLIB="-ldl"	;;
-esac
+if test "x$HAVE_LIBDL" = xyes; then
+    SHLIB="-ldl";
+elif test "x$HAVE_LIBDLD" = xyes; then
+    SHLIB="-ldld";
+else
+    SHLIB="";
+fi
 AC_SUBST(SHLIB)
 
 cpu=
@@ -201,19 +221,21 @@ case "$target_cpu" in
     s390*)		cpu=s390	;;
     alpha*)		cpu=alpha	;;
     riscv*)		cpu=riscv	;;
+    loongarch*)		cpu=loongarch	;;
     *)					;;
 esac
-AM_CONDITIONAL(cpu_arm,     [test cpu-$cpu = cpu-arm])
-AM_CONDITIONAL(cpu_mips,    [test cpu-$cpu = cpu-mips])
-AM_CONDITIONAL(cpu_ppc,     [test cpu-$cpu = cpu-ppc])
-AM_CONDITIONAL(cpu_sparc,   [test cpu-$cpu = cpu-sparc])
-AM_CONDITIONAL(cpu_x86,     [test cpu-$cpu = cpu-x86])
-AM_CONDITIONAL(cpu_ia64,    [test cpu-$cpu = cpu-ia64])
-AM_CONDITIONAL(cpu_hppa,    [test cpu-$cpu = cpu-hppa])
-AM_CONDITIONAL(cpu_aarch64, [test cpu-$cpu = cpu-aarch64])
-AM_CONDITIONAL(cpu_s390,    [test cpu-$cpu = cpu-s390])
-AM_CONDITIONAL(cpu_alpha,   [test cpu-$cpu = cpu-alpha])
-AM_CONDITIONAL(cpu_riscv,   [test cpu-$cpu = cpu-riscv])
+AM_CONDITIONAL(cpu_arm,       [test cpu-$cpu = cpu-arm])
+AM_CONDITIONAL(cpu_mips,      [test cpu-$cpu = cpu-mips])
+AM_CONDITIONAL(cpu_ppc,       [test cpu-$cpu = cpu-ppc])
+AM_CONDITIONAL(cpu_sparc,     [test cpu-$cpu = cpu-sparc])
+AM_CONDITIONAL(cpu_x86,       [test cpu-$cpu = cpu-x86])
+AM_CONDITIONAL(cpu_ia64,      [test cpu-$cpu = cpu-ia64])
+AM_CONDITIONAL(cpu_hppa,      [test cpu-$cpu = cpu-hppa])
+AM_CONDITIONAL(cpu_aarch64,   [test cpu-$cpu = cpu-aarch64])
+AM_CONDITIONAL(cpu_s390,      [test cpu-$cpu = cpu-s390])
+AM_CONDITIONAL(cpu_alpha,     [test cpu-$cpu = cpu-alpha])
+AM_CONDITIONAL(cpu_riscv,     [test cpu-$cpu = cpu-riscv])
+AM_CONDITIONAL(cpu_loongarch, [test cpu-$cpu = cpu-loongarch])
 
 # Test x87 if both, x87 and sse2 available
 ac_cv_test_x86_x87=
@@ -231,7 +253,7 @@ elif test $cpu = x86; then
     int main(void) {
 	int		    ac, flags;
 	unsigned int	    eax, ebx, ecx, edx;
-	if (__WORDSIZE == 64)
+	if (sizeof(long) == 8)
 	    return 1;
 	__asm__ volatile ("pushfl;\n\t"
 			  "popl %0;\n\t"
@@ -327,7 +349,7 @@ if test $ac_cv_header_stdint_h = yes; then
     AC_SUBST(MAYBE_INCLUDE_STDINT_H, ["#include <stdint.h>"])
 fi
 
-AC_OUTPUT([Makefile
+AC_CONFIG_FILES([Makefile
 	   lightning.pc
            gnulib-lib/Makefile
 	   doc/Makefile
@@ -336,3 +358,4 @@ AC_OUTPUT([Makefile
 	   include/lightning.h
 	   lib/Makefile
 	   check/Makefile])
+AC_OUTPUT