summaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-07 08:39:57 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-07 08:39:57 +0000
commitc31e278f8636fbe11ad933d9089e98361665a978 (patch)
tree5101942451f1417f14d3f4b0702ee101464a50c4 /sysdeps/i386
parent021723ab784461de9eac57398ea16a47d4ab9366 (diff)
downloadglibc-c31e278f8636fbe11ad933d9089e98361665a978.tar.gz
Update.
2004-03-07 Ulrich Drepper <drepper@redhat.com> * sysdeps/generic/ldsodefs.h: Move _dl_initial_searclist, _dl_hp_timing_overhead, _dl_init_all_dirs, and the content of dl-procinfo.c from _rtld_global to _rtld_global_ro. * elf/rtld.c: Adjust initializer for _rtld_global_ro. * elf/dl-close.c: Use GLRO instead of GL where appropriate. * elf/dl-libc.c: Likewise. * elf/dl-load.c: Likewise. * sysdeps/i386/dl-procinfo.h: Likewise. * sysdeps/i386/i686/hp-timing.h: Likewise. * sysdeps/ia64/hp-timing.h: Likewise. * sysdeps/sparc/sparc32/sparcv9/hp-timing.h: Likewise. * sysdeps/sparc/sparc64/hp-timing.h: Likewise. * sysdeps/unix/sysv/linux/arm/dl-procinfo.h: Likewise. * sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h: Likewise.
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/dl-procinfo.h10
-rw-r--r--sysdeps/i386/i686/hp-timing.h12
2 files changed, 11 insertions, 11 deletions
diff --git a/sysdeps/i386/dl-procinfo.h b/sysdeps/i386/dl-procinfo.h
index 51f783a95a..e6b7faf812 100644
--- a/sysdeps/i386/dl-procinfo.h
+++ b/sysdeps/i386/dl-procinfo.h
@@ -1,5 +1,5 @@
/* i386 version of processor capability information handling macros.
- Copyright (C) 1998, 2000, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2000, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -68,14 +68,14 @@ static inline const char *
__attribute__ ((unused))
_dl_hwcap_string (int idx)
{
- return GL(dl_x86_cap_flags)[idx];
+ return GLRO(dl_x86_cap_flags)[idx];
};
static inline const char *
__attribute__ ((unused))
_dl_platform_string (int idx)
{
- return GL(dl_x86_platforms)[idx - _DL_FIRST_PLATFORM];
+ return GLRO(dl_x86_platforms)[idx - _DL_FIRST_PLATFORM];
};
static inline int
@@ -86,7 +86,7 @@ _dl_string_hwcap (const char *str)
for (i = 0; i < _DL_HWCAP_COUNT; i++)
{
- if (strcmp (str, GL(dl_x86_cap_flags)[i]) == 0)
+ if (strcmp (str, GLRO(dl_x86_cap_flags)[i]) == 0)
return i;
}
return -1;
@@ -101,7 +101,7 @@ _dl_string_platform (const char *str)
if (str != NULL)
for (i = 0; i < _DL_PLATFORMS_COUNT; ++i)
{
- if (strcmp (str, GL(dl_x86_platforms)[i]) == 0)
+ if (strcmp (str, GLRO(dl_x86_platforms)[i]) == 0)
return _DL_FIRST_PLATFORM + i;
}
return -1;
diff --git a/sysdeps/i386/i686/hp-timing.h b/sysdeps/i386/i686/hp-timing.h
index 41000edb08..a5906835f7 100644
--- a/sysdeps/i386/i686/hp-timing.h
+++ b/sysdeps/i386/i686/hp-timing.h
@@ -1,5 +1,5 @@
/* High precision, low overhead timing functions. i686 version.
- Copyright (C) 1998, 2002, 2003 Free Software Foundation, Inc.
+ Copyright (C) 1998, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
@@ -97,17 +97,17 @@ typedef unsigned long long int hp_timing_t;
/* Use two 'rdtsc' instructions in a row to find out how long it takes. */
#define HP_TIMING_DIFF_INIT() \
do { \
- if (GL(dl_hp_timing_overhead) == 0) \
+ if (GLRO(dl_hp_timing_overhead) == 0) \
{ \
int __cnt = 5; \
- GL(dl_hp_timing_overhead) = ~0ull; \
+ GLRO(dl_hp_timing_overhead) = ~0ull; \
do \
{ \
hp_timing_t __t1, __t2; \
HP_TIMING_NOW (__t1); \
HP_TIMING_NOW (__t2); \
- if (__t2 - __t1 < GL(dl_hp_timing_overhead)) \
- GL(dl_hp_timing_overhead) = __t2 - __t1; \
+ if (__t2 - __t1 < GLRO(dl_hp_timing_overhead)) \
+ GLRO(dl_hp_timing_overhead) = __t2 - __t1; \
} \
while (--__cnt > 0); \
} \
@@ -121,7 +121,7 @@ typedef unsigned long long int hp_timing_t;
do { \
char __not_done; \
hp_timing_t __oldval = (Sum); \
- hp_timing_t __diff = (Diff) - GL(dl_hp_timing_overhead); \
+ hp_timing_t __diff = (Diff) - GLRO(dl_hp_timing_overhead); \
do \
{ \
hp_timing_t __newval = __oldval + __diff; \