diff --git a/CMakeLists.txt b/CMakeLists.txt index 79818c98..37798878 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -138,7 +138,7 @@ if (NOT MSVC) void __attribute__((destructor)) f(void) {} int main(void) { return 0; } - " HAVE_ATTRIBUTE_DESTRUCTOR) + " HAVE_FUNC_ATTRIBUTE_DESTRUCTOR) check_include_files(arpa/inet.h HAVE_ARPA_INET_H) check_function_exists(class HAVE_CLASS) check_include_files(dlfcn.h HAVE_DLFCN_H) diff --git a/config.h.cmake.in b/config.h.cmake.in index e732540d..04f75d42 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -2,7 +2,7 @@ #cmakedefine HAVE_ARPA_INET_H 1 /* Define if __attribute__((destructor)) is accepted */ -#cmakedefine HAVE_ATTRIBUTE_DESTRUCTOR 1 +#cmakedefine HAVE_FUNC_ATTRIBUTE_DESTRUCTOR 1 /* Define to 1 if you have the header file. */ #cmakedefine HAVE_DLFCN_H 1 diff --git a/configure.ac b/configure.ac index badddcc2..0ae11deb 100644 --- a/configure.ac +++ b/configure.ac @@ -275,11 +275,22 @@ else fi fi +dnl +dnl Extra flags +dnl +XML_LIBDIR='-L${libdir}' +XML_INCLUDEDIR='-I${includedir}/libxml2' +XML_CFLAGS="" +XML_STATIC_CFLAGS="" +XML_PC_CFLAGS_PRIVATE="" + XML_PRIVATE_LIBS= XML_PRIVATE_CFLAGS= XML_PC_LIBS= XML_PC_REQUIRES= +AX_GCC_FUNC_ATTRIBUTE([destructor]) + dnl dnl Checks for header files. dnl @@ -325,15 +336,6 @@ if test "$with_http" = "yes"; then esac fi -dnl -dnl Extra flags -dnl -XML_LIBDIR='-L${libdir}' -XML_INCLUDEDIR='-I${includedir}/libxml2' -XML_CFLAGS="" -XML_STATIC_CFLAGS="" -XML_PC_CFLAGS_PRIVATE="" - dnl Thread-local storage if test "$with_tls" = "yes"; then AC_COMPILE_IFELSE([ @@ -348,15 +350,6 @@ if test "$with_tls" = "yes"; then ])])]) fi -dnl Checking whether __attribute__((destructor)) is accepted by the compiler -AC_MSG_CHECKING([whether __attribute__((destructor)) is accepted]) -AC_TRY_COMPILE2([ -void __attribute__((destructor)) -f(void) {}], [], [ - AC_MSG_RESULT(yes) - AC_DEFINE([HAVE_ATTRIBUTE_DESTRUCTOR], [1],[Define if __attribute__((destructor)) is accepted]) - AC_MSG_RESULT(no)]) - dnl dnl Linker version scripts for symbol versioning dnl diff --git a/libxml.h b/libxml.h index 64e140ad..6065d822 100644 --- a/libxml.h +++ b/libxml.h @@ -53,7 +53,7 @@ #define ATTRIBUTE_UNUSED #endif -#ifdef HAVE_ATTRIBUTE_DESTRUCTOR +#ifdef HAVE_FUNC_ATTRIBUTE_DESTRUCTOR #define ATTRIBUTE_DESTRUCTOR __attribute__((destructor)) #endif diff --git a/m4/ac_try_compile2.m4 b/m4/ac_try_compile2.m4 deleted file mode 100644 index 7ad8630a..00000000 --- a/m4/ac_try_compile2.m4 +++ /dev/null @@ -1,28 +0,0 @@ -dnl Like AC_TRY_EVAL but also errors out if the compiler generates -dnl _any_ output. Some compilers might issue warnings which we want -dnl to catch. -AC_DEFUN([AC_TRY_EVAL2], -[{ (eval echo configure:__oline__: \"[$]$1\") 1>&AS_MESSAGE_LOG_FD; dnl -(eval [$]$1) 2>&AS_MESSAGE_LOG_FD; _out=`eval [$]$1 2>&1` && test "x$_out" = x; }]) - -dnl Like AC_TRY_COMPILE but calls AC_TRY_EVAL2 instead of AC_TRY_EVAL -AC_DEFUN([AC_TRY_COMPILE2], -[cat > conftest.$ac_ext <&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD -ifelse([$4], , , [ rm -rf conftest* - $4 -])dnl -fi -rm -f conftest*]) diff --git a/m4/ax_gcc_func_attribute.m4 b/m4/ax_gcc_func_attribute.m4 new file mode 100644 index 00000000..fa4e089d --- /dev/null +++ b/m4/ax_gcc_func_attribute.m4 @@ -0,0 +1,242 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_gcc_func_attribute.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_GCC_FUNC_ATTRIBUTE(ATTRIBUTE) +# +# DESCRIPTION +# +# This macro checks if the compiler supports one of GCC's function +# attributes; many other compilers also provide function attributes with +# the same syntax. Compiler warnings are used to detect supported +# attributes as unsupported ones are ignored by default so quieting +# warnings when using this macro will yield false positives. +# +# The ATTRIBUTE parameter holds the name of the attribute to be checked. +# +# If ATTRIBUTE is supported define HAVE_FUNC_ATTRIBUTE_. +# +# The macro caches its result in the ax_cv_have_func_attribute_ +# variable. +# +# The macro currently supports the following function attributes: +# +# alias +# aligned +# alloc_size +# always_inline +# artificial +# cold +# const +# constructor +# constructor_priority for constructor attribute with priority +# deprecated +# destructor +# dllexport +# dllimport +# error +# externally_visible +# fallthrough +# flatten +# format +# format_arg +# gnu_format +# gnu_inline +# hot +# ifunc +# leaf +# malloc +# noclone +# noinline +# nonnull +# noreturn +# nothrow +# optimize +# pure +# sentinel +# sentinel_position +# unused +# used +# visibility +# warning +# warn_unused_result +# weak +# weakref +# +# Unsupported function attributes will be tested with a prototype +# returning an int and not accepting any arguments and the result of the +# check might be wrong or meaningless so use with care. +# +# LICENSE +# +# Copyright (c) 2013 Gabriele Svelto +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 13 + +AC_DEFUN([AX_GCC_FUNC_ATTRIBUTE], [ + AS_VAR_PUSHDEF([ac_var], [ax_cv_have_func_attribute_$1]) + + AC_CACHE_CHECK([for __attribute__(($1))], [ac_var], [ + AC_LINK_IFELSE([AC_LANG_PROGRAM([ + m4_case([$1], + [alias], [ + int foo( void ) { return 0; } + int bar( void ) __attribute__(($1("foo"))); + ], + [aligned], [ + int foo( void ) __attribute__(($1(32))); + ], + [alloc_size], [ + void *foo(int a) __attribute__(($1(1))); + ], + [always_inline], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [artificial], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [cold], [ + int foo( void ) __attribute__(($1)); + ], + [const], [ + int foo( void ) __attribute__(($1)); + ], + [constructor_priority], [ + int foo( void ) __attribute__((__constructor__(65535/2))); + ], + [constructor], [ + int foo( void ) __attribute__(($1)); + ], + [deprecated], [ + int foo( void ) __attribute__(($1(""))); + ], + [destructor], [ + int foo( void ) __attribute__(($1)); + ], + [dllexport], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [dllimport], [ + int foo( void ) __attribute__(($1)); + ], + [error], [ + int foo( void ) __attribute__(($1(""))); + ], + [externally_visible], [ + int foo( void ) __attribute__(($1)); + ], + [fallthrough], [ + void foo( int x ) {switch (x) { case 1: __attribute__(($1)); case 2: break ; }}; + ], + [flatten], [ + int foo( void ) __attribute__(($1)); + ], + [format], [ + int foo(const char *p, ...) __attribute__(($1(printf, 1, 2))); + ], + [gnu_format], [ + int foo(const char *p, ...) __attribute__((format(gnu_printf, 1, 2))); + ], + [format_arg], [ + char *foo(const char *p) __attribute__(($1(1))); + ], + [gnu_inline], [ + inline __attribute__(($1)) int foo( void ) { return 0; } + ], + [hot], [ + int foo( void ) __attribute__(($1)); + ], + [ifunc], [ + int my_foo( void ) { return 0; } + static int (*resolve_foo(void))(void) { return my_foo; } + int foo( void ) __attribute__(($1("resolve_foo"))); + ], + [leaf], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [malloc], [ + void *foo( void ) __attribute__(($1)); + ], + [noclone], [ + int foo( void ) __attribute__(($1)); + ], + [noinline], [ + __attribute__(($1)) int foo( void ) { return 0; } + ], + [nonnull], [ + int foo(char *p) __attribute__(($1(1))); + ], + [noreturn], [ + void foo( void ) __attribute__(($1)); + ], + [nothrow], [ + int foo( void ) __attribute__(($1)); + ], + [optimize], [ + __attribute__(($1(3))) int foo( void ) { return 0; } + ], + [pure], [ + int foo( void ) __attribute__(($1)); + ], + [sentinel], [ + int foo(void *p, ...) __attribute__(($1)); + ], + [sentinel_position], [ + int foo(void *p, ...) __attribute__(($1(1))); + ], + [returns_nonnull], [ + void *foo( void ) __attribute__(($1)); + ], + [unused], [ + int foo( void ) __attribute__(($1)); + ], + [used], [ + int foo( void ) __attribute__(($1)); + ], + [visibility], [ + int foo_def( void ) __attribute__(($1("default"))); + int foo_hid( void ) __attribute__(($1("hidden"))); + int foo_int( void ) __attribute__(($1("internal"))); + int foo_pro( void ) __attribute__(($1("protected"))); + ], + [warning], [ + int foo( void ) __attribute__(($1(""))); + ], + [warn_unused_result], [ + int foo( void ) __attribute__(($1)); + ], + [weak], [ + int foo( void ) __attribute__(($1)); + ], + [weakref], [ + static int foo( void ) { return 0; } + static int bar( void ) __attribute__(($1("foo"))); + ], + [ + m4_warn([syntax], [Unsupported attribute $1, the test may fail]) + int foo( void ) __attribute__(($1)); + ] + )], []) + ], + dnl GCC doesn't exit with an error if an unknown attribute is + dnl provided but only outputs a warning, so accept the attribute + dnl only if no warning were issued. + [AS_IF([grep -- -Wattributes conftest.err], + [AS_VAR_SET([ac_var], [no])], + [AS_VAR_SET([ac_var], [yes])])], + [AS_VAR_SET([ac_var], [no])]) + ]) + + AS_IF([test yes = AS_VAR_GET([ac_var])], + [AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_FUNC_ATTRIBUTE_$1), 1, + [Define to 1 if the system has the `$1' function attribute])], []) + + AS_VAR_POPDEF([ac_var]) +]) diff --git a/meson.build b/meson.build index 8a81de5b..3a45341a 100644 --- a/meson.build +++ b/meson.build @@ -297,7 +297,7 @@ endif ### __attribute__((destructor)) if cc.has_function_attribute('destructor') - config_h.set10('HAVE_ATTRIBUTE_DESTRUCTOR', true) + config_h.set10('HAVE_FUNC_ATTRIBUTE_DESTRUCTOR', true) endif ### DSO support diff --git a/threads.c b/threads.c index 56a77cc9..670288d1 100644 --- a/threads.c +++ b/threads.c @@ -561,7 +561,7 @@ xmlCleanupParser(void) { xmlParserInnerInitialized = 0; } -#if defined(HAVE_ATTRIBUTE_DESTRUCTOR) && \ +#if defined(HAVE_FUNC_ATTRIBUTE_DESTRUCTOR) && \ !defined(LIBXML_THREAD_ALLOC_ENABLED) && \ !defined(LIBXML_STATIC) && \ !defined(_WIN32)