X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Femutls.c;h=32e14a1c97e232a8807d5bd4350dc27a758fe2cb;hb=49b6dba67f06de2ec02bf958c556fc34b171408e;hp=c3374a1c7de9accf63ff0073585de12f160f98ba;hpb=bedbe58b878a4097bde511367440c8fdd34b8bb3;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/emutls.c b/gcc/emutls.c
index c3374a1c7de..32e14a1c97e 100644
--- a/gcc/emutls.c
+++ b/gcc/emutls.c
@@ -54,6 +54,9 @@ struct __emutls_array
   void **data[];
 };
 
+void *__emutls_get_address (struct __emutls_object *);
+void __emutls_register_common (struct __emutls_object *, word, word, void *);
+
 #ifdef __GTHREADS
 #ifdef __GTHREAD_MUTEX_INIT
 static __gthread_mutex_t emutls_mutex = __GTHREAD_MUTEX_INIT;
@@ -144,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);
     }