diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/i386')
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/Makefile | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-procinfo.c | 72 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 16 |
3 files changed, 65 insertions, 29 deletions
diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile index 4fc9434074..e4b9dc293d 100644 --- a/sysdeps/unix/sysv/linux/i386/Makefile +++ b/sysdeps/unix/sysv/linux/i386/Makefile @@ -7,12 +7,6 @@ ifeq ($(subdir),elf) sysdep-others += lddlibc4 install-bin += lddlibc4 -# extra shared linker files to link into dl-allobjs.so and libc -sysdep-dl-routines += dl-procinfo -sysdep_routines += dl-procinfo -# extra shared linker files to link only into dl-allobjs.so -sysdep-rtld-routines += dl-procinfo - ifeq (yes,$(build-shared)) # This is needed to support g++ v2 and v3. sysdep_routines += framestate diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.c b/sysdeps/unix/sysv/linux/i386/dl-procinfo.c index 75732b4e48..2f2f736761 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.c @@ -1,7 +1,7 @@ /* Data for Linux/i386 version of processor capability information. - Copyright (C) 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2001. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -19,20 +19,66 @@ 02111-1307 USA. */ /* This information must be kept in sync with the _DL_HWCAP_COUNT and - _DL_PLATFORM_COUNT definitions in procinfo.h. */ + _DL_PLATFORM_COUNT definitions in procinfo.h. + If anything should be added here check whether the size of each string + is still ok with the given array size. -/* If anything should be added here check whether the size of each string - is still ok with the given array size. */ -const char _dl_x86_cap_flags[][7] = - { + All the #ifdefs in the definitions ar equite irritating but + necessary if we want to avoid duplicating the information. There + are three different modes: + + - PROCINFO_DECL is defined. This means we are only interested in + declarations. + + - PROCINFO_DECL is not defined: + + + if SHARED is defined the file is included in an array + initializer. The .element = { ... } syntax is needed. + + + if SHARED is not defined a normal array initialization is + needed. + */ + +#ifdef PROCINFO_DECL +EXTERN +#endif +#if !defined PROCINFO_DECL && defined SHARED + ._dl_x86_cap_flags +#else +const char _dl_x86_cap_flags[32][8] +#endif +#ifndef PROCINFO_DECL += { "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", "cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov", - "pat", "pse36", "psn", "19", "20", "21", "22", "mmx", - "osfxsr", "xmm", "xmm2", "27", "28", "29", "30", "amd3d" - }; + "pat", "pse36", "pn", "clflush", "20", "dts", "acpi", "mmx", + "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "amd3d" + } +#endif +#if !defined SHARED || defined PROCINFO_DECL +; +#else +, +#endif -const char _dl_x86_platforms[][5] = - { +#ifdef PROCINFO_DECL +EXTERN +#endif +#if !defined PROCINFO_DECL && defined SHARED + ._dl_x86_platforms +#else +const char _dl_x86_platforms[4][5] +#endif +#ifndef PROCINFO_DECL += { "i386", "i486", "i586", "i686" - }; + } +#endif +#if !defined SHARED || defined PROCINFO_DECL +; +#else +, +#endif + +#undef PROCINFO_DECL diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h index d1658fafde..d2c547f467 100644 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h @@ -1,5 +1,5 @@ /* Linux/i386 version of processor capability information handling macros. - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -23,12 +23,8 @@ #include <ldsodefs.h> -/* If anything should be added here check whether the size of each string - is still ok with the given array size. */ -extern const char _dl_x86_cap_flags[][7]; #define _DL_HWCAP_COUNT 32 -extern const char _dl_x86_platforms[][5]; #define _DL_PLATFORMS_COUNT 4 /* Start at 48 to reserve some space. */ @@ -49,7 +45,7 @@ _dl_procinfo (int word) for (i = 0; i < _DL_HWCAP_COUNT; ++i) if (word & (1 << i)) - _dl_printf (" %s", _dl_x86_cap_flags[i]); + _dl_printf (" %s", GL(dl_x86_cap_flags)[i]); _dl_printf ("\n"); @@ -60,14 +56,14 @@ static inline const char * __attribute__ ((unused)) _dl_hwcap_string (int idx) { - return _dl_x86_cap_flags[idx]; + return GL(dl_x86_cap_flags)[idx]; }; static inline const char * __attribute__ ((unused)) _dl_platform_string (int idx) { - return _dl_x86_platforms [idx - _DL_FIRST_PLATFORM]; + return GL(dl_x86_platforms)[idx - _DL_FIRST_PLATFORM]; }; enum @@ -107,7 +103,7 @@ _dl_string_hwcap (const char *str) for (i = 0; i < _DL_HWCAP_COUNT; i++) { - if (strcmp (str, _dl_x86_cap_flags[i]) == 0) + if (strcmp (str, GL(dl_x86_cap_flags)[i]) == 0) return i; } return -1; @@ -123,7 +119,7 @@ _dl_string_platform (const char *str) if (str != NULL) for (i = 0; i < _DL_PLATFORMS_COUNT; ++i) { - if (strcmp (str, _dl_x86_platforms[i]) == 0) + if (strcmp (str, GL(dl_x86_platforms)[i]) == 0) return _DL_FIRST_PLATFORM + i; } return -1; |