* [PATCH/committed] ia64: fix NEED_DL_SYSINFO_DSO conditionals
@ 2013-03-10 12:09 Mike Frysinger
0 siblings, 0 replies; only message in thread
From: Mike Frysinger @ 2013-03-10 12:09 UTC (permalink / raw)
To: libc-ports
The recent change to clean up these defines missed the ia64 logic.
Update it accordingly.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
ports/ChangeLog.ia64 | 9 ++++++++
.../sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h | 27 ++++------------------
2 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index e183560..46e2dd9 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,12 @@
+2013-03-10 Mike Frysinger <vapier@gentoo.org>
+
+ * sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h:
+ Change multiple inclusion guard to _LINUX_IA64_DL_SYSDEP_H.
+ Use #include_next.
+ (RTLD_PRIVATE_ERRNO): Remove definition, now redundant.
+ (NEED_DL_SYSINFO, _dl_discover_osversion,
+ HAVE_DL_DISCOVER_OSVERSION): Likewise.
+
2013-03-06 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/ia64/bits/msq.h (MSG_COPY): Define.
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 e87b0fe..886a4f0 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 */
--
1.8.1.2
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-03-10 12:09 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-03-10 12:09 [PATCH/committed] ia64: fix NEED_DL_SYSINFO_DSO conditionals Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).