diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-addr.c | 3 | ||||
| -rw-r--r-- | elf/dl-deps.c | 4 | ||||
| -rw-r--r-- | elf/dl-error.c | 6 | ||||
| -rw-r--r-- | elf/dl-open.c | 2 | ||||
| -rw-r--r-- | elf/testobj2.c | 1 | ||||
| -rw-r--r-- | elf/unload3mod4.c | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/elf/dl-addr.c b/elf/dl-addr.c index c56736c..6bd7f7b 100644 --- a/elf/dl-addr.c +++ b/elf/dl-addr.c @@ -68,7 +68,8 @@ _dl_addr (const void *address, Dl_info *info, && match->l_type == lt_executable) info->dli_fname = _dl_argv[0]; - const ElfW(Sym) *symtab = D_PTR (match, l_info[DT_SYMTAB]); + const ElfW(Sym) *symtab + = (const ElfW(Sym) *) D_PTR (match, l_info[DT_SYMTAB]); const char *strtab = (const char *) D_PTR (match, l_info[DT_STRTAB]); ElfW(Word) strtabsize = match->l_info[DT_STRSZ]->d_un.d_val; diff --git a/elf/dl-deps.c b/elf/dl-deps.c index a1c16d7..a959930 100644 --- a/elf/dl-deps.c +++ b/elf/dl-deps.c @@ -1,5 +1,5 @@ /* Load the dependencies of a mapped object. - Copyright (C) 1996-2003, 2004 Free Software Foundation, Inc. + Copyright (C) 1996-2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -307,7 +307,7 @@ _dl_map_object_deps (struct link_map *map, { /* We are not interested in the error message. */ assert (errstring != NULL); - if (errstring != INTUSE(_dl_out_of_memory)) + if (errstring != _dl_out_of_memory) free ((char *) errstring); /* Simply ignore this error and continue the work. */ diff --git a/elf/dl-error.c b/elf/dl-error.c index 0ef76c8..993b7c2 100644 --- a/elf/dl-error.c +++ b/elf/dl-error.c @@ -1,5 +1,5 @@ /* Error handling for runtime dynamic linker. - Copyright (C) 1995-2002,2004 Free Software Foundation, Inc. + Copyright (C) 1995-2002,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -45,7 +45,7 @@ struct catch variable since we have to avoid freeing it and so have to enable a pointer comparison. See below and in dlfcn/dlerror.c. */ const char _dl_out_of_memory[] = "out of memory"; -INTVARDEF(_dl_out_of_memory) +rtld_hidden_data_def (_dl_out_of_memory) /* This points to a function which is called when an continuable error is @@ -95,7 +95,7 @@ _dl_signal_error (int errcode, const char *objname, const char *occation, { /* This is better than nothing. */ lcatch->objname = ""; - lcatch->errstring = INTUSE(_dl_out_of_memory); + lcatch->errstring = _dl_out_of_memory; } longjmp (lcatch->env, errcode ?: -1); } diff --git a/elf/dl-open.c b/elf/dl-open.c index 4de2072..f1fcfbc 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -618,7 +618,7 @@ no more namespaces available for dlmopen()")); memcpy (local_errstring, errstring, len_errstring); } - if (errstring != INTUSE(_dl_out_of_memory)) + if (errstring != _dl_out_of_memory) free ((char *) errstring); assert (_dl_debug_initialize (0, args.nsid)->r_state == RT_CONSISTENT); diff --git a/elf/testobj2.c b/elf/testobj2.c index f00ba9f..7e4b610 100644 --- a/elf/testobj2.c +++ b/elf/testobj2.c @@ -1,5 +1,6 @@ #include <dlfcn.h> #include <stdlib.h> +#include <stdio.h> #include "testobj.h" diff --git a/elf/unload3mod4.c b/elf/unload3mod4.c index 4586ff7..52f808e 100644 --- a/elf/unload3mod4.c +++ b/elf/unload3mod4.c @@ -1,5 +1,7 @@ #include <stdio.h> +extern int foo (int x); + int bar (int x) { |