diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1997-02-15 02:32:58 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1997-02-15 02:32:58 +0000 |
| commit | 7434ccadbb6897d366d2377f84efe1e2cd61b02b (patch) | |
| tree | f8ba8ee60bf079077654583d3b7e92b63940ab19 /sysdeps | |
| parent | 795fbc9aa183e10526f6545e28cabf03be7feaf9 (diff) | |
| download | glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.tar glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.tar.gz glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.tar.bz2 glibc-7434ccadbb6897d366d2377f84efe1e2cd61b02b.zip | |
update from main archive 970214cvs/root-libc-2_0_x-branch
1997-02-13 11:44 Andreas Jaeger <aj@arthur.pfalz.de>
* stdlib/qsort.c: Add prototype for _quicksort.
* stdlib/msort.c (qsort): Correct prototype for _quicksort.
* sysdeps/i386/Makefile (CFLAGS-rtld.c): Change to prevent warning
from dl-machine.h.
1997-02-13 18:18 Marcus G. Daniels <marcus@sysc.pdx.edu>
* sysdeps/generic/dl-cache.c: Don't hardwire name of cache file.
Allow user to overwrite it.
1997-02-13 17:55 Ulrich Drepper <drepper@cygnus.com>
* libio/_G_config.h: Make sure win_t is also defined for old gcc
versions. Reported by Andreas Jaeger.
1997-02-13 11:44 Andreas Jaeger <aj@arthur.pfalz.de>
* db/btree/bt_split.c (bt_psplit): Fix typo in change of
1997-02-12.
* time/tzfile.c (__tzfile_read): Change comment to follow
change of 1997-02-12.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/generic/dl-cache.c | 8 | ||||
| -rw-r--r-- | sysdeps/i386/Makefile | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/sysdeps/generic/dl-cache.c b/sysdeps/generic/dl-cache.c index ac4ee5e6c9..09cb857506 100644 --- a/sysdeps/generic/dl-cache.c +++ b/sysdeps/generic/dl-cache.c @@ -1,5 +1,5 @@ /* Support for reading /etc/ld.so.cache files written by Linux ldconfig. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1997 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 @@ -27,6 +27,10 @@ extern void *_dl_sysdep_read_whole_file (const char *filename, size_t *filesize_ptr, int mmap_prot); +#ifndef LD_SO_CACHE +#define LD_SO_CACHE "/etc/ld.so.cache" +#endif + #define CACHEMAGIC "ld.so-1.7.0" struct cache_file @@ -57,7 +61,7 @@ _dl_load_cache_lookup (const char *name) if (cache == NULL) { /* Read the contents of the file. */ - void *file = _dl_sysdep_read_whole_file ("/etc/ld.so.cache", &cachesize, + void *file = _dl_sysdep_read_whole_file (LD_SO_CACHE, &cachesize, PROT_READ); if (file && cachesize > sizeof *cache && !memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1)) diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile index 36410f04f1..21caf42052 100644 --- a/sysdeps/i386/Makefile +++ b/sysdeps/i386/Makefile @@ -6,7 +6,7 @@ asm-CPPFLAGS := $(asm-CPPFLAGS) -DGAS_SYNTAX long-double-fcts = yes ifeq ($(subdir),elf) -CFLAGS-rtld.c += -Wno-uninitialized +CFLAGS-rtld.c += -Wno-uninitialized -Wno-unused CFLAGS-dl-load.c += -Wno-unused CFLAGS-dl-reloc.c += -Wno-unused endif |