about summary refs log tree commit diff
path: root/ports/sysdeps/unix
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-03-10 11:48:40 +0000
committerMike Frysinger <vapier@gentoo.org>2013-03-10 08:11:55 -0400
commit8233957f54a59063c0e5e8a27d82a182fa0d78ab (patch)
treed4338802362ed99e8128284284a534a826bef33b /ports/sysdeps/unix
parent3e6bd4b19888d355bd3fcb6a95caeda6f5279d45 (diff)
downloadglibc-8233957f54a59063c0e5e8a27d82a182fa0d78ab.tar.gz
glibc-8233957f54a59063c0e5e8a27d82a182fa0d78ab.tar.xz
glibc-8233957f54a59063c0e5e8a27d82a182fa0d78ab.zip
ia64: fix NEED_DL_SYSINFO_DSO conditionals
The recent change to clean up these defines missed the ia64 logic.
Update it accordingly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'ports/sysdeps/unix')
-rw-r--r--ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h27
1 files changed, 4 insertions, 23 deletions
diff --git a/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h b/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
index e87b0fe692..886a4f0e50 100644
--- a/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
+++ b/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
@@ -16,22 +16,10 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _DL_SYSDEP_H
-#define _DL_SYSDEP_H	1
+#ifndef _LINUX_IA64_DL_SYSDEP_H
+#define _LINUX_IA64_DL_SYSDEP_H	1
 
-/* This macro must be defined to either 0 or 1.
-
-   If 1, then an errno global variable hidden in ld.so will work right with
-   all the errno-using libc code compiled for ld.so, and there is never a
-   need to share the errno location with libc.  This is appropriate only if
-   all the libc functions that ld.so uses are called without PLT and always
-   get the versions linked into ld.so rather than the libc ones.  */
-
-#ifdef IS_IN_rtld
-# define RTLD_PRIVATE_ERRNO 1
-#else
-# define RTLD_PRIVATE_ERRNO 0
-#endif
+#include_next <dl-sysdep.h>
 
 /* Traditionally system calls have been made using break 0x100000.  A
    second method was introduced which, if possible, will use the EPC
@@ -41,7 +29,7 @@
 #define NEED_DL_SYSINFO	1
 #define USE_DL_SYSINFO	1
 
-#if defined NEED_DL_SYSINFO && !defined __ASSEMBLER__
+#ifndef __ASSEMBLER__
 /* Don't declare this as a function---we want it's entry-point, not
    it's function descriptor... */
 extern int _dl_sysinfo_break attribute_hidden;
@@ -64,11 +52,4 @@ extern int _dl_sysinfo_break attribute_hidden;
    might write into it after _dl_start returns.  */
 #define DL_ARGV_NOT_RELRO 1
 
-
-#ifndef __ASSEMBLER__
-/* Get version of the OS.  */
-extern int _dl_discover_osversion (void) attribute_hidden;
-# define HAVE_DL_DISCOVER_OSVERSION	1
-#endif
-
 #endif	/* dl-sysdep.h */