summaryrefslogtreecommitdiff
path: root/libpthread/linuxthreads/sysdeps
diff options
context:
space:
mode:
authorAustin Foxley <austinf@cetoncorp.com>2009-12-19 14:02:14 -0800
committerAustin Foxley <austinf@cetoncorp.com>2009-12-19 14:03:00 -0800
commit875d11eec5df38bae0003df4a884ef962cf28590 (patch)
tree83667b7ab2470a3aba40fb9ee868784d77d7e900 /libpthread/linuxthreads/sysdeps
parentf3217f9be3225c4943677d03b274cbc0cb4ed228 (diff)
parent23528282b771d1af3df0fa17f1e909ad3b663f59 (diff)
Merge commit 'origin/master' into nptl
Conflicts: libc/signal/sigpause.c libc/string/x86_64/memset.S Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libpthread/linuxthreads/sysdeps')
-rw-r--r--libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
index de3609e9d..5d686299c 100644
--- a/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
+++ b/libpthread/linuxthreads/sysdeps/unix/sysv/linux/alpha/sysdep-cancel.h
@@ -130,7 +130,7 @@ __LABEL($syscall_error) \
extern int __local_multiple_threads attribute_hidden;
# define SINGLE_THREAD_P \
__builtin_expect (__local_multiple_threads == 0, 1)
-# elif defined(PIC)
+# elif defined(__PIC__)
# define SINGLE_THREAD_P(reg) ldl reg, __local_multiple_threads(gp) !gprel
# else
# define SINGLE_THREAD_P(reg) \