diff options
| -rw-r--r-- | ChangeLog | 42 | ||||
| -rw-r--r-- | elf/Makefile | 2 | ||||
| -rw-r--r-- | elf/dl-support.c | 4 | ||||
| -rw-r--r-- | elf/ldconfig.c | 12 | ||||
| -rw-r--r-- | sysdeps/generic/ldsodefs.h | 1 | ||||
| -rw-r--r-- | sysdeps/i386/fpu/fclrexcpt.c | 18 | ||||
| -rw-r--r-- | sysdeps/i386/fpu/fsetexcptflg.c | 19 | ||||
| -rw-r--r-- | sysdeps/i386/fpu_control.h | 8 | ||||
| -rw-r--r-- | sysdeps/i386/setfpucw.c | 55 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/dl-procinfo.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-procinfo.c | 13 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h | 5 |
15 files changed, 190 insertions, 24 deletions
@@ -1,3 +1,45 @@ +2003-07-22 H.J. Lu <hongjiu.lu@intel.com> + + * elf/dl-support.c (_dl_hwcap): New variable. + (_dl_aux_init): Initialize GL(dl_hwcap) for static binaries. + + * sysdeps/i386/fpu/fclrexcpt.c: Include <unistd.h>, <ldsodefs.h> + and <dl-procinfo.h>. + (__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 <jakub@redhat.com> + + * 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 <hongjiu.lu@intel.com> + + * elf/ldconfig.c (main): Issue a fatal error if relative path + is used to build cache. + +2003-07-22 Ulrich Drepper <drepper@redhat.com> + + * elf/readlib.c (process_file): Avoid possible overflow in assignment. + 2003-07-21 Art Haas <ahaas@airmail.net> * manual/charset.texi (Converting a Character): Fix example code so a 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 <dl-procinfo.c> + /* 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 (); diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index 2a3cf2bd09..570b52261b 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -343,6 +343,7 @@ struct rtld_global /* Get architecture specific definitions. */ #define PROCINFO_DECL +#define PROCINFO_CLASS EXTERN #include <dl-procinfo.c> /* Structure describing the dynamic linker itself. */ diff --git a/sysdeps/i386/fpu/fclrexcpt.c b/sysdeps/i386/fpu/fclrexcpt.c index c3e7c3ed48..f7ccd3acf6 100644 --- a/sysdeps/i386/fpu/fclrexcpt.c +++ b/sysdeps/i386/fpu/fclrexcpt.c @@ -19,6 +19,9 @@ 02111-1307 USA. */ #include <fenv.h> +#include <unistd.h> +#include <ldsodefs.h> +#include <dl-procinfo.h> int __feclearexcept (int excepts) @@ -38,6 +41,21 @@ __feclearexcept (int excepts) /* Put the new data in effect. */ __asm__ ("fldenv %0" : : "m" (*&temp)); + /* If the CPU supports SSE, we clear the MXCSR as well. */ + if ((GL(dl_hwcap) & HWCAP_I386_XMM) != 0) + { + unsigned int xnew_exc; + + /* Get the current MXCSR. */ + __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc)); + + /* Clear the relevant bits. */ + xnew_exc &= excepts ^ FE_ALL_EXCEPT; + + /* Put the new data in effect. */ + __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc)); + } + /* Success. */ return 0; } diff --git a/sysdeps/i386/fpu/fsetexcptflg.c b/sysdeps/i386/fpu/fsetexcptflg.c index 2bfc736054..d262738b68 100644 --- a/sysdeps/i386/fpu/fsetexcptflg.c +++ b/sysdeps/i386/fpu/fsetexcptflg.c @@ -21,6 +21,9 @@ #include <fenv.h> #include <math.h> #include <bp-sym.h> +#include <unistd.h> +#include <ldsodefs.h> +#include <dl-procinfo.h> int __fesetexceptflag (const fexcept_t *flagp, int excepts) @@ -39,6 +42,22 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts) the next floating-point instruction. */ __asm__ ("fldenv %0" : : "m" (*&temp)); + /* If the CPU supports SSE, we set the MXCSR as well. */ + if ((GL(dl_hwcap) & HWCAP_I386_XMM) != 0) + { + unsigned int xnew_exc; + + /* Get the current MXCSR. */ + __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc)); + + /* Set the relevant bits. */ + xnew_exc &= ~(excepts & FE_ALL_EXCEPT); + xnew_exc |= *flagp & excepts & FE_ALL_EXCEPT; + + /* Put the new data in effect. */ + __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc)); + } + /* Success. */ return 0; } diff --git a/sysdeps/i386/fpu_control.h b/sysdeps/i386/fpu_control.h index ed9bf388a8..e2d00467b7 100644 --- a/sysdeps/i386/fpu_control.h +++ b/sysdeps/i386/fpu_control.h @@ -1,5 +1,5 @@ /* FPU control word bits. i387 version. - Copyright (C) 1993,1995,1996,1997,1998,2000,2001 Free Software Foundation, Inc. + Copyright (C) 1993,1995-1998,2000,2001,2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Olaf Flebbe. @@ -88,7 +88,11 @@ /* Type of the control word. */ typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__))); -/* Macros for accessing the hardware control word. */ +/* Macros for accessing the hardware control word. + + Note that the use of these macros is no sufficient anymore with + recent hardware. Some floating point operations are executed in + the SSE/SSE2 engines which have their own control and status register. */ #define _FPU_GETCW(cw) __asm__ ("fnstcw %0" : "=m" (*&cw)) #define _FPU_SETCW(cw) __asm__ ("fldcw %0" : : "m" (*&cw)) diff --git a/sysdeps/i386/setfpucw.c b/sysdeps/i386/setfpucw.c new file mode 100644 index 0000000000..0a6af25ddf --- /dev/null +++ b/sysdeps/i386/setfpucw.c @@ -0,0 +1,55 @@ +/* Set the FPU control word for x86. + Copyright (C) 2003 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include <math.h> +#include <fpu_control.h> +#include <fenv.h> +#include <unistd.h> +#include <ldsodefs.h> +#include <dl-procinfo.h> + +void +__setfpucw (fpu_control_t set) +{ + fpu_control_t cw; + + /* Fetch the current control word. */ + __asm__ ("fnstcw %0" : "=m" (*&cw)); + + /* Preserve the reserved bits, and set the rest as the user + specified (or the default, if the user gave zero). */ + cw &= _FPU_RESERVED; + cw |= set & ~_FPU_RESERVED; + + __asm__ ("fldcw %0" : : "m" (*&cw)); + + /* If the CPU supports SSE, we set the MXCSR as well. */ + if ((GL(dl_hwcap) & HWCAP_I386_XMM) != 0) + { + unsigned int xnew_exc; + + /* Get the current MXCSR. */ + __asm__ ("stmxcsr %0" : "=m" (*&xnew_exc)); + + xnew_exc &= ~((0xc00 << 3) | (FE_ALL_EXCEPT << 7)); + xnew_exc |= ((set & 0xc00) << 3) | ((set & FE_ALL_EXCEPT) << 7); + + __asm__ ("ldmxcsr %0" : : "m" (*&xnew_exc)); + } +} diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c index 9acd07962b..9b87a2003d 100644 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c @@ -1,5 +1,5 @@ /* Data for Linux/ARM version of processor capability information. - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Philip Blundell <philb@gnu.org>, 2001. @@ -40,13 +40,14 @@ needed. */ -#ifdef PROCINFO_DECL -EXTERN +#ifndef PROCINFO_CLASS +#define PROCINFO_CLASS #endif + #if !defined PROCINFO_DECL && defined SHARED ._dl_arm_cap_flags #else -const char _dl_arm_cap_flags[8][10] +PROCINFO_CLASS const char _dl_arm_cap_flags[8][10] #endif #ifndef PROCINFO_DECL = { @@ -60,3 +61,4 @@ const char _dl_arm_cap_flags[8][10] #endif #undef PROCINFO_DECL +#undef PROCINFO_CLASS diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.c b/sysdeps/unix/sysv/linux/i386/dl-procinfo.c index 1631c6504b..3b1f9bb25e 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.c @@ -40,13 +40,14 @@ needed. */ -#ifdef PROCINFO_DECL -EXTERN +#ifndef PROCINFO_CLASS +#define PROCINFO_CLASS #endif + #if !defined PROCINFO_DECL && defined SHARED ._dl_x86_cap_flags #else -const char _dl_x86_cap_flags[32][8] +PROCINFO_CLASS const char _dl_x86_cap_flags[32][8] #endif #ifndef PROCINFO_DECL = { @@ -62,13 +63,10 @@ const char _dl_x86_cap_flags[32][8] , #endif -#ifdef PROCINFO_DECL -EXTERN -#endif #if !defined PROCINFO_DECL && defined SHARED ._dl_x86_platforms #else -const char _dl_x86_platforms[4][5] +PROCINFO_CLASS const char _dl_x86_platforms[4][5] #endif #ifndef PROCINFO_DECL = { @@ -82,3 +80,4 @@ const char _dl_x86_platforms[4][5] #endif #undef PROCINFO_DECL +#undef PROCINFO_CLASS diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c b/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c index 30d0084c0c..e9042d9717 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c @@ -1,5 +1,5 @@ /* Data for Linux/sparc32 version of processor capability information. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -40,13 +40,14 @@ needed. */ -#ifdef PROCINFO_DECL -EXTERN +#ifndef PROCINFO_CLASS +#define PROCINFO_CLASS #endif + #if !defined PROCINFO_DECL && defined SHARED ._dl_sparc32_cap_flags #else -const char _dl_sparc32_cap_flags[6][7] +PROCINFO_CLASS const char _dl_sparc32_cap_flags[6][7] #endif #ifndef PROCINFO_DECL = { @@ -60,3 +61,4 @@ const char _dl_sparc32_cap_flags[6][7] #endif #undef PROCINFO_DECL +#undef PROCINFO_CLASS diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c index 43c96589e5..0a453a6811 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c @@ -1,5 +1,5 @@ /* Data for Linux/sparc64 version of processor capability information. - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Jakub Jelinek <jakub@redhat.com>, 2002. @@ -40,13 +40,14 @@ needed. */ -#ifdef PROCINFO_DECL -EXTERN +#ifndef PROCINFO_CLASS +#define PROCINFO_CLASS #endif + #if !defined PROCINFO_DECL && defined SHARED ._dl_sparc64_cap_flags #else -const char _dl_sparc64_cap_flags[6][7] +PROCINFO_CLASS const char _dl_sparc64_cap_flags[6][7] #endif #ifndef PROCINFO_DECL = { @@ -60,3 +61,4 @@ const char _dl_sparc64_cap_flags[6][7] #endif #undef PROCINFO_DECL +#undef PROCINFO_CLASS diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c new file mode 100644 index 0000000000..ec9c4a7eb7 --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.c> +#else +#include <sysdeps/generic/dl-procinfo.c> +#endif diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h new file mode 100644 index 0000000000..b360b4288a --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h @@ -0,0 +1,5 @@ +#ifdef IS_IN_ldconfig +#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.h> +#else +#include <sysdeps/generic/dl-procinfo.h> +#endif |