aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGravatar Peter S. Mazinger <ps.m@gmx.net>2011-03-03 15:06:47 +0100
committerGravatar Peter S. Mazinger <ps.m@gmx.net>2011-03-03 18:22:53 +0100
commit96c9a8f7d00cdf6bb7968a2390b9d87da8a45e2d (patch)
tree597fcd4c444038554af4b410c9fb2db82102d4ac /include
parent1f19ef8f9316e52f4940c34be3e056a8a41540e6 (diff)
downloaduClibc-96c9a8f7d00cdf6bb7968a2390b9d87da8a45e2d.tar.gz
uClibc-96c9a8f7d00cdf6bb7968a2390b9d87da8a45e2d.tar.bz2
add _dl_errno support to errno.h, cleanup
Add support to use errno.h in ldso. Move __set_errno into _LIBC guard. Remove uClibc_errno.h, unused. Signed-off-by: Peter S. Mazinger <ps.m@gmx.net>
Diffstat (limited to 'include')
-rw-r--r--include/errno.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/errno.h b/include/errno.h
index 85268f053..7e1f583a8 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -58,7 +58,12 @@ extern const char *program_invocation_name, *program_invocation_short_name;
__END_DECLS
-#if defined _LIBC && defined __UCLIBC_HAS_TLS__
+#ifdef _LIBC
+#ifdef IS_IN_rtld
+# undef errno
+# define errno _dl_errno
+extern int _dl_errno; /* attribute_hidden */
+#elif defined __UCLIBC_HAS_TLS__
# if !defined NOT_IN_libc || defined IS_IN_libpthread
# undef errno
# ifndef NOT_IN_libc
@@ -73,10 +78,7 @@ extern __thread int errno attribute_tls_model_ie;
#ifndef __set_errno
#define __set_errno(val) (errno = (val))
#endif
-
-#ifndef __ASSEMBLER__
-extern int *__errno_location (void) __THROW __attribute__ ((__const__));
-#endif
+#endif /* _LIBC */
#endif /* _ERRNO_H */