Merge "weakref attribute detection broken with gcc 4.6 and higher"
This commit is contained in:
commit
38c50df497
3 changed files with 16 additions and 16 deletions
|
@ -20,7 +20,7 @@ AC_COMPILE_IFELSE(
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
AC_COMPILE_IFELSE(
|
AC_COMPILE_IFELSE(
|
||||||
[AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) {return (void *) 0;}],
|
[AC_LANG_PROGRAM([$3 void __attribute__(($2)) *test(void *muffin, ...) ;],
|
||||||
[])],
|
[])],
|
||||||
AC_MSG_RESULT(yes)
|
AC_MSG_RESULT(yes)
|
||||||
m4_ifval([$4],$4=1)
|
m4_ifval([$4],$4=1)
|
||||||
|
|
22
configure
vendored
22
configure
vendored
|
@ -16720,7 +16720,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -16788,7 +16788,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -16856,7 +16856,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -16924,7 +16924,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -16992,7 +16992,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -17060,7 +17060,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -17128,7 +17128,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -17196,7 +17196,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -17264,7 +17264,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -17332,7 +17332,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -17400,7 +17400,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
|
8
menuselect/configure
vendored
8
menuselect/configure
vendored
|
@ -3227,7 +3227,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -3299,7 +3299,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
void __attribute__(()) *test(void *muffin, ...) {return (void *) 0;}
|
void __attribute__(()) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -3371,7 +3371,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
static void __attribute__((weakref("foo"))) *test(void *muffin, ...) {return (void *) 0;}
|
static void __attribute__((weakref("foo"))) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
@ -3445,7 +3445,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||||||
else
|
else
|
||||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||||
/* end confdefs.h. */
|
/* end confdefs.h. */
|
||||||
static void __attribute__((weakref("foo"))) *test(void *muffin, ...) {return (void *) 0;}
|
static void __attribute__((weakref("foo"))) *test(void *muffin, ...) ;
|
||||||
int
|
int
|
||||||
main ()
|
main ()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue