[commits] r3070 - in /fsf/trunk/ports: ChangeLog.mips sysdeps/unix/sysv/linux/mips/dl-cache.h

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Tue Aug  7 00:03:58 2007
New Revision: 3070

Log:
Import glibc-ports-mainline for 2007-08-07

Modified:
    fsf/trunk/ports/ChangeLog.mips
    fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/dl-cache.h

Modified: fsf/trunk/ports/ChangeLog.mips
==============================================================================
--- fsf/trunk/ports/ChangeLog.mips (original)
+++ fsf/trunk/ports/ChangeLog.mips Tue Aug  7 00:03:58 2007
@@ -1,3 +1,9 @@
+2007-08-06  Maciej W. Rozycki  <macro@xxxxxxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/mips/dl-cache.h (_DL_CACHE_DEFAULT_ID):
+	New macros for the (n)64 and n32 ABIs.
+	(_dl_cache_check_flags): Define if _DL_CACHE_DEFAULT_ID has been.
+
 2007-07-13  Carlos O'Donell  <carlos@xxxxxxxxxxxxxxxx>
 
 	* sysdeps/mips/bits/wordsize.h [_MIPS_SIM == _ABI64]:

Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/dl-cache.h
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/dl-cache.h (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/mips/dl-cache.h Tue Aug  7 00:03:58 2007
@@ -1,5 +1,5 @@
 /* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
-   Copyright (C) 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -16,6 +16,20 @@
    License along with the GNU C Library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
+
+#include <ldconfig.h>
+
+/* Redefine the cache ID for new ABIs; o32 keeps using the generic check.  */
+#if _MIPS_SIM == _ABI64
+# define _DL_CACHE_DEFAULT_ID	(FLAG_MIPS64_LIBN64 | FLAG_ELF_LIBC6)
+#elif _MIPS_SIM == _ABIN32
+# define _DL_CACHE_DEFAULT_ID	(FLAG_MIPS64_LIBN32 | FLAG_ELF_LIBC6)
+#endif
+
+#ifdef _DL_CACHE_DEFAULT_ID
+# define _dl_cache_check_flags(flags) \
+  ((flags) == _DL_CACHE_DEFAULT_ID)
+#endif
 
 #define add_system_dir(dir) \
   do								\