diff options
| author | Ulrich Drepper <[email protected]> | 2006-07-12 19:42:23 +0000 |
|---|---|---|
| committer | Ulrich Drepper <[email protected]> | 2006-07-12 19:42:23 +0000 |
| commit | cc41562f94052f307da4429f33cc18c7d510b2f5 (patch) | |
| tree | 6c1948f87cc79d53adc78a4ab9ccae1d369dd56c /src | |
| parent | 7f7f1bc0e20aa95f780b55272c19d514ee3dd1c7 (diff) | |
propagate from branch 'com.redhat.elfutils.roland.pending' (head e5cfdd13aa39dfae16b905fd57ff56ad8a131bb5)
to branch 'com.redhat.elfutils' (head 60222fc1981540f15e674b6705fd7a6f628f95a4)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 17 | ||||
| -rw-r--r-- | src/addr2line.c | 4 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 3432dce6..38d9341f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,11 @@ -2006-07-11 Ulrich Drepper <[email protected]> +2006-07-11 Roland McGrath <[email protected]> - * readelf.c (handle_gnu_hash): Adjust for final form of .gnu.hash. - * elflint.c (check_gnu_hash): Likewise. + * addr2line.c (options): English fix in -f doc string. + + * addr2line.c (use_comp_dir): New variable. + (options, parse_opt): Grok -A/--absolute to set it. + (handle_address): If set, prepend dwfl_line_comp_dir results to + relative file names. 2006-07-06 Ulrich Drepper <[email protected]> @@ -45,13 +49,6 @@ * Makefile.am: Add hacks to create dependency files for non-generic linker. -2006-06-28 Roland McGrath <[email protected]> - - * addr2line.c (use_comp_dir): New variable. - (options, parse_opt): Grok -A/--absolute to set it. - (handle_address): If set, prepend dwfl_line_comp_dir results to - relative file names. - 2006-06-12 Ulrich Drepper <[email protected]> * ldgeneric.c (ld_generic_generate_sections): Don't create .interp diff --git a/src/addr2line.c b/src/addr2line.c index c849ec79..e2ea4b4d 100644 --- a/src/addr2line.c +++ b/src/addr2line.c @@ -64,8 +64,8 @@ static const struct argp_option options[] = { NULL, 0, NULL, 0, N_("Output Selection:"), 0 }, { "basenames", 's', NULL, 0, N_("Show only base names of source files"), 0 }, { "absolute", 'A', NULL, 0, - N_("Show absolute file names using compilation directory"), 0 }, - { "functions", 'f', NULL, 0, N_("Additional show function names"), 0 }, + N_("Show absolute directory names of source files"), 0 }, + { "functions", 'f', NULL, 0, N_("Also show function names"), 0 }, { NULL, 0, NULL, 0, N_("Miscellaneous:"), 0 }, /* Unsupported options. */ |