diff options
| -rw-r--r-- | autoconf/ast_gcc_attribute.m4 | 11 | ||||
| -rwxr-xr-x | configure | 123 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 26 insertions, 110 deletions
diff --git a/autoconf/ast_gcc_attribute.m4 b/autoconf/ast_gcc_attribute.m4 index f08b2545b..d3f05be5b 100644 --- a/autoconf/ast_gcc_attribute.m4 +++ b/autoconf/ast_gcc_attribute.m4 @@ -7,17 +7,10 @@ AC_MSG_CHECKING(for compiler 'attribute $1' support) saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" -if test "x$3" = "x" -then -attribute_scope="static" -else -attribute_scope="$3" -fi - if test "x$2" = "x" then AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([$attribute_scope void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}], + AC_LANG_PROGRAM([$3 void __attribute__(($1)) *test(void *muffin, ...) {return (void *) 0;}], []), AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]), @@ -25,7 +18,7 @@ AC_COMPILE_IFELSE( ) else AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([$attribute_scope void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}], + AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}], []), AC_MSG_RESULT(yes) AC_DEFINE_UNQUOTED([HAVE_ATTRIBUTE_$1], 1, [Define to 1 if your GCC C compiler supports the '$1' attribute.]), @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 196949 . +# From configure.ac Revision: 200990 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.63 for asterisk 1.6. # @@ -17942,20 +17942,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((pure)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((pure)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18006,7 +17999,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18063,20 +18056,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18127,7 +18113,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18184,20 +18170,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18248,7 +18227,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18305,20 +18284,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18369,7 +18341,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18426,20 +18398,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18490,7 +18455,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18547,20 +18512,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18611,7 +18569,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18668,20 +18626,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((sentinel)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((sentinel)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18732,7 +18683,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18789,20 +18740,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((warn_unused_result)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((warn_unused_result)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18853,7 +18797,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18910,20 +18854,13 @@ CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" if test "x" = "x" then -attribute_scope="static" -else -attribute_scope="" -fi - -if test "x" = "x" -then cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((weak)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((weak)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -18974,7 +18911,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -19029,13 +18966,6 @@ $as_echo_n "checking for compiler 'attribute weak_import' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" -if test "x""" = "x" -then -attribute_scope="static" -else -attribute_scope="""" -fi - if test "x" = "x" then cat >conftest.$ac_ext <<_ACEOF @@ -19044,7 +18974,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((weak_import)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((weak_import)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -19095,7 +19025,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -19150,13 +19080,6 @@ $as_echo_n "checking for compiler 'attribute alias' support... " >&6; } saved_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -Wall -Wno-unused -Werror" -if test "x" = "x" -then -attribute_scope="static" -else -attribute_scope="" -fi - if test "xalias("foo")" = "x" then cat >conftest.$ac_ext <<_ACEOF @@ -19165,7 +19088,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((alias)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((alias)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -19216,7 +19139,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((alias("foo"))) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((alias("foo"))) *test(void *muffin, ...) {return (void *) 0;} int main () { diff --git a/configure.ac b/configure.ac index 8a8020dbc..a73d68b6c 100644 --- a/configure.ac +++ b/configure.ac @@ -513,7 +513,7 @@ AST_GCC_ATTRIBUTE(deprecated) AST_GCC_ATTRIBUTE(sentinel) AST_GCC_ATTRIBUTE(warn_unused_result) AST_GCC_ATTRIBUTE(weak) -AST_GCC_ATTRIBUTE(weak_import, , "") +AST_GCC_ATTRIBUTE(weak_import) AST_GCC_ATTRIBUTE(alias, [alias("foo")]) AC_MSG_CHECKING(for -ffunction-sections support) |