From de2101834f0c80e38008e8d1d1848ab94ce2341e Mon Sep 17 00:00:00 2001 From: Austin Foxley Date: Fri, 19 Feb 2010 03:09:06 -0800 Subject: more fixes for x86_64 nptl also cleanup some PIC (should be __PIC__) that snuck in Signed-off-by: Austin Foxley --- libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S | 4 ++-- libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'libpthread/nptl/sysdeps/unix/sysv/linux/sh') diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S index 542804862..25c75c54a 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S @@ -234,7 +234,7 @@ __lll_timedlock_wait: # ifndef __ASSUME_FUTEX_CLOCK_REALTIME mov.l .Lhave, r1 -# ifdef PIC +# ifdef __PIC__ mova .Lgot, r0 mov.l .Lgot, r12 add r0, r12 @@ -284,7 +284,7 @@ __lll_timedlock_wait: mov.l @r15+, r12 .align 2 -# ifdef PIC +# ifdef __PIC__ .Lgot: .long _GLOBAL_OFFSET_TABLE_ .Lhave: diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S index 774442f23..7fb61b273 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/sem_timedwait.S @@ -215,7 +215,7 @@ sem_wait_cleanup: DEC (@(NWAITERS,r8), r2) .LcallUR: mov.l .Lresume, r1 -#ifdef PIC +#ifdef __PIC__ add r12, r1 #endif jsr @r1 @@ -224,7 +224,7 @@ sem_wait_cleanup: .align 2 .Lresume: -#ifdef PIC +#ifdef __PIC__ .long _Unwind_Resume@GOTOFF #else .long _Unwind_Resume -- cgit v1.2.3