aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdhemerval Zanella <azanella@linux.vnet.ibm.com>2013-09-25 13:43:04 -0500
committerAdhemerval Zanella <azanella@linux.vnet.ibm.com>2013-09-25 13:43:04 -0500
commit5ebbff8fd1529aec13ac4d2906c1a36f3e738519 (patch)
tree7105ddb2f130682596e324a7afbe90c4bf9d775d
parentc5f840fd4f36f83e946cab0e2fa21a54e3a83f0b (diff)
downloadglibc-5ebbff8fd1529aec13ac4d2906c1a36f3e738519.tar
glibc-5ebbff8fd1529aec13ac4d2906c1a36f3e738519.tar.gz
glibc-5ebbff8fd1529aec13ac4d2906c1a36f3e738519.tar.bz2
glibc-5ebbff8fd1529aec13ac4d2906c1a36f3e738519.zip
PowerPC: Fix POINTER_CHK_GUARD thread register for PPC64
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/powerpc/powerpc64/stackguard-macros.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index baa19d7730..0fa412cdf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-25 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
+
+ * sysdeps/powerpc/powerpc64/stackguard-macros.h (POINTER_CHK_GUARD:
+ Fix thread ID register.
+
2013-09-25 Joseph Myers <joseph@codesourcery.com>
* conform/data/sched.h-data [XPG3 || XPG4]: Disable whole file.
diff --git a/sysdeps/powerpc/powerpc64/stackguard-macros.h b/sysdeps/powerpc/powerpc64/stackguard-macros.h
index 4620f96b86..e80a683e64 100644
--- a/sysdeps/powerpc/powerpc64/stackguard-macros.h
+++ b/sysdeps/powerpc/powerpc64/stackguard-macros.h
@@ -6,7 +6,7 @@
#define POINTER_CHK_GUARD \
({ \
uintptr_t x; \
- asm ("ld %0,%1(2)" \
+ asm ("ld %0,%1(13)" \
: "=r" (x) \
: "i" (offsetof (tcbhead_t, pointer_guard) - TLS_TCB_OFFSET - sizeof (tcbhead_t)) \
); \