qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use GLRO instead of GL where appropriate.

This commit is contained in:
Ulrich Drepper 2004-03-05 10:22:54 +00:00
parent f519f54950
commit cebbd6e78d
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sysdeps/alpha/dl-machine.h
View File

@ -114,7 +114,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
{ {
*(Elf64_Addr *)(plt + 16) = (Elf64_Addr) &_dl_runtime_profile; *(Elf64_Addr *)(plt + 16) = (Elf64_Addr) &_dl_runtime_profile;
if (_dl_name_match_p (GL(dl_profile), l)) if (_dl_name_match_p (GLRO(dl_profile), l))
{ {
/* This is the object we are looking for. Say that we really /* This is the object we are looking for. Say that we really
want profiling and the timers are started. */ want profiling and the timers are started. */
@ -648,7 +648,7 @@ static inline void
elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc, elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
void *const reloc_addr_arg) void *const reloc_addr_arg)
{ {
/* XXX Make some timings. Maybe it's preferable to test for /* XXX Make some timings. Maybe it's preferable to test for
unaligned access and only do it the complex way if necessary. */ unaligned access and only do it the complex way if necessary. */
Elf64_Addr reloc_addr_val; Elf64_Addr reloc_addr_val;

12
sysdeps/arm/dl-machine.h
View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. ARM version. /* Machine-dependent ELF dynamic relocation inline functions. ARM version.
Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
Free Software Foundation, Inc. Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
@ -110,7 +110,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
{ {
got[2] = (Elf32_Addr) &_dl_runtime_profile; got[2] = (Elf32_Addr) &_dl_runtime_profile;
if (_dl_name_match_p (GL(dl_profile), l)) if (_dl_name_match_p (GLRO(dl_profile), l))
/* Say that we really want profiling and the timers are /* Say that we really want profiling and the timers are
started. */ started. */
GL(dl_profile_map) = l; GL(dl_profile_map) = l;
@ -334,9 +334,9 @@ _dl_start_user:\n\
static inline void __attribute__ ((unused)) static inline void __attribute__ ((unused))
dl_platform_init (void) dl_platform_init (void)
{ {
if (GL(dl_platform) != NULL && *GL(dl_platform) == '\0') if (GLRO(dl_platform) != NULL && *GLRO(dl_platform) == '\0')
/* Avoid an empty string which would disturb us. */ /* Avoid an empty string which would disturb us. */
GL(dl_platform) = NULL; GLRO(dl_platform) = NULL;
} }
static inline Elf32_Addr static inline Elf32_Addr
@ -444,7 +444,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
found. */ found. */
break; break;
if (sym->st_size > refsym->st_size if (sym->st_size > refsym->st_size
|| (GL(dl_verbose) && sym->st_size < refsym->st_size)) || (GLRO(dl_verbose) && sym->st_size < refsym->st_size))
{ {
const char *strtab; const char *strtab;
@ -556,7 +556,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
found. */ found. */
break; break;
if (sym->st_size > refsym->st_size if (sym->st_size > refsym->st_size
|| (GL(dl_verbose) && sym->st_size < refsym->st_size)) || (GLRO(dl_verbose) && sym->st_size < refsym->st_size))
{ {
const char *strtab; const char *strtab;

6
sysdeps/m68k/dl-machine.h
View File

@ -1,5 +1,5 @@
/* Machine-dependent ELF dynamic relocation inline functions. m68k version. /* Machine-dependent ELF dynamic relocation inline functions. m68k version.
Copyright (C) 1996-2001, 2002, 2003 Free Software Foundation, Inc. Copyright (C) 1996-2001, 2002, 2003, 2004 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -85,7 +85,7 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
{ {
got[2] = (Elf32_Addr) &_dl_runtime_profile; got[2] = (Elf32_Addr) &_dl_runtime_profile;
if (_dl_name_match_p (GL(dl_profile), l)) if (_dl_name_match_p (GLRO(dl_profile), l))
{ {
/* This is the object we are looking for. Say that we really /* This is the object we are looking for. Say that we really
want profiling and the timers are started. */ want profiling and the timers are started. */
@ -248,7 +248,7 @@ elf_machine_rela (struct link_map *map, const Elf32_Rela *reloc,
found. */ found. */
break; break;
if (sym->st_size > refsym->st_size if (sym->st_size > refsym->st_size
|| (sym->st_size < refsym->st_size && GL(dl_verbose))) || (sym->st_size < refsym->st_size && GLRO(dl_verbose)))
{ {
const char *strtab; const char *strtab;