From 667b05772506c97e7d5dbddd405b593d99fc64b1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 10 Mar 2001 16:40:59 +0000 Subject: Update. 2001-03-07 David Mosberger * sysdeps/ia64/bits/fenv.h (FE_NONIEEE_ENV): New macro. 2001-03-07 Jes Sorensen * sysdeps/unix/sysv/linux/ia64/ioperm.c (_ioperm): Remove unused variables addr & len. 2001-02-22 Jes Sorensen * sysdeps/ia64/fpu/feenablxcpt.c (feenableexcept): Remove punctuation in asm constraint. 2001-03-07 Mark Kettenis * resolv/netdb.h [__USE_GNU]: Define __need_timespec and include to get definition of `struct timespec'. 2001-03-08 Jakub Jelinek * elf/rtld.c (dl_main): If tracing, warn about undefined symbols if LD_WARN=1, not if LD_WARN is unset. 2001-03-07 Andreas Schwab * elf/ldconfig.h: Moved to ... * sysdeps/generic/ldconfig.h: ... here. * sysdeps/unix/sysv/linux/i386/ldconfig.h: New file. * sysdeps/unix/sysv/linux/m68k/ldconfig.h: New file. * sysdeps/unix/sysv/linux/ia64/ldconfig.h: New file. * elf/readlib.c (interpreters, known_libs): Use SYSDEP_KNOWN_INTERPRETER_NAMES and SYSDEP_KNOWN_LIBRARY_NAMES instead of hard coding old names. --- elf/ldconfig.h | 68 ---------------------------------------------------------- elf/readlib.c | 13 +++++------ elf/rtld.c | 4 ++-- 3 files changed, 9 insertions(+), 76 deletions(-) delete mode 100644 elf/ldconfig.h (limited to 'elf') diff --git a/elf/ldconfig.h b/elf/ldconfig.h deleted file mode 100644 index aaad06de5d..0000000000 --- a/elf/ldconfig.h +++ /dev/null @@ -1,68 +0,0 @@ -/* Copyright (C) 1999, 2000 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Andreas Jaeger , 1999. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef _LDCONFIG_H -#define _LDCONFIG_H - -#define FLAG_ANY -1 -#define FLAG_TYPE_MASK 0x00ff -#define FLAG_LIBC4 0x0000 -#define FLAG_ELF 0x0001 -#define FLAG_ELF_LIBC5 0x0002 -#define FLAG_ELF_LIBC6 0x0003 -#define FLAG_REQUIRED_MASK 0xff00 -#define FLAG_SPARC_LIB64 0x0100 -#define FLAG_IA64_LIB64 0x0200 -#define FLAG_X8664_LIB64 0x0300 - -/* Declared in cache.c. */ -extern void print_cache (const char *cache_name); - -extern void init_cache (void); - -extern void save_cache (const char *cache_name); - -extern void add_to_cache (const char *path, const char *lib, int flags, - uint64_t hwcap); - -/* Declared in readlib.c. */ -extern int process_file (const char *real_file_name, const char *file_name, - const char *lib, int *flag, char **soname, - int is_link); - -/* Declared in readelflib.c. */ -extern int process_elf_file (const char *file_name, const char *lib, int *flag, - char **soname, void *file_contents, - size_t file_length); - -/* Declared in chroot_canon.c. */ -extern char *chroot_canon (const char *chroot, const char *name); - -/* Declared in ldconfig.c. */ -extern int opt_verbose; - -extern int opt_format; - -/* Prototypes for a few program-wide used functions. */ -extern void *xmalloc (size_t __n); -extern void *xcalloc (size_t __n, size_t __size); -extern void *xrealloc (void *__p, size_t __n); -extern char *xstrdup (const char *__str); - -#endif /* ! _LDCONFIG_H */ diff --git a/elf/readlib.c b/elf/readlib.c index 70a77e2e72..746c78f345 100644 --- a/elf/readlib.c +++ b/elf/readlib.c @@ -51,17 +51,18 @@ struct known_names static struct known_names interpreters [] = { {"/lib/" LD_SO, FLAG_ELF_LIBC6}, - {"/lib/ld-linux.so.1", FLAG_ELF_LIBC5} +#ifdef SYSDEP_KNOWN_INTERPRETER_NAMES + SYSDEP_KNOWN_INTERPRETER_NAMES +#endif }; static struct known_names known_libs [] = { - /* Old names: */ - {"libc.so.5", FLAG_ELF_LIBC5}, - {"libm.so.5", FLAG_ELF_LIBC5}, - /* Current names: */ {LIBC_SO, FLAG_ELF_LIBC6}, - {LIBM_SO, FLAG_ELF_LIBC6} + {LIBM_SO, FLAG_ELF_LIBC6}, +#ifdef SYSDEP_KNOWN_LIBRARY_NAMES + SYSDEP_KNOWN_LIBRARY_NAMES +#endif }; diff --git a/elf/rtld.c b/elf/rtld.c index 9142d0b15a..865e31b69d 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -896,8 +896,8 @@ of this helper program; chances are you did not intend to run this program.\n\ } else { - /* Unless LD_WARN is set warn do not about undefined symbols. */ - if (_dl_lazy >= 0 && !_dl_verbose) + /* If LD_WARN is set warn about undefined symbols. */ + if (_dl_lazy >= 0 && _dl_verbose) { /* We have to do symbol dependency testing. */ struct relocate_args args; -- cgit v1.2.3