This is the mail archive of the libc-hacker@sourceware.cygnus.com mailing list for the glibc project.

Note that libc-hacker is a closed list. You may look at the archives of this list, but subscription and posting are not open.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[PATCH] Fix dl-cache breakage on sparc64


Hi!

This patch fixes breakage introduced by generic/dl-cache.h changes (several
things were put into that file without updating sparc64/dl-cache.h as well).

2000-05-17  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/generic/dl-cache.h (_DL_CACHE_DEFAULT_ID): Only define if
	not yet defined.
	(_dl_cache_check_flags): Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/dl-cache.h: include_next
	dl-cache.h.

--- libc/sysdeps/generic/dl-cache.h.jj	Tue May  9 13:48:11 2000
+++ libc/sysdeps/generic/dl-cache.h	Wed May 17 06:56:58 2000
@@ -17,11 +17,14 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
+#ifndef _DL_CACHE_DEFAULT_ID
 #define _DL_CACHE_DEFAULT_ID	3
+#endif
 
+#ifndef _dl_cache_check_flags
 #define _dl_cache_check_flags(flags)			\
   ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID)
-
+#endif
 
 #ifndef LD_SO_CACHE
 # define LD_SO_CACHE "/etc/ld.so.cache"
--- libc/sysdeps/unix/sysv/linux/sparc/sparc64/dl-cache.h.jj	Tue Jan  4 17:12:06 2000
+++ libc/sysdeps/unix/sysv/linux/sparc/sparc64/dl-cache.h	Wed May 17 06:55:56 2000
@@ -1,5 +1,5 @@
 /* Support for reading /etc/ld.so.cache files written by Linux ldconfig.
-   Copyright (C) 1999 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000 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
@@ -21,3 +21,5 @@
 
 #define _dl_cache_check_flags(flags)			\
   ((flags) == _DL_CACHE_DEFAULT_ID)
+
+#include_next <dl-cache.h>

	Jakub

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]