[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r22605 - in /fsf/trunk/libc/ports: ChangeLog.ia64 sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
- To: commits@xxxxxxxxxx
- Subject: [Commits] r22605 - in /fsf/trunk/libc/ports: ChangeLog.ia64 sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
- From: eglibc@xxxxxxxxxx
- Date: Mon, 11 Mar 2013 00:01:42 -0000
Author: eglibc
Date: Mon Mar 11 00:01:41 2013
New Revision: 22605
Log:
Import glibc-mainline for 2013-03-11
Modified:
fsf/trunk/libc/ports/ChangeLog.ia64
fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
Modified: fsf/trunk/libc/ports/ChangeLog.ia64
==============================================================================
--- fsf/trunk/libc/ports/ChangeLog.ia64 (original)
+++ fsf/trunk/libc/ports/ChangeLog.ia64 Mon Mar 11 00:01:41 2013
@@ -1,3 +1,12 @@
+2013-03-10 Mike Frysinger <vapier@xxxxxxxxxx>
+
+ * 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@xxxxxxx>
* sysdeps/unix/sysv/linux/ia64/bits/msq.h (MSG_COPY): Define.
Modified: fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h
==============================================================================
--- fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h (original)
+++ fsf/trunk/libc/ports/sysdeps/unix/sysv/linux/ia64/nptl/dl-sysdep.h Mon Mar 11 00:01:41 2013
@@ -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 @@
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 */
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits