[commits] r10191 - in /fsf/trunk/ports: ./ sysdeps/mips/ sysdeps/unix/sysv/linux/mips/

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Wed Apr  7 00:04:24 2010
New Revision: 10191

Log:
Import glibc-ports-mainline for 2010-04-07

Added:
    fsf/trunk/ports/libc-abis
Modified:
    fsf/trunk/ports/ChangeLog
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/mips/dl-machine.h
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/ldsodefs.h

Modified: fsf/trunk/ports/ChangeLog
==============================================================================
--- fsf/trunk/ports/ChangeLog (original)
+++ fsf/trunk/ports/ChangeLog Wed Apr  7 00:04:24 2010
@@ -1,3 +1,7 @@
+2010-04-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* libc-abis: New.
+
 2006-03-06  Roland McGrath  <roland@xxxxxxxxxx>
 
 	* Makefile (%.bz2, %.gz): New pattern rules.

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Wed Apr  7 00:04:24 2010
@@ -1,3 +1,10 @@
+2010-04-06  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
+
+	* sysdeps/mips/dl-machine.h (VALID_ELF_ABIVERSION,
+	VALID_ELF_OSABI, VALID_ELF_HEADER): Remove.
+	* sysdeps/unix/sysv/linux/mips/ldsodefs.h (VALID_ELF_ABIVERSION):
+	Define.
+
 2010-03-30  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/unix/sysv/linux/mips/bits/socket.h: Define

Added: fsf/trunk/ports/libc-abis
==============================================================================
--- fsf/trunk/ports/libc-abis (added)
+++ fsf/trunk/ports/libc-abis Wed Apr  7 00:04:24 2010
@@ -1,0 +1,16 @@
+# See the copy of this file in libc for detailed explanations.  The
+# ports copy needs to include all libc definitions applicable to any
+# ports target; only one copy will be used.
+#
+# Feature Name	Configuration
+# ------------	-------------
+#
+# MIPS PLTs.
+MIPS_PLT	mips*-*-linux*
+#
+# Unique symbol definitions for C++.
+# Architecture independent, all ELF targets (== all targets)
+UNIQUE
+#
+# Indirect PLT relocations.  Architecture dependent.
+IFUNC		powerpc-*-linux*

Modified: fsf/trunk/ports/sysdeps/mips/dl-machine.h
==============================================================================
--- fsf/trunk/ports/sysdeps/mips/dl-machine.h (original)
+++ fsf/trunk/ports/sysdeps/mips/dl-machine.h Wed Apr  7 00:04:24 2010
@@ -74,15 +74,6 @@
        *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
        (ElfW(Addr)) (r); \
    } while (0)
-
-/* Allow ABIVERSION == 1, meaning PLTs and copy relocations are
-   required.  */
-#define VALID_ELF_ABIVERSION(ver)	(ver == 0 || ver == 2)
-#define VALID_ELF_OSABI(osabi)		(osabi == ELFOSABI_SYSV)
-#define VALID_ELF_HEADER(hdr,exp,size) \
-  memcmp (hdr,exp,size-2) == 0 \
-  && VALID_ELF_OSABI (hdr[EI_OSABI]) \
-  && VALID_ELF_ABIVERSION (hdr[EI_ABIVERSION])
 
 /* Return nonzero iff ELF header is compatible with the running host.  */
 static inline int __attribute_used__

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/ldsodefs.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/ldsodefs.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/ldsodefs.h Wed Apr  7 00:04:24 2010
@@ -30,4 +30,12 @@
 #undef DL_STATIC_INIT
 #define DL_STATIC_INIT(map) _dl_static_init (map)
 
+/* Allow ABIVERSION == 1, meaning PLTs and copy relocations are
+   required, with ELFOSABI_SYSV.  */
+#undef VALID_ELF_ABIVERSION
+#define VALID_ELF_ABIVERSION(osabi,ver)			\
+  (ver == 0						\
+   || (osabi == ELFOSABI_SYSV && ver < 2)		\
+   || (osabi == ELFOSABI_LINUX && ver < LIBC_ABI_MAX))
+
 #endif /* ldsodefs.h */