diff options
| -rw-r--r-- | libgomp/ChangeLog | 9 | ||||
| -rw-r--r-- | libgomp/config.h.in | 3 | ||||
| -rwxr-xr-x | libgomp/configure | 31 | ||||
| -rw-r--r-- | libgomp/configure.ac | 3 | ||||
| -rw-r--r-- | libgomp/libgomp.h | 2 | ||||
| -rw-r--r-- | libgomp/team.c | 6 |
6 files changed, 50 insertions, 4 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 97b607f0533..acf45fb00af 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,12 @@ +2014-12-09 Varvara Rainchik <varvara.rainchik@intel.com> + + * config.h.in: Regenerate. + * configure: Regenerate. + * configure.ac: Add GCC_CHECK_EMUTLS. + * libgomp.h: Add check for USE_EMUTLS: this case + is equal to HAVE_TLS. + * team.c: Likewise. + 2014-12-03 Uros Bizjak <ubizjak@gmail.com> * configure.tgt (x86_64-*-linux*): Tune -m32 multilib to generic. diff --git a/libgomp/config.h.in b/libgomp/config.h.in index 94a2b3b3b32..a5e27ca4eaf 100644 --- a/libgomp/config.h.in +++ b/libgomp/config.h.in @@ -79,6 +79,9 @@ /* Define to 1 if the target supports thread-local storage. */ #undef HAVE_TLS +/* Define to 1 if the target use emutls for thread-local storage. */ +#undef USE_EMUTLS + /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H diff --git a/libgomp/configure b/libgomp/configure index bff5c62947e..f5d6b6b57ba 100755 --- a/libgomp/configure +++ b/libgomp/configure @@ -15515,6 +15515,37 @@ $as_echo "#define HAVE_TLS 1" >>confdefs.h fi +# See if we have emulated thread-local storage. + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the thread-local storage support is from emutls" >&5 +$as_echo_n "checking whether the thread-local storage support is from emutls... " >&6; } +if test "${gcc_cv_use_emutls+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + + gcc_cv_use_emutls=no + echo '__thread int a; int b; int main() { return a = b; }' > conftest.c + if { ac_try='${CC-cc} -Werror -S -o conftest.s conftest.c 1>&5' + { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 + (eval $ac_try) 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + if grep __emutls_get_address conftest.s > /dev/null; then + gcc_cv_use_emutls=yes + fi + fi + rm -f conftest.* + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcc_cv_use_emutls" >&5 +$as_echo "$gcc_cv_use_emutls" >&6; } + if test "$gcc_cv_use_emutls" = "yes" ; then + +$as_echo "#define USE_EMUTLS 1" >>confdefs.h + + fi + # See what sort of export controls are available. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the target supports hidden visibility" >&5 diff --git a/libgomp/configure.ac b/libgomp/configure.ac index cea63660c5a..16ec158a79e 100644 --- a/libgomp/configure.ac +++ b/libgomp/configure.ac @@ -245,6 +245,9 @@ fi # See if we support thread-local storage. GCC_CHECK_TLS +# See if we have emulated thread-local storage. +GCC_CHECK_EMUTLS + # See what sort of export controls are available. LIBGOMP_CHECK_ATTRIBUTE_VISIBILITY LIBGOMP_CHECK_ATTRIBUTE_DLLEXPORT diff --git a/libgomp/libgomp.h b/libgomp/libgomp.h index a1482ccfbf4..b694356f67e 100644 --- a/libgomp/libgomp.h +++ b/libgomp/libgomp.h @@ -471,7 +471,7 @@ enum gomp_cancel_kind /* ... and here is that TLS data. */ -#ifdef HAVE_TLS +#if defined HAVE_TLS || defined USE_EMUTLS extern __thread struct gomp_thread gomp_tls_data; static inline struct gomp_thread *gomp_thread (void) { diff --git a/libgomp/team.c b/libgomp/team.c index e6a6d8ff679..594127ca132 100644 --- a/libgomp/team.c +++ b/libgomp/team.c @@ -37,7 +37,7 @@ pthread_key_t gomp_thread_destructor; /* This is the libgomp per-thread data structure. */ -#ifdef HAVE_TLS +#if defined HAVE_TLS || defined USE_EMUTLS __thread struct gomp_thread gomp_tls_data; #else pthread_key_t gomp_tls_key; @@ -70,7 +70,7 @@ gomp_thread_start (void *xdata) void (*local_fn) (void *); void *local_data; -#ifdef HAVE_TLS +#if defined HAVE_TLS || defined USE_EMUTLS thr = &gomp_tls_data; #else struct gomp_thread local_thr; @@ -916,7 +916,7 @@ gomp_team_end (void) static void __attribute__((constructor)) initialize_team (void) { -#ifndef HAVE_TLS +#if !defined HAVE_TLS && !defined USE_EMUTLS static struct gomp_thread initial_thread_tls_data; pthread_key_create (&gomp_tls_key, NULL); |