From d45a63687733a9e9029d8a336c3918d19a320a7b Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Mon, 6 Aug 2007 17:45:09 +0000 Subject: [PATCH] * 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. --- ChangeLog.mips | 6 ++++++ sysdeps/unix/sysv/linux/mips/dl-cache.h | 16 +++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/ChangeLog.mips b/ChangeLog.mips index 43aadf8..3216e73 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,3 +1,9 @@ +2007-08-06 Maciej W. Rozycki + + * 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 * sysdeps/mips/bits/wordsize.h [_MIPS_SIM == _ABI64]: diff --git a/sysdeps/unix/sysv/linux/mips/dl-cache.h b/sysdeps/unix/sysv/linux/mips/dl-cache.h index 4fa5d3a..9f0e4d2 100644 --- a/sysdeps/unix/sysv/linux/mips/dl-cache.h +++ b/sysdeps/unix/sysv/linux/mips/dl-cache.h @@ -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 @@ -17,6 +17,20 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include + +/* 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 \ { \ -- 2.7.4