aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-reloc.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-11-07 06:32:27 +0000
committerUlrich Drepper <drepper@redhat.com>2001-11-07 06:32:27 +0000
commit7982ecfe469a67ce5b249da9d6b24a8d6103fc6f (patch)
tree51d1f20c44a778f1b029c758fb8dd805f0865182 /elf/dl-reloc.c
parent39b3385dde64babd316ffd97dd79f9236e487ccb (diff)
downloadglibc-7982ecfe469a67ce5b249da9d6b24a8d6103fc6f.tar
glibc-7982ecfe469a67ce5b249da9d6b24a8d6103fc6f.tar.gz
glibc-7982ecfe469a67ce5b249da9d6b24a8d6103fc6f.tar.bz2
glibc-7982ecfe469a67ce5b249da9d6b24a8d6103fc6f.zip
Update.
* elf/dl-profile.c: Replace state variable with simple flag named running. Remove commented-out code. * elf/dl-reloc.c (_dl_relocate_object): Likewise.
Diffstat (limited to 'elf/dl-reloc.c')
-rw-r--r--elf/dl-reloc.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 4ee0da0e9e..efdccea151 100644
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -122,23 +122,30 @@ cannot make segment writable for relocation"));
if (__builtin_expect (consider_profiling, 0))
{
+ const char *errstring = NULL;
+
/* Allocate the array which will contain the already found
relocations. If the shared object lacks a PLT (for example
if it only contains lead function) the l_info[DT_PLTRELSZ]
will be NULL. */
if (l->l_info[DT_PLTRELSZ] == NULL)
- _dl_fatal_printf ("%s: profiler found no PLTREL in object %s\n",
- _dl_argv[0] ?: "<program name unknown>",
- l->l_name);
+ {
+ errstring = N_("%s: profiler found no PLTREL in object %s\n");
+ fatal:
+ _dl_fatal_printf (errstring,
+ _dl_argv[0] ?: "<program name unknown>",
+ l->l_name);
+ }
l->l_reloc_result =
(ElfW(Addr) *) calloc (sizeof (ElfW(Addr)),
l->l_info[DT_PLTRELSZ]->d_un.d_val);
if (l->l_reloc_result == NULL)
- _dl_fatal_printf ("\
-%s: profiler out of memory shadowing PLTREL of %s\n",
- _dl_argv[0] ?: "<program name unknown>",
- l->l_name);
+ {
+ errstring = N_("\
+%s: profiler out of memory shadowing PLTREL of %s\n");
+ goto fatal;
+ }
}
}