From 5ebbff8fd1529aec13ac4d2906c1a36f3e738519 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 25 Sep 2013 13:43:04 -0500 Subject: [PATCH] PowerPC: Fix POINTER_CHK_GUARD thread register for PPC64 --- ChangeLog | 5 +++++ sysdeps/powerpc/powerpc64/stackguard-macros.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index baa19d7730..0fa412cdf4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2013-09-25 Adhemerval Zanella + + * sysdeps/powerpc/powerpc64/stackguard-macros.h (POINTER_CHK_GUARD: + Fix thread ID register. + 2013-09-25 Joseph Myers * 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)) \ ); \ -- 2.43.5