diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/ChangeLog | 21 | ||||
-rw-r--r-- | src/Makefile.am | 6 | ||||
-rw-r--r-- | src/addr2line.c | 15 | ||||
-rw-r--r-- | src/ar.c | 15 | ||||
-rw-r--r-- | src/elfcmp.c | 15 | ||||
-rw-r--r-- | src/elfcompress.c | 7 | ||||
-rw-r--r-- | src/elflint.c | 15 | ||||
-rw-r--r-- | src/findtextrel.c | 15 | ||||
-rw-r--r-- | src/nm.c | 15 | ||||
-rw-r--r-- | src/objdump.c | 15 | ||||
-rw-r--r-- | src/ranlib.c | 15 | ||||
-rw-r--r-- | src/readelf.c | 15 | ||||
-rw-r--r-- | src/size.c | 15 | ||||
-rw-r--r-- | src/stack.c | 7 | ||||
-rw-r--r-- | src/strings.c | 15 | ||||
-rw-r--r-- | src/strip.c | 15 | ||||
-rw-r--r-- | src/unstrip.c | 14 |
17 files changed, 24 insertions, 211 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fe95ecb1..2a6d93ef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,24 @@ +2016-12-24 Mark Wielaard <mark@klomp.org> + + * Makefile.am (findtextrel_LDADD): Add $(libeu). + (addr2line_LDADD): Likewise. + (elfcmp_LDADD): Likewise. + * addr2line.c (print_version): Removed. + * ar.c (print_version): Likewise. + * elfcmp.c (print_version): Likewise. + * elfcompress.c (print_version): Likewise. + * elflint.c (print_version): Likewise. + * findtextrel.c (print_version): Likewise. + * nm.c (print_version): Likewise. + * objdump.c: Likewise. + * ranlib.c: Likewise. + * readelf.c: Likewise. + * size.c: Likewise. + * stack.c: Likewise. + * strings.c: Likewise. + * strip.c: Likewise. + * unstrip.c: Likewise. + 2016-11-17 Mark Wielaard <mjw@redhat.com> * readelf.c (options): Add optional arg SECTION for symbols. diff --git a/src/Makefile.am b/src/Makefile.am index 9bb47651..2b1c0dcb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,9 +73,9 @@ nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl \ size_LDADD = $(libelf) $(libeu) $(argp_LDADD) strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(argp_LDADD) -ldl elflint_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl -findtextrel_LDADD = $(libdw) $(libelf) $(argp_LDADD) -addr2line_LDADD = $(libdw) $(libelf) $(argp_LDADD) $(demanglelib) -elfcmp_LDADD = $(libebl) $(libelf) $(argp_LDADD) -ldl +findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) +addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(argp_LDADD) $(demanglelib) +elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(argp_LDADD) -ldl ranlib_LDADD = libar.a $(libelf) $(libeu) $(argp_LDADD) strings_LDADD = $(libelf) $(libeu) $(argp_LDADD) diff --git a/src/addr2line.c b/src/addr2line.c index bea24aea..02220885 100644 --- a/src/addr2line.c +++ b/src/addr2line.c @@ -41,7 +41,6 @@ /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -208,20 +207,6 @@ main (int argc, char *argv[]) } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "addr2line (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg, struct argp_state *state) @@ -46,7 +46,6 @@ /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Prototypes for local functions. */ @@ -277,20 +276,6 @@ MEMBER parameter required for 'a', 'b', and 'i' modifiers")); } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "ar (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg __attribute__ ((unused)), diff --git a/src/elfcmp.c b/src/elfcmp.c index 7b5d39ce..401ab315 100644 --- a/src/elfcmp.c +++ b/src/elfcmp.c @@ -45,7 +45,6 @@ static int regioncompare (const void *p1, const void *p2); /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -664,20 +663,6 @@ cannot read note section [%zu] '%s' in '%s': %s"), } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "elfcmp (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg, diff --git a/src/elfcompress.c b/src/elfcompress.c index 82ab9655..9f6db1cc 100644 --- a/src/elfcompress.c +++ b/src/elfcompress.c @@ -38,7 +38,6 @@ #include "system.h" /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -55,12 +54,6 @@ static const char *foutput = NULL; #define T_COMPRESS_GNU 3 /* zlib-gnu */ static int type = T_UNSET; -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "elfcompress (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); -} - struct section_pattern { char *pattern; diff --git a/src/elflint.c b/src/elflint.c index b304a309..7d3f2271 100644 --- a/src/elflint.c +++ b/src/elflint.c @@ -48,7 +48,6 @@ /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -228,20 +227,6 @@ parse_opt (int key, char *arg __attribute__ ((unused)), } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "elflint (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Process one file. */ static void process_file (int fd, Elf *elf, const char *prefix, const char *suffix, diff --git a/src/findtextrel.c b/src/findtextrel.c index e78d7b8a..dc41502b 100644 --- a/src/findtextrel.c +++ b/src/findtextrel.c @@ -47,7 +47,6 @@ struct segments /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -154,20 +153,6 @@ main (int argc, char *argv[]) } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "findtextrel (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg, @@ -49,7 +49,6 @@ /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -254,20 +253,6 @@ main (int argc, char *argv[]) } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "nm (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg, diff --git a/src/objdump.c b/src/objdump.c index f84513ca..fff4b818 100644 --- a/src/objdump.c +++ b/src/objdump.c @@ -39,7 +39,6 @@ /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -169,20 +168,6 @@ main (int argc, char *argv[]) } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "objdump (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg, diff --git a/src/ranlib.c b/src/ranlib.c index 455de0d6..41a3bcf2 100644 --- a/src/ranlib.c +++ b/src/ranlib.c @@ -47,7 +47,6 @@ static int handle_file (const char *fname); /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -115,20 +114,6 @@ main (int argc, char *argv[]) } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "ranlib (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - static int copy_content (Elf *elf, int newfd, off_t off, size_t n) { diff --git a/src/readelf.c b/src/readelf.c index a47b056a..d3a90088 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -57,7 +57,6 @@ /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -506,20 +505,6 @@ parse_opt (int key, char *arg, } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "readelf (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Create a file descriptor to read the data from the elf_input_section given a file descriptor to an ELF file. */ static int @@ -39,7 +39,6 @@ /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -198,20 +197,6 @@ main (int argc, char *argv[]) } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "size (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg, diff --git a/src/stack.c b/src/stack.c index c277dfd0..a5a7bebc 100644 --- a/src/stack.c +++ b/src/stack.c @@ -32,7 +32,6 @@ #include <system.h> /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -470,12 +469,6 @@ thread_callback (Dwfl_Thread *thread, void *thread_arg) return DWARF_CB_OK; } -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "stack (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); -} - static error_t parse_opt (int key, char *arg __attribute__ ((unused)), struct argp_state *state) diff --git a/src/strings.c b/src/strings.c index a4ffcbee..49aab8b0 100644 --- a/src/strings.c +++ b/src/strings.c @@ -54,7 +54,6 @@ static int read_elf (Elf *elf, int fd, const char *fname, off_t fdlen); /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -222,20 +221,6 @@ main (int argc, char *argv[]) } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "strings (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg, diff --git a/src/strip.c b/src/strip.c index 64ef84d3..a791ca57 100644 --- a/src/strip.c +++ b/src/strip.c @@ -48,7 +48,6 @@ typedef uint8_t GElf_Byte; /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -211,20 +210,6 @@ Only one input file allowed together with '-o' and '-f'")); } -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "strip (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, gettext ("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Ulrich Drepper"); -} - - /* Handle program arguments. */ static error_t parse_opt (int key, char *arg, struct argp_state *state) diff --git a/src/unstrip.c b/src/unstrip.c index cc3dcb26..d838ae9f 100644 --- a/src/unstrip.c +++ b/src/unstrip.c @@ -57,7 +57,6 @@ #endif /* Name and version of program. */ -static void print_version (FILE *stream, struct argp_state *state); ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; /* Bug report address. */ @@ -225,19 +224,6 @@ parse_opt (int key, char *arg, struct argp_state *state) } return 0; } - -/* Print the version information. */ -static void -print_version (FILE *stream, struct argp_state *state __attribute__ ((unused))) -{ - fprintf (stream, "unstrip (%s) %s\n", PACKAGE_NAME, PACKAGE_VERSION); - fprintf (stream, _("\ -Copyright (C) %s Red Hat, Inc.\n\ -This is free software; see the source for copying conditions. There is NO\n\ -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\ -"), "2012"); - fprintf (stream, gettext ("Written by %s.\n"), "Roland McGrath"); -} #define ELF_CHECK(call, msg) \ do \ |