summaryrefslogtreecommitdiff
path: root/elf/dl-reloc.c
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2002-02-06 14:14:51 +0000
committerAndreas Jaeger <aj@suse.de>2002-02-06 14:14:51 +0000
commitcff26a3ed5bd059083d209d78882bd50f9c427ed (patch)
treebd661d55f99df605ece201124269192071d622be /elf/dl-reloc.c
parent4d559293f7b4d3f33ff5e0fa0ea7a4351386afed (diff)
Update.
2002-02-06 Andreas Jaeger <aj@suse.de> * include/libc-symbols.h (INTUSE): Renamed from INT. * elf/dl-deps.c: Change users. * sysdeps/generic/dl-sysdep.c: Likewise. * sysdeps/generic/dl-cache.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-version.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-dst.h: Likewise. * elf/dl-init.c: Likewise.
Diffstat (limited to 'elf/dl-reloc.c')
-rw-r--r--elf/dl-reloc.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 1c0c18d089..c9f298a8cf 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -59,9 +59,9 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
lazy = 0;
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_RELOC, 0))
- INT(_dl_debug_printf) ("\nrelocation processing: %s%s\n",
- l->l_name[0] ? l->l_name : _dl_argv[0],
- lazy ? " (lazy)" : "");
+ INTUSE(_dl_debug_printf) ("\nrelocation processing: %s%s\n",
+ l->l_name[0] ? l->l_name : _dl_argv[0],
+ lazy ? " (lazy)" : "");
/* DT_TEXTREL is now in level 2 and might phase out at some time.
But we rewrite the DT_FLAGS entry to a DT_TEXTREL entry to make
@@ -87,7 +87,7 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
{
errstring = N_("cannot make segment writable for relocation");
call_error:
- INT(_dl_signal_error) (errno, l->l_name, NULL, errstring);
+ INTUSE(_dl_signal_error) (errno, l->l_name, NULL, errstring);
}
#if (PF_R | PF_W | PF_X) == 7 && (PROT_READ | PROT_WRITE | PROT_EXEC) == 7
@@ -126,12 +126,12 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
l->l_lookup_cache.type_class = _tc; \
l->l_lookup_cache.sym = (*ref); \
_lr = ((version) != NULL && (version)->hash != 0 \
- ? INT(_dl_lookup_versioned_symbol) (strtab \
- + (*ref)->st_name, \
- l, (ref), scope, \
- (version), _tc, 0) \
- : INT(_dl_lookup_symbol) (strtab + (*ref)->st_name, l, \
- (ref), scope, _tc, 0)); \
+ ? INTUSE(_dl_lookup_versioned_symbol) (strtab \
+ + (*ref)->st_name, \
+ l, (ref), scope, \
+ (version), _tc, 0) \
+ : INTUSE(_dl_lookup_symbol) (strtab + (*ref)->st_name, l, \
+ (ref), scope, _tc, 0)); \
l->l_lookup_cache.ret = (*ref); \
l->l_lookup_cache.value = _lr; })) \
: l)
@@ -147,12 +147,12 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
l->l_lookup_cache.type_class = _tc; \
l->l_lookup_cache.sym = (*ref); \
_lr = ((version) != NULL && (version)->hash != 0 \
- ? INT(_dl_lookup_versioned_symbol) (strtab \
- + (*ref)->st_name, \
- l, (ref), scope, \
- (version), _tc, 0) \
- : INT(_dl_lookup_symbol) (strtab + (*ref)->st_name, l, \
- (ref), scope, _tc, 0)); \
+ ? INTUSE(_dl_lookup_versioned_symbol) (strtab \
+ + (*ref)->st_name, \
+ l, (ref), scope, \
+ (version), _tc, 0) \
+ : INTUSE(_dl_lookup_symbol) (strtab + (*ref)->st_name, l, \
+ (ref), scope, _tc, 0)); \
l->l_lookup_cache.ret = (*ref); \
l->l_lookup_cache.value = _lr; })) \
: l->l_addr)
@@ -223,5 +223,5 @@ _dl_reloc_bad_type (struct link_map *map, unsigned int type, int plt)
*cp++ = DIGIT (type >> 4);
*cp = DIGIT (type);
- INT(_dl_signal_error) (0, map->l_name, NULL, msgbuf);
+ INTUSE(_dl_signal_error) (0, map->l_name, NULL, msgbuf);
}