mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-03 12:25:35 +00:00
Merged revisions 200985 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r200985 | kpfleming | 2009-06-16 11:32:36 -0500 (Tue, 16 Jun 2009) | 7 lines Fix problems with new compiler attribute checking in configure script. The last changes to ast_gcc_attribute.m4 caused some problems checking for various attributes, because the scope of the symbol the attribute is applied to can be important; this patch allows the scope to be specified for the check. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@200986 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
77
configure
vendored
77
configure
vendored
@@ -17396,6 +17396,13 @@ $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
|
||||
@@ -17404,7 +17411,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__((pure)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__((pure)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17455,7 +17462,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17510,6 +17517,13 @@ $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
|
||||
@@ -17518,7 +17532,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__((malloc)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17569,7 +17583,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17624,6 +17638,13 @@ $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
|
||||
@@ -17632,7 +17653,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__((const)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17683,7 +17704,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17738,6 +17759,13 @@ $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
|
||||
@@ -17746,7 +17774,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__((unused)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17797,7 +17825,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17852,6 +17880,13 @@ $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
|
||||
@@ -17860,7 +17895,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__((always_inline)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17911,7 +17946,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -17966,6 +18001,13 @@ $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
|
||||
@@ -17974,7 +18016,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__((deprecated)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -18025,7 +18067,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -18080,6 +18122,13 @@ $as_echo_n "checking for compiler 'attribute weak' 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
|
||||
@@ -18088,7 +18137,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__((weak)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__((weak)) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
@@ -18139,7 +18188,7 @@ _ACEOF
|
||||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
static void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
$attribute_scope void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
||||
int
|
||||
main ()
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user