diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/ChangeLog | 6 | ||||
| -rw-r--r-- | config/math.m4 | 4 | ||||
| -rw-r--r-- | config/tls.m4 | 14 |
3 files changed, 15 insertions, 9 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index d3476c5..6e30188 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,9 @@ +2018-10-31 Joseph Myers <joseph@codesourcery.com> + + Merge from GCC: + PR bootstrap/82856 + * math.m4, tls.m4: Use AC_LANG_SOURCE. + 2018-06-19 Simon Marchi <simon.marchi@ericsson.com> * override.m4 (_GCC_AUTOCONF_VERSION): Bump from 2.64 to 2.69. diff --git a/config/math.m4 b/config/math.m4 index 23835f2..155967e 100644 --- a/config/math.m4 +++ b/config/math.m4 @@ -25,7 +25,7 @@ AC_DEFUN([GCC_CHECK_MATH_FUNC], AC_REQUIRE([GCC_CHECK_LIBM]) AC_REQUIRE([GCC_CHECK_MATH_HEADERS]) AC_CACHE_CHECK([for $1], [gcc_cv_math_func_$1], - [AC_LINK_IFELSE([ + [AC_LINK_IFELSE([AC_LANG_SOURCE([ #ifdef HAVE_COMPLEX_H #include <complex.h> #endif @@ -40,7 +40,7 @@ main () { return 0; } -], +])], [gcc_cv_math_func_$1=yes], [gcc_cv_math_func_$1=no])]) if test $gcc_cv_math_func_$1 = yes; then diff --git a/config/tls.m4 b/config/tls.m4 index 4e170c8..1a5fc59 100644 --- a/config/tls.m4 +++ b/config/tls.m4 @@ -4,14 +4,14 @@ AC_DEFUN([GCC_CHECK_TLS], [ GCC_ENABLE(tls, yes, [], [Use thread-local storage]) AC_CACHE_CHECK([whether the target supports thread-local storage], gcc_cv_have_tls, [ - AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], + AC_RUN_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { return a = b; }])], [dnl If the test case passed with dynamic linking, try again with dnl static linking, but only if static linking is supported (not dnl on Solaris 10). This fails with some older Red Hat releases. chktls_save_LDFLAGS="$LDFLAGS" LDFLAGS="-static $LDFLAGS" - AC_LINK_IFELSE([int main() { return 0; }], - [AC_RUN_IFELSE([__thread int a; int b; int main() { return a = b; }], + AC_LINK_IFELSE([AC_LANG_SOURCE([int main() { return 0; }])], + [AC_RUN_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { return a = b; }])], [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no],[])], [gcc_cv_have_tls=yes]) LDFLAGS="$chktls_save_LDFLAGS" @@ -71,7 +71,7 @@ AC_DEFUN([GCC_CHECK_TLS], [ [gcc_cv_have_tls=no], [dnl This is the cross-compiling case. Assume libc supports TLS if the dnl binutils and the compiler do. - AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }], + AC_LINK_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { return a = b; }])], [chktls_save_LDFLAGS="$LDFLAGS" dnl Shared library options may depend on the host; this check dnl is only known to be needed for GNU/Linux. @@ -83,8 +83,8 @@ AC_DEFUN([GCC_CHECK_TLS], [ chktls_save_CFLAGS="$CFLAGS" CFLAGS="-fPIC $CFLAGS" dnl If -shared works, test if TLS works in a shared library. - AC_LINK_IFELSE([int f() { return 0; }], - [AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }], + AC_LINK_IFELSE([AC_LANG_SOURCE([int f() { return 0; }])], + [AC_LINK_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int f() { return a = b; }])], [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no])], [gcc_cv_have_tls=yes]) @@ -102,7 +102,7 @@ AC_DEFUN([GCC_CHECK_CC_TLS], [ GCC_ENABLE(tls, yes, [], [Use thread-local storage]) AC_CACHE_CHECK([whether the target assembler supports thread-local storage], gcc_cv_have_cc_tls, [ - AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }], + AC_COMPILE_IFELSE([AC_LANG_SOURCE([__thread int a; int b; int main() { return a = b; }])], [gcc_cv_have_cc_tls=yes], [gcc_cv_have_cc_tls=no])] )]) if test "$enable_tls $gcc_cv_have_cc_tls" = "yes yes"; then |