From 4a93d3bcb5a24b8478dca20da8f55f6c546cb8b4 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 16 Jun 2009 19:27:12 +0000 Subject: Another minor fix to compiler attribute checking. Defaulting to 'static' for the function scope was bad... so remove it. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@201090 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- autoconf/ast_gcc_attribute.m4 | 11 +---- configure | 112 ++++++++---------------------------------- configure.ac | 2 +- 3 files changed, 24 insertions(+), 101 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.]), diff --git a/configure b/configure index 1e2a6986e..4e0e60372 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 200519 . +# From configure.ac Revision: 200985 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.63 for asterisk 1.6. # @@ -18017,13 +18017,6 @@ $as_echo_n "checking for compiler 'attribute pure' 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 @@ -18032,7 +18025,7 @@ _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 () { @@ -18083,7 +18076,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 () { @@ -18138,13 +18131,6 @@ $as_echo_n "checking for compiler 'attribute malloc' 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 @@ -18153,7 +18139,7 @@ _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 () { @@ -18204,7 +18190,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 () { @@ -18259,13 +18245,6 @@ $as_echo_n "checking for compiler 'attribute const' 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 @@ -18274,7 +18253,7 @@ _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 () { @@ -18325,7 +18304,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 () { @@ -18380,13 +18359,6 @@ $as_echo_n "checking for compiler 'attribute unused' 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 @@ -18395,7 +18367,7 @@ _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 () { @@ -18446,7 +18418,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 () { @@ -18501,13 +18473,6 @@ $as_echo_n "checking for compiler 'attribute always_inline' 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 @@ -18516,7 +18481,7 @@ _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 () { @@ -18567,7 +18532,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 () { @@ -18622,13 +18587,6 @@ $as_echo_n "checking for compiler 'attribute deprecated' 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 @@ -18637,7 +18595,7 @@ _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 () { @@ -18688,7 +18646,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 () { @@ -18743,13 +18701,6 @@ $as_echo_n "checking for compiler 'attribute sentinel' 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 @@ -18758,7 +18709,7 @@ _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 () { @@ -18809,7 +18760,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 () { @@ -18864,13 +18815,6 @@ $as_echo_n "checking for compiler 'attribute warn_unused_result' support... " >& 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 @@ -18879,7 +18823,7 @@ _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 () { @@ -18930,7 +18874,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 () { @@ -18985,13 +18929,6 @@ $as_echo_n "checking for compiler 'attribute weakref' 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 "xweakref("foo")" = "x" then cat >conftest.$ac_ext <<_ACEOF @@ -19000,7 +18937,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((weakref)) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((weakref)) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -19051,7 +18988,7 @@ _ACEOF cat confdefs.h >>conftest.$ac_ext cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$attribute_scope void __attribute__((weakref("foo"))) *test(void *muffin, ...) {return (void *) 0;} + void __attribute__((weakref("foo"))) *test(void *muffin, ...) {return (void *) 0;} int main () { @@ -19106,13 +19043,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 @@ -19121,7 +19051,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 () { @@ -19172,7 +19102,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 () { diff --git a/configure.ac b/configure.ac index de7892fc1..cfb53fd7f 100644 --- a/configure.ac +++ b/configure.ac @@ -515,7 +515,7 @@ AST_GCC_ATTRIBUTE(deprecated) AST_GCC_ATTRIBUTE(sentinel) AST_GCC_ATTRIBUTE(warn_unused_result) AST_GCC_ATTRIBUTE(weakref, [weakref("foo")]) -AST_GCC_ATTRIBUTE(weak_import, , "") +AST_GCC_ATTRIBUTE(weak_import) AC_MSG_CHECKING(for -ffunction-sections support) saved_CFLAGS="${CFLAGS}" -- cgit v1.2.3