diff options
author | cvs2svn <> | 2009-07-25 18:58:56 +0400 |
---|---|---|
committer | cvs2svn <> | 2009-07-25 18:58:56 +0400 |
commit | f7933f61b2ff10b34b661b2be815529e40223d1c (patch) | |
tree | 9d7a60c8966de4884ea2147e585cbabe3cc1cd6c /config | |
parent | 13832ef1baffcb98ec421c8d205b8ed94999df67 (diff) |
This commit was manufactured by cvs2svn to create branch 'msnyder-msnyder-checkpoint-072509-branchpointmsnyder-checkpoint-072509-branch
checkpoint-072509-branch'.
Sprout from dje-cgen-play1-branch 2009-06-26 17:19:08 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'dje-cgen-'
Cherrypick from master 2009-07-25 14:58:55 UTC H.J. Lu <hjl.tools@gmail.com> 'bfd/':
ChangeLog
config/ChangeLog
config/tls.m4
configure
configure.ac
djunpack.bat
include/ChangeLog
include/demangle.h
include/dwarf2.h
include/elf/ChangeLog
include/elf/common.h
include/elf/ppc.h
include/elf/ppc64.h
include/elf/spu.h
include/libiberty.h
Delete:
include/elf/dwarf2.h
Diffstat (limited to 'config')
-rw-r--r-- | config/ChangeLog | 11 | ||||
-rw-r--r-- | config/tls.m4 | 20 |
2 files changed, 30 insertions, 1 deletions
diff --git a/config/ChangeLog b/config/ChangeLog index d6ff5652d..96d5f7505 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,14 @@ +2009-07-17 Joseph Myers <joseph@codesourcery.com> + + PR other/40784 + * tls.m4 (GCC_CHECK_TLS): Add extra quoting around argument to + AC_LINK_IFELSE. + +2009-07-16 Joseph Myers <joseph@codesourcery.com> + + * tls.m4 (GCC_CHECK_TLS): Also test TLS in a shared library when + cross-compiling. + 2009-05-26 Rafael Avila de Espindola <espindola@google.com> * plugins.m4: New. diff --git a/config/tls.m4 b/config/tls.m4 index acb123f69..0ae60460b 100644 --- a/config/tls.m4 +++ b/config/tls.m4 @@ -1,5 +1,6 @@ dnl Check whether the target supports TLS. AC_DEFUN([GCC_CHECK_TLS], [ + AC_REQUIRE([AC_CANONICAL_HOST]) GCC_ENABLE(tls, yes, [], [Use thread-local storage]) AC_CACHE_CHECK([whether the target supports thread-local storage], gcc_cv_have_tls, [ @@ -66,7 +67,24 @@ AC_DEFUN([GCC_CHECK_TLS], [ [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; }], - [gcc_cv_have_tls=yes], [gcc_cv_have_tls=no]) + [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. + case $host in + *-*-linux*) + LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS" + ;; + esac + 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; }], + [gcc_cv_have_tls=yes], + [gcc_cv_have_tls=no])], + [gcc_cv_have_tls=yes]) + CFLAGS="$chktls_save_CFLAGS" + LDFLAGS="$chktls_save_LDFLAGS"], [gcc_cv_have_tls=no]) ] )]) if test "$enable_tls $gcc_cv_have_tls" = "yes yes"; then |