From 0d083cd914000cfacc228cfea10dc4587ff03a06 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 23 Sep 2024 16:59:14 +0200 Subject: [PATCH] jit/cache tests: Fix link error (regression 2024-09-20). * m4/libdl.m4: New file. * modules/jit/cache-tests (Files): Add it. (configure.ac): Invoke gl_LIBDL. (Makefile.am): Link test-cache with $(LIBDL). --- ChangeLog | 8 ++++++++ m4/libdl.m4 | 45 +++++++++++++++++++++++++++++++++++++++++ modules/jit/cache-tests | 4 +++- 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 m4/libdl.m4 diff --git a/ChangeLog b/ChangeLog index d16a3f140e..332d7ce5e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-09-23 Bruno Haible + + jit/cache tests: Fix link error (regression 2024-09-20). + * m4/libdl.m4: New file. + * modules/jit/cache-tests (Files): Add it. + (configure.ac): Invoke gl_LIBDL. + (Makefile.am): Link test-cache with $(LIBDL). + 2024-09-23 Bruno Haible utimens: Fix test failure on NetBSD 10 (regression 2024-09-16). diff --git a/m4/libdl.m4 b/m4/libdl.m4 new file mode 100644 index 0000000000..f613960b61 --- /dev/null +++ b/m4/libdl.m4 @@ -0,0 +1,45 @@ +# libdl.m4 +# serial 1 +dnl Copyright (C) 2024 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl From Bruno Haible. + +dnl Set LIBDL to '-ldl' if it is needed to use the functions declared +dnl in (dlopen, dlsym, etc.), or to empty otherwise. +AC_DEFUN([gl_LIBDL], +[ + dnl dlopen, dlsym are + dnl - in libc on glibc >= 2.34, musl libc, macOS, FreeBSD, NetBSD, OpenBSD, + dnl AIX, IRIX, Solaris, Cygwin, Haiku, + dnl - in a separate libdl on glibc < 2.34, Android. + AC_CACHE_CHECK([for library needed for dlopen and dlsym], + [gl_cv_lib_dl], + [AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[return ! dlsym (RTLD_DEFAULT, "main");]])], + [gl_cv_lib_dl=none], + [gl_cv_lib_dl=maybe]) + if test $gl_cv_lib_dl = maybe; then + saved_LIBS="$LIBS" + LIBS="$LIBS -ldl" + AC_LINK_IFELSE( + [AC_LANG_PROGRAM( + [[#include + ]], + [[return ! dlsym (RTLD_DEFAULT, "main");]])], + [gl_cv_lib_dl='-ldl'], + [gl_cv_lib_dl=none]) + LIBS="$saved_LIBS" + fi + ]) + case "$gl_cv_lib_dl" in + none) LIBDL='' ;; + *) LIBDL="$gl_cv_lib_dl" ;; + esac + AC_SUBST([LIBDL]) +]) diff --git a/modules/jit/cache-tests b/modules/jit/cache-tests index aa6f37ce87..d8163d6206 100644 --- a/modules/jit/cache-tests +++ b/modules/jit/cache-tests @@ -3,6 +3,7 @@ tests/jit/test-cache.c tests/macros.h m4/mmap-anon.m4 m4/warnings.m4 +m4/libdl.m4 Status: unportable-test @@ -17,6 +18,7 @@ xalloc configure.ac: AC_CHECK_HEADERS_ONCE([sys/mman.h]) gl_FUNC_MMAP_ANON +gl_LIBDL dnl Disable the OpenBSD "retguard" stack protector for this test. gl_COMPILER_OPTION_IF([-fno-ret-protector], [DISABLE_OPENBSD_RETGUARD='-fno-ret-protector'], @@ -29,4 +31,4 @@ TESTS += test-cache check_PROGRAMS += test-cache test_cache_SOURCES = jit/test-cache.c test_cache_CFLAGS = $(AM_CFLAGS) $(DISABLE_OPENBSD_RETGUARD) -test_cache_LDADD = $(LDADD) $(LIBINTL) +test_cache_LDADD = $(LDADD) $(LIBINTL) @LIBDL@ -- 2.39.5