From 11bf8ce1d6c28b4758cedeaea9558f6a071fe7d8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 22 Jul 2003 22:28:07 +0000 Subject: Update. 2003-07-22 H.J. Lu * elf/dl-support.c (_dl_hwcap): New variable. (_dl_aux_init): Initialize GL(dl_hwcap) for static binaries. * sysdeps/i386/fpu/fclrexcpt.c: Include , and . (__feclearexcept): Clear MXCSR if needed. * sysdeps/i386/fpu/fsetexcptflg.c: Likewise. * sysdeps/i386/fpu_control.h (_FPU_GETCW, _FPU_SETCW): Document that newer hardware needs more than these macros. * sysdeps/i386/setfpucw.c: New file. 2003-07-22 Jakub Jelinek * elf/Makefile (CFLAGS-ldconfig.c): Define IS_IN_ldconfig. * elf/ldconfig.c: Include dl-procinfo.c. (PROCINFO_CLASS): Define. * sysdeps/generic/ldsodefs.h (PROCINFO_CLASS): Define. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: New file. * sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h: New file. * sysdeps/unix/sysv/linux/i386/dl-procinfo.c (PROCINFO_CLASS): Define if not yet defined. Use it instead of EXTERN. Undefine at the end of the file. * sysdeps/unix/sysv/linux/arm/dl-procinfo.c (PROCINFO_CLASS): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c (PROCINFO_CLASS): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c (PROCINFO_CLASS): Likewise. 2003-07-22 H.J. Lu * elf/ldconfig.c (main): Issue a fatal error if relative path is used to build cache. 2003-07-22 Ulrich Drepper * elf/readlib.c (process_file): Avoid possible overflow in assignment. --- elf/Makefile | 2 +- elf/dl-support.c | 4 ++++ elf/ldconfig.c | 12 ++++++++++-- 3 files changed, 15 insertions(+), 3 deletions(-) (limited to 'elf') diff --git a/elf/Makefile b/elf/Makefile index 5ba98fc4e8..7c654f86ae 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -336,7 +336,7 @@ $(objpfx)sprof: $(libdl) $(objpfx)ldconfig: $(ldconfig-modules:%=$(objpfx)%.o) SYSCONF-FLAGS := -D'SYSCONFDIR="$(sysconfdir)"' CFLAGS-ldconfig.c = $(SYSCONF-FLAGS) -D'LIBDIR="$(libdir)"' \ - -D'SLIBDIR="$(slibdir)"' + -D'SLIBDIR="$(slibdir)"' -DIS_IN_ldconfig=1 CFLAGS-dl-cache.c = $(SYSCONF-FLAGS) CFLAGS-cache.c = $(SYSCONF-FLAGS) diff --git a/elf/dl-support.c b/elf/dl-support.c index 6d83da3328..1616eec2f4 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -123,6 +123,7 @@ int _dl_correct_cache_id = _DL_CACHE_DEFAULT_ID; struct ElfW(Phdr) *_dl_phdr; size_t _dl_phnum; +unsigned long int _dl_hwcap; #ifdef NEED_DL_SYSINFO /* Needed for improved syscall handling on at least x86/Linux. */ @@ -167,6 +168,9 @@ _dl_aux_init (ElfW(auxv_t) *av) case AT_PHNUM: GL(dl_phnum) = av->a_un.a_val; break; + case AT_HWCAP: + GL(dl_hwcap) = av->a_un.a_val; + break; #ifdef NEED_DL_SYSINFO case AT_SYSINFO: GL(dl_sysinfo) = av->a_un.a_val; diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 1acacb4225..b7ac4882f5 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -132,6 +132,9 @@ static const struct argp_option options[] = { NULL, 0, NULL, 0, NULL, 0 } }; +#define PROCINFO_CLASS static +#include + /* Short description of program. */ static const char doc[] = N_("Configure Dynamic Linker Run Time Bindings."); @@ -1009,13 +1012,18 @@ main (int argc, char **argv) /* Parse and process arguments. */ argp_parse (&argp, argc, argv, 0, &remaining, NULL); - /* Remaining arguments are additional libraries if opt_manual_link + /* Remaining arguments are additional directories if opt_manual_link is not set. */ if (remaining != argc && !opt_manual_link) { int i; for (i = remaining; i < argc; ++i) - add_dir (argv[i]); + if (opt_build_cache && argv[i][0] != '/') + error (EXIT_FAILURE, 0, + _("relative path `%s' used to build cache"), + argv[i]); + else + add_dir (argv[i]); } set_hwcap (); -- cgit v1.2.3