From 53e0412afceaac051f3e38a2c0f1060b7e9e915a Mon Sep 17 00:00:00 2001
From: danglin <danglin@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 11 Dec 2008 18:33:48 +0000
Subject: 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
---
gcc/ChangeLog | 6 ++++++
gcc/emutls.c | 8 ++++++--
2 files changed, 12 insertions(+), 2 deletions(-)
(limited to 'gcc')
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6c3518911b3..a697b51fe50 100644
--- 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 fc008952979..32e14a1c97e 100644
--- 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);
}
--
cgit v1.2.1