PR testsuite/35677

	* emutls.c (__emutls_get_address): Make sure offset is really zero
	before initializing the object's offset.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142687 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c35189..a697b51 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-11  John David Anglin  <dave.anglin@nrc-cnrc.gc.ca>
+
+       PR testsuite/35677
+       * emutls.c (__emutls_get_address): Make sure offset is really zero
+       before initializing the object's offset.
+
 2008-12-11  Jakub Jelinek  <jakub@redhat.com>
 
        PR c++/38253

diff --git a/gcc/emutls.c b/gcc/emutls.c
index fc00895..32e14a1 100644 (file)
--- a/gcc/emutls.c
+++ b/gcc/emutls.c
@@ -147,8 +147,12 @@ __emutls_get_address (struct __emutls_object *obj)
       static __gthread_once_t once = __GTHREAD_ONCE_INIT;
       __gthread_once (&once, emutls_init);
       __gthread_mutex_lock (&emutls_mutex);
-      offset = ++emutls_size;
-      obj->loc.offset = offset;
+      offset = obj->loc.offset;
+      if (offset == 0)
+       {
+         offset = ++emutls_size;
+         obj->loc.offset = offset;
+       }
       __gthread_mutex_unlock (&emutls_mutex);
     }