summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2010-06-30 04:09:20 -0700
committerKhem Raj <raj.khem@gmail.com>2010-06-30 04:09:20 -0700
commit913b76abdd824ee3a6dbbc1527470ebcb8c06a65 (patch)
treeb63f2ef89f9282abbaa1f5fddfab3bb8f516706a
parent7576366386a8a0c71d1efdda3f8cd8e1724a8c23 (diff)
nptl/errno: Use a separate __errno_location for libpthread.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--libc/misc/internals/__errno_location.c6
-rw-r--r--libpthread/nptl/Makefile.in1
-rw-r--r--libpthread/nptl/errno_location.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/libc/misc/internals/__errno_location.c b/libc/misc/internals/__errno_location.c
index 487a9c2c5..aec7641ce 100644
--- a/libc/misc/internals/__errno_location.c
+++ b/libc/misc/internals/__errno_location.c
@@ -7,7 +7,11 @@
#include "internal_errno.h"
/* psm: moved to bits/errno.h: */
-int * weak_const_function __errno_location (void)
+int *
+#ifndef __UCLIBC_HAS_THREADS__
+weak_const_function
+#endif
+__errno_location (void)
{
return &errno;
}
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
index 3accff70f..da0568985 100644
--- a/libpthread/nptl/Makefile.in
+++ b/libpthread/nptl/Makefile.in
@@ -95,6 +95,7 @@ libpthread-routines-y = init vars events version \
pt-raise pt-system \
flockfile ftrylockfile funlockfile \
sigaction \
+ errno_location \
herrno \
pthread_kill_other_threads \
pthread_getaffinity pthread_setaffinity \
diff --git a/libpthread/nptl/errno_location.c b/libpthread/nptl/errno_location.c
new file mode 100644
index 000000000..74589389b
--- /dev/null
+++ b/libpthread/nptl/errno_location.c
@@ -0,0 +1 @@
+#include <libc/misc/internals/__errno_location.c>