OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ia64: fix NEED_DL_SYSINFO_DSO conditionals

Browse Source 
The recent change to clean up these defines missed the ia64 logic.
Update it accordingly.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2013-03-10 11:48:40 +00:00
parent 3e6bd4b198
commit 8233957f54
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/ChangeLog.ia64
View File

@ -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> 2013-03-06 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/ia64/bits/msq.h (MSG_COPY): Define. * sysdeps/unix/sysv/linux/ia64/bits/msq.h (MSG_COPY): Define.

27
ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
View File

@ -16,22 +16,10 @@
License along with the GNU C Library; if not, see License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */ <http://www.gnu.org/licenses/>. */
#ifndef _DL_SYSDEP_H #ifndef _LINUX_IA64_DL_SYSDEP_H
#define _DL_SYSDEP_H 1 #define _LINUX_IA64_DL_SYSDEP_H 1
/* This macro must be defined to either 0 or 1. #include_next <dl-sysdep.h>
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
/* Traditionally system calls have been made using break 0x100000. A /* Traditionally system calls have been made using break 0x100000. A
second method was introduced which, if possible, will use the EPC second method was introduced which, if possible, will use the EPC
@ -41,7 +29,7 @@
#define NEED_DL_SYSINFO 1 #define NEED_DL_SYSINFO 1
#define USE_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 /* Don't declare this as a function---we want it's entry-point, not
it's function descriptor... */ it's function descriptor... */
extern int _dl_sysinfo_break attribute_hidden; 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. */ might write into it after _dl_start returns. */
#define DL_ARGV_NOT_RELRO 1 #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 */ #endif /* dl-sysdep.h */