public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM] archer-jankratochvil-absdir: Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
@ 2013-02-01 20:54 jkratoch
0 siblings, 0 replies; 4+ messages in thread
From: jkratoch @ 2013-02-01 20:54 UTC (permalink / raw)
To: archer-commits
The branch, archer-jankratochvil-absdir has been updated
via 37446680fb3c1bc8927e124024eac061479654c2 (commit)
via 8ed7547d2fe2e0e7729e5ee5962d148eea14ed37 (commit)
via 6f1ebd1f200627db807ab497d5b18f90d44dbd99 (commit)
via 64aae5b933cc431d652f787c593ad679c23dde45 (commit)
via 1e4f2108ee1f0adb24d93888ec2b8f953f6170b9 (commit)
via c93b5502530b50e5bd745874e6777b9abeb1a80b (commit)
via 3aaa93045cd6a9bd18be64a65f9e1f1822a0c5a5 (commit)
via eadd34d91157ac955d33c3a22463458dcd4a0d0d (commit)
via b98804af1057d27ea38429ec0b2440b2594d2c4e (commit)
from 2b9902d6567ecebbe196598b67ca65149c116a2b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 37446680fb3c1bc8927e124024eac061479654c2
Merge: 2b9902d 8ed7547
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:54:38 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
commit 8ed7547d2fe2e0e7729e5ee5962d148eea14ed37
Merge: 3e2bd39 6f1ebd1
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:29 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix
commit 6f1ebd1f200627db807ab497d5b18f90d44dbd99
Merge: 3c7b612 64aae5b
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:29 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel
commit 64aae5b933cc431d652f787c593ad679c23dde45
Merge: f33462c 1e4f210
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:28 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal
commit 1e4f2108ee1f0adb24d93888ec2b8f953f6170b9
Merge: 55a6b03 c93b550
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:28 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab
commit c93b5502530b50e5bd745874e6777b9abeb1a80b
Merge: 68f63ad 3aaa930
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:53:10 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui
Conflicts:
gdb/source.c
commit 3aaa93045cd6a9bd18be64a65f9e1f1822a0c5a5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:51:22 2013 +0100
.
commit eadd34d91157ac955d33c3a22463458dcd4a0d0d
Merge: 1f30d9b b98804a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:38:53 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2
commit b98804af1057d27ea38429ec0b2440b2594d2c4e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:38:41 2013 +0100
.
-----------------------------------------------------------------------
Summary of changes:
gdb/ada-lang.c | 7 ++++---
gdb/breakpoint.c | 12 +++++++-----
gdb/cli/cli-cmds.c | 12 +++++++-----
gdb/dwarf2read.c | 2 +-
gdb/linux-fork.c | 3 ++-
gdb/macroscope.c | 2 +-
gdb/mdebugread.c | 3 ++-
gdb/mi/mi-cmd-file.c | 5 +++--
gdb/printcmd.c | 2 +-
gdb/python/py-symtab.c | 6 +++---
gdb/skip.c | 3 ++-
gdb/source.c | 38 ++++++++++++++++++++++----------------
gdb/source.h | 2 +-
gdb/stack.c | 8 +++++---
gdb/symmisc.c | 10 +++++-----
gdb/symtab.c | 10 +++++-----
gdb/tracepoint.c | 10 ++++++----
gdb/tui/tui-source.c | 10 ++++++----
18 files changed, 83 insertions(+), 62 deletions(-)
First 500 lines of diff:
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index cc29635..f896aa9 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -3573,7 +3573,8 @@ See set/show multiple-symbol."));
else
printf_unfiltered (_("[%d] %s at %s:%d\n"), i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab),
+ sal.line);
continue;
}
else
@@ -3588,7 +3589,7 @@ See set/show multiple-symbol."));
printf_unfiltered (_("[%d] %s at %s:%d\n"),
i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym),
- symtab_to_filename (symtab),
+ symtab_to_filename_for_display (symtab),
SYMBOL_LINE (syms[i].sym));
else if (is_enumeral
&& TYPE_NAME (SYMBOL_TYPE (syms[i].sym)) != NULL)
@@ -3605,7 +3606,7 @@ See set/show multiple-symbol."));
: _("[%d] %s at %s:?\n"),
i + first_choice,
SYMBOL_PRINT_NAME (syms[i].sym),
- symtab_to_filename (symtab));
+ symtab_to_filename_for_display (symtab));
else
printf_unfiltered (is_enumeral
? _("[%d] %s (enumeral)\n")
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 2786f01..026ce73 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -5707,7 +5707,8 @@ print_breakpoint_location (struct breakpoint *b,
ui_out_wrap_hint (uiout, wrap_indent_at_field (uiout, "what"));
ui_out_text (uiout, "at ");
}
- ui_out_field_string (uiout, "file", symtab_to_filename (loc->symtab));
+ ui_out_field_string (uiout, "file",
+ symtab_to_filename_for_display (loc->symtab));
ui_out_text (uiout, ":");
if (ui_out_is_mi_like_p (uiout))
@@ -9770,7 +9771,7 @@ resolve_sal_pc (struct symtab_and_line *sal)
{
if (!find_line_pc (sal->symtab, sal->line, &pc))
error (_("No line %d in file \"%s\"."),
- sal->line, symtab_to_filename (sal->symtab));
+ sal->line, symtab_to_filename_for_display (sal->symtab));
sal->pc = pc;
/* If this SAL corresponds to a breakpoint inserted using a line
@@ -12728,7 +12729,7 @@ say_where (struct breakpoint *b)
more nicely. */
if (b->loc->next == NULL)
printf_filtered (": file %s, line %d.",
- symtab_to_filename (b->loc->symtab),
+ symtab_to_filename_for_display (b->loc->symtab),
b->loc->line_number);
else
/* This is not ideal, but each location may have a
@@ -13928,7 +13929,8 @@ update_static_tracepoint (struct breakpoint *b, struct symtab_and_line sal)
SYMBOL_PRINT_NAME (sym));
ui_out_text (uiout, " at ");
}
- ui_out_field_string (uiout, "file", symtab_to_filename (sal2.symtab));
+ ui_out_field_string (uiout, "file",
+ symtab_to_filename_for_display (sal2.symtab));
ui_out_text (uiout, ":");
if (ui_out_is_mi_like_p (uiout))
@@ -13946,7 +13948,7 @@ update_static_tracepoint (struct breakpoint *b, struct symtab_and_line sal)
xfree (b->addr_string);
b->addr_string = xstrprintf ("%s:%d",
- symtab_to_filename (sal2.symtab),
+ symtab_to_filename_for_display (sal2.symtab),
b->loc->line_number);
/* Might be nice to check if function changed, and warn if
diff --git a/gdb/cli/cli-cmds.c b/gdb/cli/cli-cmds.c
index c49c156..d9bf80f 100644
--- a/gdb/cli/cli-cmds.c
+++ b/gdb/cli/cli-cmds.c
@@ -818,11 +818,13 @@ edit_command (char *arg, int from_tty)
printf_filtered ("%s is in %s (%s:%d).\n",
paddress (gdbarch, sal.pc),
SYMBOL_PRINT_NAME (sym),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab),
+ sal.line);
else
printf_filtered ("%s is at %s:%d.\n",
paddress (gdbarch, sal.pc),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab),
+ sal.line);
}
/* If what was given does not imply a symtab, it must be an
@@ -981,11 +983,11 @@ list_command (char *arg, int from_tty)
printf_filtered ("%s is in %s (%s:%d).\n",
paddress (gdbarch, sal.pc),
SYMBOL_PRINT_NAME (sym),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab), sal.line);
else
printf_filtered ("%s is at %s:%d.\n",
paddress (gdbarch, sal.pc),
- symtab_to_filename (sal.symtab), sal.line);
+ symtab_to_filename_for_display (sal.symtab), sal.line);
}
/* If line was not specified by just a line number, and it does not
@@ -1445,7 +1447,7 @@ ambiguous_line_spec (struct symtabs_and_lines *sals)
for (i = 0; i < sals->nelts; ++i)
printf_filtered (_("file: \"%s\", line number: %d\n"),
- symtab_to_filename (sals->sals[i].symtab),
+ symtab_to_filename_for_display (sals->sals[i].symtab),
sals->sals[i].line);
}
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index c94a218..d26e7c8 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -6819,7 +6819,7 @@ fixup_go_packaging (struct dwarf2_cu *cu)
complaint (&symfile_complaints,
_("Symtab %s has objects from two different Go packages: %s and %s"),
(SYMBOL_SYMTAB (sym)
- ? symtab_to_filename (SYMBOL_SYMTAB (sym))
+ ? symtab_to_filename_for_display (SYMBOL_SYMTAB (sym))
: cu->objfile->name),
this_package_name, package_name);
xfree (this_package_name);
diff --git a/gdb/linux-fork.c b/gdb/linux-fork.c
index f840863..2151401 100644
--- a/gdb/linux-fork.c
+++ b/gdb/linux-fork.c
@@ -584,7 +584,8 @@ info_checkpoints_command (char *arg, int from_tty)
sal = find_pc_line (pc, 0);
if (sal.symtab)
- printf_filtered (_(", file %s"), symtab_to_filename (sal.symtab));
+ printf_filtered (_(", file %s"),
+ symtab_to_filename_for_display (sal.symtab));
if (sal.line)
printf_filtered (_(", line %d"), sal.line);
if (!sal.symtab && !sal.line)
diff --git a/gdb/macroscope.c b/gdb/macroscope.c
index fba343d..03f9df4 100644
--- a/gdb/macroscope.c
+++ b/gdb/macroscope.c
@@ -77,7 +77,7 @@ sal_macro_scope (struct symtab_and_line sal)
complaint (&symfile_complaints,
_("symtab found for `%s', but that file\n"
"is not covered in the compilation unit's macro information"),
- symtab_to_filename (sal.symtab));
+ symtab_to_filename_for_display (sal.symtab));
}
return ms;
diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index c6a7943..2fed944 100644
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -4344,7 +4344,8 @@ psymtab_to_symtab_1 (struct objfile *objfile,
if (info_verbose && n_undef_symbols)
{
printf_filtered (_("File %s contains %d unresolved references:"),
- symtab_to_filename (st), n_undef_symbols);
+ symtab_to_filename_for_display (st),
+ n_undef_symbols);
printf_filtered ("\n\t%4d variables\n\t%4d "
"procedures\n\t%4d labels\n",
n_undef_vars, n_undef_procs, n_undef_labels);
diff --git a/gdb/mi/mi-cmd-file.c b/gdb/mi/mi-cmd-file.c
index 721adf4..07d9722 100644
--- a/gdb/mi/mi-cmd-file.c
+++ b/gdb/mi/mi-cmd-file.c
@@ -50,7 +50,8 @@ mi_cmd_file_list_exec_source_file (char *command, char **argv, int argc)
/* Print to the user the line, filename and fullname. */
ui_out_field_int (uiout, "line", st.line);
- ui_out_field_string (uiout, "file", symtab_to_filename (st.symtab));
+ ui_out_field_string (uiout, "file",
+ symtab_to_filename_for_display (st.symtab));
ui_out_field_string (uiout, "fullname", symtab_to_fullname (st.symtab));
@@ -93,7 +94,7 @@ mi_cmd_file_list_exec_source_files (char *command, char **argv, int argc)
{
ui_out_begin (uiout, ui_out_type_tuple, NULL);
- ui_out_field_string (uiout, "file", symtab_to_filename (s));
+ ui_out_field_string (uiout, "file", symtab_to_filename_for_display (s));
ui_out_field_string (uiout, "fullname", symtab_to_fullname (s));
ui_out_end (uiout, ui_out_type_tuple);
diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index ecffe5c..d94d28d 100644
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -725,7 +725,7 @@ build_address_symbolic (struct gdbarch *gdbarch,
if (sal.symtab)
{
- *filename = xstrdup (symtab_to_filename (sal.symtab));
+ *filename = xstrdup (symtab_to_filename_for_display (sal.symtab));
*line = sal.line;
}
}
diff --git a/gdb/python/py-symtab.c b/gdb/python/py-symtab.c
index f06d556..6fa8ecb 100644
--- a/gdb/python/py-symtab.c
+++ b/gdb/python/py-symtab.c
@@ -91,7 +91,7 @@ stpy_str (PyObject *self)
STPY_REQUIRE_VALID (self, symtab);
- result = PyString_FromString (symtab_to_filename (symtab));
+ result = PyString_FromString (symtab_to_filename_for_display (symtab));
return result;
}
@@ -104,7 +104,7 @@ stpy_get_filename (PyObject *self, void *closure)
const char *filename;
STPY_REQUIRE_VALID (self, symtab);
- filename = symtab_to_filename (symtab);
+ filename = symtab_to_filename_for_display (symtab);
str_obj = PyString_Decode (filename, strlen (filename),
host_charset (), NULL);
@@ -197,7 +197,7 @@ salpy_str (PyObject *self)
sal_obj = (sal_object *) self;
filename = (sal_obj->symtab == (symtab_object *) Py_None)
- ? "<unknown>" : symtab_to_filename (sal_obj->symtab->symtab);
+ ? "<unknown>" : symtab_to_filename_for_display (sal_obj->symtab->symtab);
s = xstrprintf ("symbol and line for %s, line %d", filename,
sal->line);
diff --git a/gdb/skip.c b/gdb/skip.c
index be9004b..0c002ff 100644
--- a/gdb/skip.c
+++ b/gdb/skip.c
@@ -82,7 +82,8 @@ skip_file_command (char *arg, int from_tty)
if (symtab == NULL)
error (_("No default file now."));
- /* It is not a typo, symtab_to_filename woule be needlessly ambiguous. */
+ /* It is not a typo, symtab_to_filename_for_display woule be needlessly
+ ambiguous. */
filename = symtab_to_fullname (symtab);
}
else
diff --git a/gdb/source.c b/gdb/source.c
index c577283..d18e003 100644
--- a/gdb/source.c
+++ b/gdb/source.c
@@ -1143,7 +1143,7 @@ symtab_to_fullname (struct symtab *s)
/* See commentary in source.h. */
const char *
-symtab_to_filename (struct symtab *symtab)
+symtab_to_filename_for_display (struct symtab *symtab)
{
if (filename_display_string == filename_display_basename)
return lbasename (symtab->filename);
@@ -1182,7 +1182,7 @@ find_source_lines (struct symtab *s, int desc)
gdb_assert (s);
line_charpos = (int *) xmalloc (lines_allocated * sizeof (int));
if (fstat (desc, &st) < 0)
- perror_with_name (symtab_to_filename (s));
+ perror_with_name (symtab_to_filename_for_display (s));
if (s->objfile && s->objfile->obfd)
mtime = s->objfile->mtime;
@@ -1207,7 +1207,7 @@ find_source_lines (struct symtab *s, int desc)
/* Reassign `size' to result of read for systems where \r\n -> \n. */
size = myread (desc, data, size);
if (size < 0)
- perror_with_name (symtab_to_filename (s));
+ perror_with_name (symtab_to_filename_for_display (s));
end = data + size;
p = data;
line_charpos[0] = 0;
@@ -1348,7 +1348,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
if (!(flags & PRINT_SOURCE_LINES_NOERROR))
{
- const char *filename = symtab_to_filename (s);
+ const char *filename = symtab_to_filename_for_display (s);
int len = strlen (filename) + 100;
char *name = alloca (len);
@@ -1359,7 +1359,8 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
{
ui_out_field_int (uiout, "line", line);
ui_out_text (uiout, "\tin ");
- ui_out_field_string (uiout, "file", symtab_to_filename (s));
+ ui_out_field_string (uiout, "file",
+ symtab_to_filename_for_display (s));
/* TUI expects the "fullname" field. While it is
!ui_out_is_mi_like_p compared to CLI it is !ui_source_list. */
@@ -1385,13 +1386,13 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
{
close (desc);
error (_("Line number %d out of range; %s has %d lines."),
- line, symtab_to_filename (s), s->nlines);
+ line, symtab_to_filename_for_display (s), s->nlines);
}
if (lseek (desc, s->line_charpos[line - 1], 0) < 0)
{
close (desc);
- perror_with_name (symtab_to_filename (s));
+ perror_with_name (symtab_to_filename_for_display (s));
}
stream = fdopen (desc, FDOPEN_MODE);
@@ -1408,7 +1409,7 @@ print_source_lines_base (struct symtab *s, int line, int stopline,
last_line_listed = current_source_line;
if (flags & PRINT_SOURCE_LINES_FILENAME)
{
- ui_out_text (uiout, symtab_to_filename (s));
+ ui_out_text (uiout, symtab_to_filename_for_display (s));
ui_out_text (uiout, ":");
}
xsnprintf (buf, sizeof (buf), "%d\t", current_source_line++);
@@ -1522,7 +1523,8 @@ line_info (char *arg, int from_tty)
if (start_pc == end_pc)
{
printf_filtered ("Line %d of \"%s\"",
- sal.line, symtab_to_filename (sal.symtab));
+ sal.line,
+ symtab_to_filename_for_display (sal.symtab));
wrap_here (" ");
printf_filtered (" is at address ");
print_address (gdbarch, start_pc, gdb_stdout);
@@ -1532,7 +1534,8 @@ line_info (char *arg, int from_tty)
else
{
printf_filtered ("Line %d of \"%s\"",
- sal.line, symtab_to_filename (sal.symtab));
+ sal.line,
+ symtab_to_filename_for_display (sal.symtab));
wrap_here (" ");
printf_filtered (" starts at address ");
print_address (gdbarch, start_pc, gdb_stdout);
@@ -1558,7 +1561,7 @@ line_info (char *arg, int from_tty)
which the user would want to see? If we have debugging symbols
and no line numbers? */
printf_filtered (_("Line number %d is out of range for \"%s\".\n"),
- sal.line, symtab_to_filename (sal.symtab));
+ sal.line, symtab_to_filename_for_display (sal.symtab));
}
do_cleanups (cleanups);
}
@@ -1586,7 +1589,7 @@ forward_search_command (char *regex, int from_tty)
desc = open_source_file (current_source_symtab);
if (desc < 0)
- perror_with_name (symtab_to_filename (current_source_symtab));
+ perror_with_name (symtab_to_filename_for_display (current_source_symtab));
cleanups = make_cleanup_close (desc);
if (current_source_symtab->line_charpos == 0)
@@ -1596,7 +1599,7 @@ forward_search_command (char *regex, int from_tty)
error (_("Expression not found"));
if (lseek (desc, current_source_symtab->line_charpos[line - 1], 0) < 0)
- perror_with_name (symtab_to_filename (current_source_symtab));
+ perror_with_name (symtab_to_filename_for_display (current_source_symtab));
discard_cleanups (cleanups);
stream = fdopen (desc, FDOPEN_MODE);
@@ -1675,7 +1678,7 @@ reverse_search_command (char *regex, int from_tty)
desc = open_source_file (current_source_symtab);
if (desc < 0)
- perror_with_name (symtab_to_filename (current_source_symtab));
+ perror_with_name (symtab_to_filename_for_display (current_source_symtab));
cleanups = make_cleanup_close (desc);
if (current_source_symtab->line_charpos == 0)
@@ -1685,7 +1688,7 @@ reverse_search_command (char *regex, int from_tty)
error (_("Expression not found"));
if (lseek (desc, current_source_symtab->line_charpos[line - 1], 0) < 0)
- perror_with_name (symtab_to_filename (current_source_symtab));
+ perror_with_name (symtab_to_filename_for_display (current_source_symtab));
discard_cleanups (cleanups);
stream = fdopen (desc, FDOPEN_MODE);
@@ -1728,8 +1731,11 @@ reverse_search_command (char *regex, int from_tty)
line--;
if (fseek (stream, current_source_symtab->line_charpos[line - 1], 0) < 0)
{
+ const char *filename;
+
do_cleanups (cleanups);
- perror_with_name (symtab_to_filename (current_source_symtab));
+ filename = symtab_to_filename_for_display (current_source_symtab);
+ perror_with_name (filename);
}
}
diff --git a/gdb/source.h b/gdb/source.h
index 643c056..33cad09 100644
--- a/gdb/source.h
+++ b/gdb/source.h
@@ -54,7 +54,7 @@ extern const char *symtab_to_fullname (struct symtab *s);
/* Returns filename without the compile directory part, basename or absolute
filename. It depends on 'set filename-display' value. */
-extern const char *symtab_to_filename (struct symtab *symtab);
+extern const char *symtab_to_filename_for_display (struct symtab *symtab);
/* Create and initialize the table S->line_charpos that records the
positions of the lines in the source file, which is assumed to be
diff --git a/gdb/stack.c b/gdb/stack.c
index 6c8f2af..bfec1b8 100644
--- a/gdb/stack.c
+++ b/gdb/stack.c
@@ -1178,8 +1178,9 @@ print_frame (struct frame_info *frame, int print_level,
ui_out_text (uiout, ")");
if (sal.symtab)
{
- const char *filename_display = symtab_to_filename (sal.symtab);
-
+ const char *filename_display;
+
+ filename_display = symtab_to_filename_for_display (sal.symtab);
annotate_frame_source_begin ();
ui_out_wrap_hint (uiout, " ");
ui_out_text (uiout, " at ");
@@ -1459,7 +1460,8 @@ frame_info (char *addr_exp, int from_tty)
}
wrap_here (" ");
if (sal.symtab)
- printf_filtered (" (%s:%d)", symtab_to_filename (sal.symtab), sal.line);
+ printf_filtered (" (%s:%d)", symtab_to_filename_for_display (sal.symtab),
+ sal.line);
puts_filtered ("; ");
wrap_here (" ");
printf_filtered ("saved %s ", pc_regname);
diff --git a/gdb/symmisc.c b/gdb/symmisc.c
index b8587ae..5fa4e4e 100644
--- a/gdb/symmisc.c
+++ b/gdb/symmisc.c
@@ -186,7 +186,7 @@ dump_objfile (struct objfile *objfile)
symtab != NULL;
symtab = symtab->next)
{
- printf_filtered ("%s at ", symtab_to_filename (symtab));
+ printf_filtered ("%s at ", symtab_to_filename_for_display (symtab));
gdb_print_host_address (symtab, gdb_stdout);
printf_filtered (", ");
if (symtab->objfile != objfile)
@@ -296,7 +296,7 @@ dump_symtab_1 (struct objfile *objfile, struct symtab *symtab,
int depth;
fprintf_filtered (outfile, "\nSymtab for file %s\n",
- symtab_to_filename (symtab));
+ symtab_to_filename_for_display (symtab));
if (symtab->dirname)
fprintf_filtered (outfile, "Compilation directory is %s\n",
symtab->dirname);
@@ -446,7 +446,7 @@ maintenance_print_symbols (char *args, int from_tty)
{
QUIT;
if (symname == NULL
- || filename_cmp (symname, symtab_to_filename (s)) == 0)
+ || filename_cmp (symname, symtab_to_filename_for_display (s)) == 0)
dump_symtab (objfile, s, outfile);
}
do_cleanups (cleanups);
@@ -727,7 +727,7 @@ maintenance_info_symtabs (char *regexp, int from_tty)
QUIT;
if (! regexp
- || re_exec (symtab_to_filename (symtab)))
+ || re_exec (symtab_to_filename_for_display (symtab)))
{
if (! printed_objfile_start)
{
@@ -739,7 +739,7 @@ maintenance_info_symtabs (char *regexp, int from_tty)
}
printf_filtered (" { symtab %s ",
- symtab_to_filename (symtab));
+ symtab_to_filename_for_display (symtab));
wrap_here (" ");
hooks/post-receive
--
Repository for Project Archer.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [SCM] archer-jankratochvil-absdir: Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
@ 2013-02-03 15:40 jkratoch
0 siblings, 0 replies; 4+ messages in thread
From: jkratoch @ 2013-02-03 15:40 UTC (permalink / raw)
To: archer-commits
The branch, archer-jankratochvil-absdir has been updated
via 58e267e759470e2e540a523cd86afd7f633eaf81 (commit)
via 17c9dfe4a356a7d9658111342e37ea3e9cc056ae (commit)
via f4229dd60d2ed41383af2c65498e9ab02918a2a0 (commit)
via efa7aa30fa2378bf6bcb684369f2d8b16a3f0ec1 (commit)
via 31a022cead5f90dc689b5a562232d05677533108 (commit)
via fdbf02832b030513ca7b99c033e98d5ab0306c76 (commit)
via eb2abe5549e15f34b16fe5d99c702319bcebc172 (commit)
via 6c6977ed0f206afd9914cefa65c963419f6f1a82 (commit)
via d3d2f2a71b879676ea0014d07bc552f4e9bf518b (commit)
via 138460664b99d93cc53b12d66d988ee8513c7743 (commit)
via e97a051d4e09a14594ea81034c4bc8966e277348 (commit)
via 190c84e576186e3e872d2516b0234fbf8a7554c1 (commit)
via b2d788c3d2b3a1440530fb95b4b4809a26a7e1a9 (commit)
via c2f14511388ab029f3bda0f5227eab67e04daac5 (commit)
via 8b9474b7ca95b074fc5b7a38b4b1558e33ad6710 (commit)
via 0a304c344ffac3df44bbb6252ada1008ddd3e2cd (commit)
via 0231f4acfa2825f60d81459171aaa0888e02baef (commit)
via 9016dd021e6246f3c9d00db579a82818f37167cb (commit)
via d9df84144bca60408763ae2bdf44c66e26f45b9c (commit)
via 6337c74b08e2c370fa1d5de33a714c55ef4cc2de (commit)
via 739d9f1989cf710612f6fff08799717325fcca7a (commit)
via 6fe643e71104ab7a4e62cfa52bb669afd1a668b4 (commit)
via 95d0a9ddafdc641b9023033fcaadc6701682c1ce (commit)
via 42f03fd670c7a0a5b61d420e3a7b5af01929d178 (commit)
via 0cc0f57c977cce646dc3e5bed1a6d1fc8bc8f1bc (commit)
via 39c4a08ae546969f9d31219561c93bb4970b583a (commit)
via 125a810fe99b6ec77947e4fc09697115adcf5e2e (commit)
via 357496d1ae5b540cef822b806e6cce0ee0403a7d (commit)
via 8e59ae41ea65827389539a527f0e85a11fe5f2bd (commit)
via 05bb5123a57c91f1a06cf828d0db89aaa5391f94 (commit)
via 01b293100c8575bf646394d9c5bf42f0c16dfa1c (commit)
via 6f315c81b544ded047311e0acbd8d2c89240b58c (commit)
via e93f194bd9a82defd9618f8c7920a9029fa8e633 (commit)
via 4fcb3b0f7dbdd6230ca430a1ec7dfe10fac2016c (commit)
via f596a1c3c52ab891bbeb87b8d6ff4de8c9dd8fa0 (commit)
via 6f6a03520777c2efba7bbe5f4a5788cdbe5e8ed2 (commit)
via c4dda951d0538c86dd56526ddaf1819f8a012681 (commit)
via dc09f343296b59e260d40191e9a586afc03b3e9a (commit)
via f8a562ddd90272103b34aa3291db4df00489a235 (commit)
via 848a873ee947a94838a68d219f211de23aeea96b (commit)
via 9027410698dbc498f44441201784578570a0a6f6 (commit)
from 37446680fb3c1bc8927e124024eac061479654c2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 58e267e759470e2e540a523cd86afd7f633eaf81
Merge: 0a304c3 17c9dfe
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:16 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
commit 17c9dfe4a356a7d9658111342e37ea3e9cc056ae
Merge: 0231f4a f4229dd
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:16 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix
commit f4229dd60d2ed41383af2c65498e9ab02918a2a0
Merge: 6337c74 efa7aa3
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:16 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel
commit efa7aa30fa2378bf6bcb684369f2d8b16a3f0ec1
Merge: 739d9f1 31a022c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:15 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal
commit 31a022cead5f90dc689b5a562232d05677533108
Merge: 95d0a9d fdbf028
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:15 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab
commit fdbf02832b030513ca7b99c033e98d5ab0306c76
Merge: 42f03fd eb2abe5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:15 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui
commit eb2abe5549e15f34b16fe5d99c702319bcebc172
Merge: 0cc0f57 6c6977e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:15 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2
commit 6c6977ed0f206afd9914cefa65c963419f6f1a82
Merge: 39c4a08 d3d2f2a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:14 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config
commit d3d2f2a71b879676ea0014d07bc552f4e9bf518b
Merge: 125a810 1384606
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:14 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname' into xfullpath-locsymtab-isabs-expandfullname-tuifullname
commit 138460664b99d93cc53b12d66d988ee8513c7743
Merge: 357496d e97a051
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:14 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs' into xfullpath-locsymtab-isabs-expandfullname
commit e97a051d4e09a14594ea81034c4bc8966e277348
Merge: 8e59ae4 190c84e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:13 2013 +0100
Merge branch 'xfullpath-locsymtab' into xfullpath-locsymtab-isabs
commit 190c84e576186e3e872d2516b0234fbf8a7554c1
Merge: 05bb512 b2d788c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:13 2013 +0100
Merge branch 'xfullpath' into xfullpath-locsymtab
commit b2d788c3d2b3a1440530fb95b4b4809a26a7e1a9
Merge: 01b2931 c2f1451
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sun Feb 3 16:40:13 2013 +0100
Merge remote-tracking branch 'gdb/master' into xfullpath
commit c2f14511388ab029f3bda0f5227eab67e04daac5
Author: gdbadmin <gdbadmin@sourceware.org>
Date: Sun Feb 3 00:00:35 2013 +0000
*** empty log message ***
commit 8b9474b7ca95b074fc5b7a38b4b1558e33ad6710
Author: Alan Modra <amodra@bigpond.net.au>
Date: Sat Feb 2 23:00:05 2013 +0000
daily update
commit 0a304c344ffac3df44bbb6252ada1008ddd3e2cd
Merge: 9016dd0 0231f4a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 19:11:47 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
commit 0231f4acfa2825f60d81459171aaa0888e02baef
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 19:11:39 2013 +0100
.
commit 9016dd021e6246f3c9d00db579a82818f37167cb
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 19:06:46 2013 +0100
.
commit d9df84144bca60408763ae2bdf44c66e26f45b9c
Merge: 3744668 6fe643e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:30 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
commit 6337c74b08e2c370fa1d5de33a714c55ef4cc2de
Merge: 6f1ebd1 739d9f1
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:29 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel
commit 739d9f1989cf710612f6fff08799717325fcca7a
Merge: 64aae5b 95d0a9d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:29 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal
commit 6fe643e71104ab7a4e62cfa52bb669afd1a668b4
Merge: 8ed7547 6337c74
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:29 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix
commit 95d0a9ddafdc641b9023033fcaadc6701682c1ce
Merge: 1e4f210 42f03fd
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:28 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab
commit 42f03fd670c7a0a5b61d420e3a7b5af01929d178
Merge: c93b550 0cc0f57
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:28 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui
commit 0cc0f57c977cce646dc3e5bed1a6d1fc8bc8f1bc
Merge: 3aaa930 39c4a08
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:27 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2
commit 39c4a08ae546969f9d31219561c93bb4970b583a
Merge: b98804a 125a810
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:27 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config
commit 125a810fe99b6ec77947e4fc09697115adcf5e2e
Merge: a5b98b3 357496d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:27 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname' into xfullpath-locsymtab-isabs-expandfullname-tuifullname
commit 357496d1ae5b540cef822b806e6cce0ee0403a7d
Merge: 470380a 8e59ae4
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:26 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs' into xfullpath-locsymtab-isabs-expandfullname
commit 8e59ae41ea65827389539a527f0e85a11fe5f2bd
Merge: a333736 05bb512
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:26 2013 +0100
Merge branch 'xfullpath-locsymtab' into xfullpath-locsymtab-isabs
commit 05bb5123a57c91f1a06cf828d0db89aaa5391f94
Merge: 1289553 01b2931
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:25 2013 +0100
Merge branch 'xfullpath' into xfullpath-locsymtab
commit 01b293100c8575bf646394d9c5bf42f0c16dfa1c
Merge: b1aab79 6f315c8
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Sat Feb 2 18:52:25 2013 +0100
Merge remote-tracking branch 'gdb/master' into xfullpath
-----------------------------------------------------------------------
Summary of changes:
bfd/version.h | 2 +-
gdb/ChangeLog | 49 ++++
gdb/Makefile.in | 6 +-
gdb/NEWS | 2 +-
gdb/ada-lang.c | 3 -
gdb/ada-valprint.c | 2 -
gdb/configure.tgt | 3 +-
gdb/doc/gdb.texinfo | 14 +-
gdb/dummy-frame.c | 34 ---
gdb/elfread.c | 14 +-
gdb/frame.h | 2 -
gdb/objfiles.c | 3 +
gdb/ppc-linux-tdep.c | 427 +-----------------------------
gdb/ppc-tdep.h | 15 +
gdb/ppc64-tdep.c | 363 +++++++++++++++++++++++++
gdb/ppc64-tdep.h | 34 +++
gdb/rs6000-tdep.c | 62 +++++
gdb/symfile.c | 7 +-
gdb/testsuite/ChangeLog | 16 ++
gdb/testsuite/gdb.base/gnu-debugdata.exp | 22 ++-
gdb/testsuite/gdb.dwarf2/method-ptr.exp | 8 +-
gdb/testsuite/lib/java.exp | 2 +-
gdb/version.in | 2 +-
23 files changed, 606 insertions(+), 486 deletions(-)
create mode 100644 gdb/ppc64-tdep.c
create mode 100644 gdb/ppc64-tdep.h
First 500 lines of diff:
diff --git a/bfd/version.h b/bfd/version.h
index 0e43552..f61bfd0 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20130201
+#define BFD_VERSION_DATE 20130203
#define BFD_VERSION @bfd_version@
#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@
#define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e4cbe05..baa3ea3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,52 @@
+2013-02-01 Andreas Tobler <andreast@fgznet.ch>
+
+ * Makefile.in (ALL_TARGET_OBS): Add ppc64-tdep.o.
+ (HFILES_NO_SRCDIR): Add ppc64-tdep.h.
+ (ALLDEPFILES): Add ppc64-tdep.c.
+ * configure.tgt (powerpc-*-linux* | powerpc64-*-linux*): Add
+ ppc64-tdep.o to gdb_target_obs.
+ * ppc64-tdep.h: New file.
+ * ppc64-tdep.c: New file.
+ (insn_d, insn_ds, insn_xfx, ppc64_desc_entry_point): Move from
+ ppc-linux-tdep.c to here.
+ (PPC64_STANDARD_LINKAGE1_LEN, PPC64_STANDARD_LINKAGE2_LEN)
+ (PPC64_STANDARD_LINKAGE2_LEN): Likewise and use ARRAY_SIZE macro.
+ (ppc64_standard_linkage1_target, ppc64_standard_linkage2_target)
+ (ppc64_standard_linkage3_target, ppc64_skip_trampoline_code): Move
+ from ppc-linux-tdep.c to here.
+ (ppc64_convert_from_func_ptr_addr): Rename from
+ ppc64_linux_convert_from_func_ptr_addr to
+ ppc64_convert_from_func_ptr_addr and move from ppc-linux-tdep.c to
+ here.
+ * rs6000-tdep.c:
+ (read_insn): Move from ppc-linux-tdep.c to here.
+ (insns_match_pattern, insn_d_field, insn_ds_field): Move
+ from ppc-linux-tdep.c to here and rename them with the ppc_ prefix.
+ * ppc-linux-tdep.c: Include ppc64-tdep.h.
+ Removed above functions.
+ (ppc_linux_init_abi): Adjust.
+
+2013-02-01 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * ada-valprint.c (ada_print_floating): Remove unused 'len'.
+
+2013-02-01 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * ada-lang.c (assign_aggregate): Remove unused 'is_array_aggregate'.
+
+2013-02-01 Pedro Alves <palves@redhat.com>
+
+ * dummy-frame.c (deprecated_pc_in_call_dummy): Delete function.
+ * frame.h (deprecated_pc_in_call_dummy): Delete declaration.
+
+2013-02-01 Jan Kratochvil <jan.kratochvil@redhat.com>
+
+ * elfread.c (elf_symfile_read): Limit separate debug info additions to
+ files with no separate debug info.
+ * objfiles.c (add_separate_debug_objfile): Add gdb_assert calls.
+ * symfile.c (read_symbols): Call find_separate_debug_file_in_section
+ only for files with no separate debug info.
+
2013-01-31 Tom Tromey <tromey@redhat.com>
* jit.c (jit_program_space_data): Rename from jit_inferior_data;
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 68d545e..e0e08ca 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -565,7 +565,7 @@ ALL_TARGET_OBS = \
mt-tdep.o \
nto-tdep.o \
ppc-linux-tdep.o ppcnbsd-tdep.o ppcobsd-tdep.o ppc-sysv-tdep.o \
- rl78-tdep.o \
+ ppc64-tdep.o rl78-tdep.o \
rs6000-aix-tdep.o rs6000-tdep.o ppc-ravenscar-thread.o \
rs6000-lynx178-tdep.o \
rx-tdep.o \
@@ -807,7 +807,7 @@ amd64-linux-tdep.h linespec.h i387-tdep.h mn10300-tdep.h \
sparc64-tdep.h monitor.h ppcobsd-tdep.h srec.h solib-pa64.h \
coff-pe-read.h parser-defs.h gdb_ptrace.h mips-linux-tdep.h \
m68k-tdep.h spu-tdep.h jv-lang.h environ.h solib-irix.h amd64-tdep.h \
-doublest.h regset.h hppa-tdep.h ppc-linux-tdep.h rs6000-tdep.h \
+doublest.h regset.h hppa-tdep.h ppc-linux-tdep.h ppc64-tdep.h rs6000-tdep.h \
common/gdb_locale.h common/gdb_dirent.h arch-utils.h trad-frame.h gnu-nat.h \
language.h nbsd-tdep.h solib-svr4.h \
macroexp.h ui-file.h regcache.h gdb_string.h tracepoint.h i386-tdep.h \
@@ -1487,7 +1487,7 @@ ALLDEPFILES = \
solib-osf.c \
somread.c solib-som.c \
posix-hdep.c \
- ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c \
+ ppc-sysv-tdep.c ppc-linux-nat.c ppc-linux-tdep.c ppc64-tdep.c \
ppcnbsd-nat.c ppcnbsd-tdep.c \
ppcobsd-nat.c ppcobsd-tdep.c \
procfs.c \
diff --git a/gdb/NEWS b/gdb/NEWS
index 350a063..a89761d 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -121,7 +121,7 @@ show filename-display
Control the way in which filenames is displayed.
Previous behavior was "relative".
New default is "relative-with-system-absolute", which prints source filenames
- from files with present separate debug info in absolute form.
+ from files with separate debug info in absolute form.
* MI changes
diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index f896aa9..634e761 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -9031,7 +9031,6 @@ assign_aggregate (struct value *container,
int num_specs;
LONGEST *indices;
int max_indices, num_indices;
- int is_array_aggregate;
int i;
*pos += 3;
@@ -9056,13 +9055,11 @@ assign_aggregate (struct value *container,
lhs_type = value_type (lhs);
low_index = TYPE_ARRAY_LOWER_BOUND_VALUE (lhs_type);
high_index = TYPE_ARRAY_UPPER_BOUND_VALUE (lhs_type);
- is_array_aggregate = 1;
}
else if (TYPE_CODE (lhs_type) == TYPE_CODE_STRUCT)
{
low_index = 0;
high_index = num_visible_fields (lhs_type) - 1;
- is_array_aggregate = 0;
}
else
error (_("Left-hand side must be array or record."));
diff --git a/gdb/ada-valprint.c b/gdb/ada-valprint.c
index 836123f..5287ce5 100644
--- a/gdb/ada-valprint.c
+++ b/gdb/ada-valprint.c
@@ -320,7 +320,6 @@ ada_print_floating (const gdb_byte *valaddr, struct type *type,
{
char buffer[64];
char *s, *result;
- int len;
struct ui_file *tmp_stream = mem_fileopen ();
struct cleanup *cleanups = make_cleanup_ui_file_delete (tmp_stream);
@@ -329,7 +328,6 @@ ada_print_floating (const gdb_byte *valaddr, struct type *type,
do_cleanups (cleanups);
result = buffer;
- len = strlen (result);
/* Modify for Ada rules. */
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index 5b77bb2..2b4eea0 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -405,7 +405,8 @@ powerpc-*-aix* | rs6000-*-*)
powerpc-*-linux* | powerpc64-*-linux*)
# Target: PowerPC running Linux
gdb_target_obs="rs6000-tdep.o ppc-linux-tdep.o ppc-sysv-tdep.o \
- solib-svr4.o solib-spu.o spu-multiarch.o \
+ ppc64-tdep.o solib-svr4.o solib-spu.o \
+ spu-multiarch.o \
glibc-tdep.o symfile-mem.o linux-tdep.o \
ravenscar-thread.o ppc-ravenscar-thread.o"
gdb_sim=../sim/ppc/libsim.a
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 843cfa5..7d4e647 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -6550,9 +6550,9 @@ Display only basename of a filename.
Display an absolute filename.
@item set filename-display relative-with-system-absolute
-Determine whether a source filename comes from file having separate debug
-information file. In such case display the source filename as absolute one.
-Otherwise display it relative to the compilation directory.
+Display as absolute those source file names that come from files with separate
+debug info, and all the other source file names as relative to their
+compilation directory.
Files having separate debug information file are expected to come from system
shared libraries.
@@ -6560,12 +6560,8 @@ shared libraries.
This is the default.
@item set filename-display basename-with-system-absolute
-Determine whether a source filename comes from file having separate debug
-information file. In such case display the source filename as absolute one.
-Otherwise display only basename of the filename.
-
-Files having separate debug information file are expected to come from system
-shared libraries.
+Display as absolute those source file names that come from files with separate
+debug info, and all the other source file names only as their basenames.
@item show filename-display
Show the current way to display filenames.
diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c
index 12310f8..390a6d8 100644
--- a/gdb/dummy-frame.c
+++ b/gdb/dummy-frame.c
@@ -47,40 +47,6 @@ struct dummy_frame
static struct dummy_frame *dummy_frame_stack = NULL;
-/* Function: deprecated_pc_in_call_dummy (pc)
-
- Return non-zero if the PC falls in a dummy frame created by gdb for
- an inferior call. The code below which allows gdbarch_decr_pc_after_break
- is for infrun.c, which may give the function a PC without that
- subtracted out.
-
- FIXME: cagney/2002-11-23: This is silly. Surely "infrun.c" can
- figure out what the real PC (as in the resume address) is BEFORE
- calling this function.
-
- NOTE: cagney/2004-08-02: I'm pretty sure that, with the introduction of
- infrun.c:adjust_pc_after_break (thanks), this function is now
- always called with a correctly adjusted PC!
-
- NOTE: cagney/2004-08-02: Code should not need to call this. */
-
-int
-deprecated_pc_in_call_dummy (struct gdbarch *gdbarch, CORE_ADDR pc)
-{
- struct dummy_frame *dummyframe;
-
- for (dummyframe = dummy_frame_stack;
- dummyframe != NULL;
- dummyframe = dummyframe->next)
- {
- if ((pc >= dummyframe->id.code_addr)
- && (pc <= dummyframe->id.code_addr
- + gdbarch_decr_pc_after_break (gdbarch)))
- return 1;
- }
- return 0;
-}
-
/* Push the caller's state, along with the dummy frame info, onto the
dummy-frame stack. */
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 9d630cd..6ca659f 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -1431,8 +1431,18 @@ elf_symfile_read (struct objfile *objfile, int symfile_flags)
/* If the file has its own symbol tables it has no separate debug
info. `.dynsym'/`.symtab' go to MSYMBOLS, `.debug_info' goes to
SYMTABS/PSYMTABS. `.gnu_debuglink' may no longer be present with
- `.note.gnu.build-id'. */
- else if (!objfile_has_partial_symbols (objfile))
+ `.note.gnu.build-id'.
+
+ .gnu_debugdata is !objfile_has_partial_symbols because it contains only
+ .symtab, not .debug_* section. But if we already added .gnu_debugdata as
+ an objfile via find_separate_debug_file_in_section there was no separate
+ debug info available. Therefore do not attempt to search for another one,
+ objfile->separate_debug_objfile->separate_debug_objfile GDB guarantees to
+ be NULL and we would possibly violate it. */
+
+ else if (!objfile_has_partial_symbols (objfile)
+ && objfile->separate_debug_objfile == NULL
+ && objfile->separate_debug_objfile_backlink == NULL)
{
char *debugfile;
diff --git a/gdb/frame.h b/gdb/frame.h
index e3c6d91..31b9cb7 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -670,8 +670,6 @@ extern void print_frame_info (struct frame_info *, int print_level,
extern struct frame_info *block_innermost_frame (const struct block *);
-extern int deprecated_pc_in_call_dummy (struct gdbarch *gdbarch, CORE_ADDR pc);
-
extern int deprecated_frame_register_read (struct frame_info *frame, int regnum,
gdb_byte *buf);
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index c82e2cf..8c17c14 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -476,6 +476,9 @@ add_separate_debug_objfile (struct objfile *objfile, struct objfile *parent)
/* Must not be already in a list. */
gdb_assert (objfile->separate_debug_objfile_backlink == NULL);
gdb_assert (objfile->separate_debug_objfile_link == NULL);
+ gdb_assert (objfile->separate_debug_objfile == NULL);
+ gdb_assert (parent->separate_debug_objfile_backlink == NULL);
+ gdb_assert (parent->separate_debug_objfile_link == NULL);
objfile->separate_debug_objfile_backlink = parent;
objfile->separate_debug_objfile_link = parent->separate_debug_objfile;
diff --git a/gdb/ppc-linux-tdep.c b/gdb/ppc-linux-tdep.c
index 135dc75..cdf362f 100644
--- a/gdb/ppc-linux-tdep.c
+++ b/gdb/ppc-linux-tdep.c
@@ -35,6 +35,7 @@
#include "solib.h"
#include "solist.h"
#include "ppc-tdep.h"
+#include "ppc64-tdep.h"
#include "ppc-linux-tdep.h"
#include "glibc-tdep.h"
#include "trad-frame.h"
@@ -254,277 +255,6 @@ ppc_linux_return_value (struct gdbarch *gdbarch, struct value *function,
readbuf, writebuf);
}
-/* Macros for matching instructions. Note that, since all the
- operands are masked off before they're or-ed into the instruction,
- you can use -1 to make masks. */
-
-#define insn_d(opcd, rts, ra, d) \
- ((((opcd) & 0x3f) << 26) \
- | (((rts) & 0x1f) << 21) \
- | (((ra) & 0x1f) << 16) \
- | ((d) & 0xffff))
-
-#define insn_ds(opcd, rts, ra, d, xo) \
- ((((opcd) & 0x3f) << 26) \
- | (((rts) & 0x1f) << 21) \
- | (((ra) & 0x1f) << 16) \
- | ((d) & 0xfffc) \
- | ((xo) & 0x3))
-
-#define insn_xfx(opcd, rts, spr, xo) \
- ((((opcd) & 0x3f) << 26) \
- | (((rts) & 0x1f) << 21) \
- | (((spr) & 0x1f) << 16) \
- | (((spr) & 0x3e0) << 6) \
- | (((xo) & 0x3ff) << 1))
-
-/* Read a PPC instruction from memory. PPC instructions are always
- big-endian, no matter what endianness the program is running in, so
- we can't use read_memory_integer or one of its friends here. */
-static unsigned int
-read_insn (CORE_ADDR pc)
-{
- unsigned char buf[4];
-
- read_memory (pc, buf, 4);
- return (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
-}
-
-
-/* An instruction to match. */
-struct insn_pattern
-{
- unsigned int mask; /* mask the insn with this... */
- unsigned int data; /* ...and see if it matches this. */
- int optional; /* If non-zero, this insn may be absent. */
-};
-
-/* Return non-zero if the instructions at PC match the series
- described in PATTERN, or zero otherwise. PATTERN is an array of
- 'struct insn_pattern' objects, terminated by an entry whose mask is
- zero.
-
- When the match is successful, fill INSN[i] with what PATTERN[i]
- matched. If PATTERN[i] is optional, and the instruction wasn't
- present, set INSN[i] to 0 (which is not a valid PPC instruction).
- INSN should have as many elements as PATTERN. Note that, if
- PATTERN contains optional instructions which aren't present in
- memory, then INSN will have holes, so INSN[i] isn't necessarily the
- i'th instruction in memory. */
-static int
-insns_match_pattern (CORE_ADDR pc,
- struct insn_pattern *pattern,
- unsigned int *insn)
-{
- int i;
-
- for (i = 0; pattern[i].mask; i++)
- {
- insn[i] = read_insn (pc);
- if ((insn[i] & pattern[i].mask) == pattern[i].data)
- pc += 4;
- else if (pattern[i].optional)
- insn[i] = 0;
- else
- return 0;
- }
-
- return 1;
-}
-
-
-/* Return the 'd' field of the d-form instruction INSN, properly
- sign-extended. */
-static CORE_ADDR
-insn_d_field (unsigned int insn)
-{
- return ((((CORE_ADDR) insn & 0xffff) ^ 0x8000) - 0x8000);
-}
-
-
-/* Return the 'ds' field of the ds-form instruction INSN, with the two
- zero bits concatenated at the right, and properly
- sign-extended. */
-static CORE_ADDR
-insn_ds_field (unsigned int insn)
-{
- return ((((CORE_ADDR) insn & 0xfffc) ^ 0x8000) - 0x8000);
-}
-
-
-/* If DESC is the address of a 64-bit PowerPC GNU/Linux function
- descriptor, return the descriptor's entry point. */
-static CORE_ADDR
-ppc64_desc_entry_point (struct gdbarch *gdbarch, CORE_ADDR desc)
-{
- enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
- /* The first word of the descriptor is the entry point. */
- return (CORE_ADDR) read_memory_unsigned_integer (desc, 8, byte_order);
-}
-
-
-/* Pattern for the standard linkage function. These are built by
- build_plt_stub in elf64-ppc.c, whose GLINK argument is always
- zero. */
-static struct insn_pattern ppc64_standard_linkage1[] =
- {
- /* addis r12, r2, <any> */
- { insn_d (-1, -1, -1, 0), insn_d (15, 12, 2, 0), 0 },
-
- /* std r2, 40(r1) */
- { -1, insn_ds (62, 2, 1, 40, 0), 0 },
-
- /* ld r11, <any>(r12) */
- { insn_ds (-1, -1, -1, 0, -1), insn_ds (58, 11, 12, 0, 0), 0 },
-
- /* addis r12, r12, 1 <optional> */
- { insn_d (-1, -1, -1, -1), insn_d (15, 12, 12, 1), 1 },
-
- /* ld r2, <any>(r12) */
- { insn_ds (-1, -1, -1, 0, -1), insn_ds (58, 2, 12, 0, 0), 0 },
-
- /* addis r12, r12, 1 <optional> */
- { insn_d (-1, -1, -1, -1), insn_d (15, 12, 12, 1), 1 },
-
- /* mtctr r11 */
- { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 11, 9, 467), 0 },
-
- /* ld r11, <any>(r12) <optional> */
- { insn_ds (-1, -1, -1, 0, -1), insn_ds (58, 11, 12, 0, 0), 1 },
-
- /* bctr */
- { -1, 0x4e800420, 0 },
-
- { 0, 0, 0 }
- };
-#define PPC64_STANDARD_LINKAGE1_LEN \
- (sizeof (ppc64_standard_linkage1) / sizeof (ppc64_standard_linkage1[0]))
-
-static struct insn_pattern ppc64_standard_linkage2[] =
- {
- /* addis r12, r2, <any> */
- { insn_d (-1, -1, -1, 0), insn_d (15, 12, 2, 0), 0 },
-
- /* std r2, 40(r1) */
- { -1, insn_ds (62, 2, 1, 40, 0), 0 },
-
- /* ld r11, <any>(r12) */
- { insn_ds (-1, -1, -1, 0, -1), insn_ds (58, 11, 12, 0, 0), 0 },
-
- /* addi r12, r12, <any> <optional> */
- { insn_d (-1, -1, -1, 0), insn_d (14, 12, 12, 0), 1 },
-
- /* mtctr r11 */
- { insn_xfx (-1, -1, -1, -1), insn_xfx (31, 11, 9, 467), 0 },
-
- /* ld r2, <any>(r12) */
- { insn_ds (-1, -1, -1, 0, -1), insn_ds (58, 2, 12, 0, 0), 0 },
-
- /* ld r11, <any>(r12) <optional> */
- { insn_ds (-1, -1, -1, 0, -1), insn_ds (58, 11, 12, 0, 0), 1 },
-
- /* bctr */
- { -1, 0x4e800420, 0 },
-
- { 0, 0, 0 }
- };
-#define PPC64_STANDARD_LINKAGE2_LEN \
- (sizeof (ppc64_standard_linkage2) / sizeof (ppc64_standard_linkage2[0]))
-
-static struct insn_pattern ppc64_standard_linkage3[] =
- {
- /* std r2, 40(r1) */
- { -1, insn_ds (62, 2, 1, 40, 0), 0 },
-
- /* ld r11, <any>(r2) */
- { insn_ds (-1, -1, -1, 0, -1), insn_ds (58, 11, 2, 0, 0), 0 },
hooks/post-receive
--
Repository for Project Archer.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [SCM] archer-jankratochvil-absdir: Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
@ 2013-02-01 20:35 jkratoch
0 siblings, 0 replies; 4+ messages in thread
From: jkratoch @ 2013-02-01 20:35 UTC (permalink / raw)
To: archer-commits
The branch, archer-jankratochvil-absdir has been updated
via 2b9902d6567ecebbe196598b67ca65149c116a2b (commit)
via 3e2bd393021fdc18721caf248662f0060d68fd79 (commit)
via 3c7b6127d1c537edec301a2c605673f9e4e6cc19 (commit)
via f33462cd33c41c0e55a29f75a5d1495233930f05 (commit)
via 55a6b03622d6cdeeb0b48d665c33162e67e17a3b (commit)
via 68f63ad0ba158a76ff99ef36fef588a59848766b (commit)
via 1f30d9b77fd54e963b78f4378f203743c0d2d8f4 (commit)
via b346570342a5ca9475fbe4c7b5e5d42f9de250d8 (commit)
via a5b98b3b2b340c71be21a34acb9ae12e22998efd (commit)
via 470380a339a1d2c29c5c12e79ce74fb45c3dc62f (commit)
via a333736a12dfafebf71b672ebd3bc5bd596358d3 (commit)
via 12895536897f1f299f4e27e9bcffb7743eac76f2 (commit)
via b1aab79172c560e99be2d30b85a173939cb10128 (commit)
via ce0df1e3542e6597547f1ed517296869df09fea3 (commit)
via 9cca7c9ea2e26c3e275c4d1091f1228af7e59b4c (commit)
via 79ecdcdedff9228e4802b365dc9d8bbe2e279783 (commit)
via 58cbfb174637c250d4cf8f3d9902303eba1a2aa5 (commit)
via b159cecffc20708e74ef7fe34e05a8223156e562 (commit)
via 8be2de3f7798e372c0be3894b570f3f56b25fd08 (commit)
via a0bbccb0896ea3b18b56cc337b28b5513169fce8 (commit)
via 186cc2fc60622fe5f8ed5f5155afffba89a980c2 (commit)
via b8bd96eae0f0e99236bc5d3cb23cd5c75e73aa31 (commit)
via 6d0b14096c833308fc7df9b270f8530cd092650a (commit)
via 27fd2ffc85ffa64e53306d04abc1b2ada2a26e9a (commit)
via 13c9b7e12d21ed6403f66bd5d12b7f2509123f89 (commit)
via d5ba5b9794399e2e69f573fc90c54cb9487984b6 (commit)
via 9b5d917dcdfe1f9c6af1676df8b5fd6b21651257 (commit)
via 5c424db3dfe023da2beba5b9035950e97d2e1c70 (commit)
via aeeb9a4d35c32b6df818bc149a831a65ca2c6924 (commit)
via 06c12972e5e656bdc30930d3435fa91e84f6eb37 (commit)
via 2e1861546a3200f4b98c889a3c4a57fd19145a2e (commit)
via ec8b361c688b220ed5392aa14c50cca04da28fe0 (commit)
via d08f6e9e44366b755fc0ce32d96f18225e1891fd (commit)
via 38974e8a375a2c70629e58351dae85375ef4d380 (commit)
via 7ded62da0d1e873b1b86018f16b442b46347124c (commit)
via bf3ef00700fd866218020f1d67138dd64986a637 (commit)
via bf056ec3c9f4f3ce83cb45ea310c3dd676c877ea (commit)
via d3e3baae6bb3881df8adb6fdf52225c4987f5284 (commit)
via 34cc7b068b8d9e8a9155b00b28e74698f571e709 (commit)
via cd4facd7eba6fe3566a33154ece3b6448ec6b8db (commit)
via f281ee6ef8632b17fd43f6db89af5e6b4286f3a6 (commit)
via 02998939238cb637e10ad20269cbafeb6d969ec7 (commit)
via a17222dbc801b5ce71cdd27f163297136e6890e6 (commit)
from 025d7cc5769192751cd98fd9cd612b898eeb7cff (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 2b9902d6567ecebbe196598b67ca65149c116a2b
Merge: 025d7cc 3e2bd39
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:36 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
commit 3e2bd393021fdc18721caf248662f0060d68fd79
Merge: fd0c7dc 3c7b612
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:35 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix
commit 3c7b6127d1c537edec301a2c605673f9e4e6cc19
Merge: 7680789 f33462c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:35 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel
commit f33462cd33c41c0e55a29f75a5d1495233930f05
Merge: 6cfc98a 55a6b03
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:34 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal
commit 55a6b03622d6cdeeb0b48d665c33162e67e17a3b
Merge: 6ebd1db 68f63ad
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:34 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab
commit 68f63ad0ba158a76ff99ef36fef588a59848766b
Merge: 796e78c 1f30d9b
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:33 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui
commit 1f30d9b77fd54e963b78f4378f203743c0d2d8f4
Merge: 29135d9 b346570
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:33 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2
commit b346570342a5ca9475fbe4c7b5e5d42f9de250d8
Merge: 66d2941 a5b98b3
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:32 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config
commit a5b98b3b2b340c71be21a34acb9ae12e22998efd
Merge: c1d6145 470380a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:31 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname' into xfullpath-locsymtab-isabs-expandfullname-tuifullname
commit 470380a339a1d2c29c5c12e79ce74fb45c3dc62f
Merge: 83ac245 a333736
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:31 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs' into xfullpath-locsymtab-isabs-expandfullname
commit a333736a12dfafebf71b672ebd3bc5bd596358d3
Merge: 9fd1ea2 1289553
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:30 2013 +0100
Merge branch 'xfullpath-locsymtab' into xfullpath-locsymtab-isabs
commit 12895536897f1f299f4e27e9bcffb7743eac76f2
Merge: 8d4ef5b b1aab79
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:29 2013 +0100
Merge branch 'xfullpath' into xfullpath-locsymtab
commit b1aab79172c560e99be2d30b85a173939cb10128
Merge: ac57bb3 ce0df1e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri Feb 1 21:33:26 2013 +0100
Merge remote-tracking branch 'gdb/master' into xfullpath
Conflicts:
gdb/utils.c
commit ce0df1e3542e6597547f1ed517296869df09fea3
Author: Tom Tromey <tromey@redhat.com>
Date: Fri Feb 1 18:08:52 2013 +0000
2013-02-01 Jan Kratochvil <jan.kratochvil@redhat.com>
Tom Tromey <tromey@redhat.com>
* gdb.dwarf2/method-ptr.exp: Link with c++.
* lib/dwarf.exp (Dwarf::assemble): Declare _cu_count.
commit 9cca7c9ea2e26c3e275c4d1091f1228af7e59b4c
Author: Alan Modra <amodra@bigpond.net.au>
Date: Fri Feb 1 11:06:37 2013 +0000
* elf64-ppc.c (dec_dynrel_count): Don't error when elf_gc_sweep_symbol
clears def_regular.
commit 79ecdcdedff9228e4802b365dc9d8bbe2e279783
Author: gdbadmin <gdbadmin@sourceware.org>
Date: Fri Feb 1 00:00:03 2013 +0000
*** empty log message ***
commit 58cbfb174637c250d4cf8f3d9902303eba1a2aa5
Author: Alan Modra <amodra@bigpond.net.au>
Date: Thu Jan 31 23:00:04 2013 +0000
daily update
commit b159cecffc20708e74ef7fe34e05a8223156e562
Author: Tom Tromey <tromey@redhat.com>
Date: Thu Jan 31 19:55:15 2013 +0000
* jit.c (jit_program_space_data): Rename from jit_inferior_data;
change type.
(struct jit_program_space_data): Rename from jit_inferior_data.
Update comments.
(get_jit_program_space_data): Rename from get_jit_inferior_data.
Change return type. Attach data to program space.
(jit_program_space_data_cleanup): Rename from
jit_inferior_data_cleanup; change argument type.
(jit_read_descriptor): Change 'inf_data' argument to 'ps_data',
change type.
(jit_register_code): Update.
(jit_update_inferior_cache): Remove.
(jit_breakpoint_deleted): Get jit data from the location's program
space.
(jit_breakpoint_re_set_internal): Rename 'inf_data' argument to
'ps_data', change type.
(jit_inferior_init, jit_breakpoint_re_set_internal)
(jit_event_handler): Update.
(free_objfile_data): Get data from objfile's program space.
(_initialize_jit): Update.
commit 8be2de3f7798e372c0be3894b570f3f56b25fd08
Author: Tom Tromey <tromey@redhat.com>
Date: Thu Jan 31 19:52:02 2013 +0000
PR gdb/13987:
* jit.c (struct jit_inferior_data) <cached_code_address,
jit_breakpoint>: New fields.
(jit_breakpoint_re_set_internal): Fix logging. Only create
breakpoint if cached address has changed.
(jit_update_inferior_cache, jit_breakpoint_deleted): New
functions.
(_initialize_jit): Register breakpoint deleted observer.
gdb/testsuite
* gdb.base/jit.exp (compile_jit_test): New proc.
Add PIE tests.
commit a0bbccb0896ea3b18b56cc337b28b5513169fce8
Author: Aleksandar Ristovski <aristovski@qnx.com>
Date: Thu Jan 31 19:18:57 2013 +0000
2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
* infrun.c (handle_syscall_event): Remove unused gdbarch.
(save_infcall_suspend_state): Ifdef out unused inf.
(restore_infcall_suspend_state): Ifdef out unused inf.
* jit.c (jit_register_code): Remove unused i, b, inf_data.
(jit_frame_sniffer): Remove unused inf_data.
Reference: http://sourceware.org/ml/gdb-patches/2013-01/msg00773.html
commit 186cc2fc60622fe5f8ed5f5155afffba89a980c2
Author: Aleksandar Ristovski <aristovski@qnx.com>
Date: Thu Jan 31 18:46:11 2013 +0000
2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
* c-exp.y (classify_inner_name): Remove unused type.
* c-lang.c (c_printstr): Remove unused byte_order, i, things_printed,
in_quotes, need_comma, wchar_buf, output, cleanup, iter, finished,
need_escape.
(c_get_string): Remove unused kind.
* c-typeprint.c (c_type_print_args): Remove unused i, len, args, table2.
Reference: http://sourceware.org/ml/gdb-patches/2013-01/msg00759.html
commit b8bd96eae0f0e99236bc5d3cb23cd5c75e73aa31
Author: Aleksandar Ristovski <aristovski@qnx.com>
Date: Thu Jan 31 18:37:35 2013 +0000
2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
* charset.c (intermediate_encoding): Remove unused i.
* completer.c (signal_completer): Remove unused i.
* continuations.c (discard_my_continuations_1): Remove unused
continuation_ptr.
* corelow.c (core_close): Remove unuseD name.
(get_core_siginfo): Remove unused pid.
* cp-namespace.c (cp_lookup_symbol_imports_or_template): Remove unused
i, cps.
* dwarf2loc.c (dwarf2_compile_expr_to_ax): Remove unused base_offset.
(loclist_describe_location): Remove unused first.
* event-top.c (command_line_handler): Remove unused got_eof.
* exec.c (exec_close_1): Remove unused need_symtab_cleanup.
(resize_section_table): Remove unused old_value.
* gdb_bfd.c (gdb_bfd_map_section): Remove unused header.
* gnu-v3-abi.c (compute_vtable_size): Remove unused addr.
* i386-tdep.c (i386_process_record): Remove unused rex.
* infcmd.c (get_return_value): Remove unused uiout.
* jv-lang.c (type_from_class): Remove unused is_array.
* jv-valprint.c (java_val_print): Remove unused i.
* linux-nat.c (linux_nat_stop_lwp): Remove unused ptid.
* linux-thread-db.c (thread_db_find_new_threads_2): Remove unuseD pid.
* m2-typeprint.c (m2_print_type): Remove unused code.
* macroexp.c (get_character_constant): Remove unused body_start.
(macro_stringify): Remove unused result.
* objc-lang.c (find_methods): Remove unused gdbarch.
* objfiles.c (filter_overlapping_sections): Remove unused abfd1, abfd2.
* regcache.c (regcache_cooked_read): Remove unused gdbarch.
* stack.c (print_frame_args): Remove unused summary.
* thread.c (thread_apply_command): Remove unused p.
* valarith.c (value_x_unop): Remove unused mangle_ptr.
* valops.c (search_struct_method): Remove unused skip.
* valprint.c (generic_val_print): Remove unused byte_order.
* varobj.c (varobj_update): Remove unused changed.
* cli/cli-cmds.c (complete_command): Remove unused next_item.
(alias_command): Remove unused c.
* mi/mi-cmd-catch.c (mi_catch_load_unload): Remove unused c.
* mi/mi-main.c (mi_cmd_data_write_register_values): Remove unused
format.
(mi_cmd_data_write_memory): Remove unused word_format.
(mi_cmd_data_write_memory_bytes): Remove unused r.
* python/py-gdb-readline.c (gdbpy_readline_wrapper): Remove unused
p_start, p_end.
* python/python.c (_initialize_python): Remove unused cmd_name, cmd.
* tui/tui-disasm.c (tui_set_disassem_content): Remove unused
line_width.
Reference: http://sourceware.org/ml/gdb-patches/2013-01/msg00766.html
commit 6d0b14096c833308fc7df9b270f8530cd092650a
Author: Aleksandar Ristovski <aristovski@qnx.com>
Date: Thu Jan 31 18:31:48 2013 +0000
2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
* dwarf2-frame.c (dwarf2_compile_cfa_to_ax): Remove unused num_regs.
* symtab.c (iterate_over_symtabs): Remove unused s.
(find_pc_sect_symtab): Remove unused pspAce.
(find_pc_sect_line): Remove unused alt_symtab.
(find_pcs_for_symtab_line): Remove unused ix, previous_function.
(completion_list_add_name): Remove unused newsize.
Reference: http://sourceware.org/ml/gdb-patches/2013-01/msg00764.html
commit 27fd2ffc85ffa64e53306d04abc1b2ada2a26e9a
Author: Tom Tromey <tromey@redhat.com>
Date: Thu Jan 31 17:41:05 2013 +0000
PR c++/14998:
* dwarf2read.c (read_tag_ptr_to_member_type): Handle
TYPE_CODE_FUNC.
gdb/testsuite
* gdb.dwarf2/method-ptr.cc: New file.
* gdb.dwarf2/method-ptr.exp: New file.
commit 13c9b7e12d21ed6403f66bd5d12b7f2509123f89
Author: Tom Tromey <tromey@redhat.com>
Date: Thu Jan 31 17:32:33 2013 +0000
* lib/dwarf.exp (namespace Dwarf): New.
commit d5ba5b9794399e2e69f573fc90c54cb9487984b6
Author: Aleksandar Ristovski <aristovski@qnx.com>
Date: Thu Jan 31 16:32:42 2013 +0000
2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
* target.c (target_read_string): Remove unused origlen.
Reference: http://sourceware.org/ml/gdb-patches/2013-01/msg00754.html
commit 9b5d917dcdfe1f9c6af1676df8b5fd6b21651257
Author: Aleksandar Ristovski <aristovski@qnx.com>
Date: Thu Jan 31 16:27:45 2013 +0000
2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
* auto-load.c (auto_load_expand_dir_vars): Remove unused dir_vec.
* ax-gdb.c (gen_printf): Remove unused expr, i, bot, fr, flen, fmt.
* ax-general.c (ax_print): Remove unused is_float.
* blockframe.c (block_innermost_frame): Remove unused start, end.
* break-catch-sig.c (catch_signal_command): Remove unused gdbarch.
Reference: http://sourceware.org/ml/gdb-patches/2013-01/msg00752.html
commit 5c424db3dfe023da2beba5b9035950e97d2e1c70
Author: Tom Tromey <tromey@redhat.com>
Date: Thu Jan 31 16:06:47 2013 +0000
* gdb.texinfo (Target Commands): Fix typo.
commit aeeb9a4d35c32b6df818bc149a831a65ca2c6924
Author: Aleksandar Ristovski <aristovski@qnx.com>
Date: Thu Jan 31 13:52:49 2013 +0000
* solib-svr4.c (svr4_keep_data_in_core): Remove unused lmo.
(svr4_read_so_list): Remove unused lmo.
* solib-target.c (solib_target_relocate_section_addresses): Remove
unused flags.
Reference: http://sourceware.org/ml/gdb-patches/2013-01/msg00744.html
commit 06c12972e5e656bdc30930d3435fa91e84f6eb37
Author: Tristan Gingold <gingold@adacore.com>
Date: Thu Jan 31 09:55:40 2013 +0000
2013-01-31 Tristan Gingold <gingold@adacore.com>
* mach-o.c (bfd_mach_o_scan): Call bfd_mach_o_flatten_sections
earlier. Fix status checking of bfd_mach_o_scan_start_address.
(bfd_mach_o_scan_start_address): Handle LC_MAIN.
commit 2e1861546a3200f4b98c889a3c4a57fd19145a2e
Author: Kai Tietz <kai.tietz@onevision.com>
Date: Thu Jan 31 08:10:37 2013 +0000
PR other/543413
* md5.c (md5_process_block): Handle case that size_t is
a wider-integer-scalar a 32-bit unsigned integer.
commit ec8b361c688b220ed5392aa14c50cca04da28fe0
Author: Alan Modra <amodra@bigpond.net.au>
Date: Thu Jan 31 07:32:44 2013 +0000
PR ld/15056
* elfxx-sparc.c (_bfd_sparc_elf_gc_mark_hook): Handle implicit
references to __tls_get_addr.
* elf32-tilpro.c (tilepro_elf_gc_mark_hook): Likewise. Correct
vtinherit and vtentry reloc handling too.
* elfxx-tilegx.c (tilegx_elf_gc_mark_hook): As for tilepro.
commit d08f6e9e44366b755fc0ce32d96f18225e1891fd
Author: Alan Modra <amodra@bigpond.net.au>
Date: Thu Jan 31 06:28:45 2013 +0000
bfd/
* elf64-ppc.c (ppc_stub_name): Trim off trailing "+0".
ld/testsuite/
* ld-powerpc/tlsexe.d: Update for changed stub names.
* ld-powerpc/tlsexe.r: Likewise.
* ld-powerpc/tlsexetoc.d: Likewise.
* ld-powerpc/tlsexetoc.r: Likewise.
* ld-powerpc/tlsso.d: Likewise.
* ld-powerpc/tlsso.r: Likewise.
* ld-powerpc/tlstocso.d: Likewise.
* ld-powerpc/tlstocso.r: Likewise.
commit 38974e8a375a2c70629e58351dae85375ef4d380
Author: gdbadmin <gdbadmin@sourceware.org>
Date: Thu Jan 31 00:00:03 2013 +0000
*** empty log message ***
commit 7ded62da0d1e873b1b86018f16b442b46347124c
Author: Alan Modra <amodra@bigpond.net.au>
Date: Wed Jan 30 23:00:04 2013 +0000
daily update
commit bf3ef00700fd866218020f1d67138dd64986a637
Author: Alan Modra <amodra@bigpond.net.au>
Date: Wed Jan 30 22:31:30 2013 +0000
* elf64-ppc.c (build_plt_stub): Correct plt stub branch to glink.
commit bf056ec3c9f4f3ce83cb45ea310c3dd676c877ea
Author: Tom Tromey <tromey@redhat.com>
Date: Wed Jan 30 20:42:11 2013 +0000
* hppa-tdep.c (read_unwind_info): Use SECT_OFF_TEXT, not "0".
commit d3e3baae6bb3881df8adb6fdf52225c4987f5284
Author: Tom Tromey <tromey@redhat.com>
Date: Wed Jan 30 20:37:58 2013 +0000
* symfile.c (get_file_crc): Use bfd_calc_gnu_debuglink_crc32.
* utils.c (gnu_debuglink_crc32): Remove.
* utils.h (gnu_debuglink_crc32): Don't declare.
commit 34cc7b068b8d9e8a9155b00b28e74698f571e709
Author: Tom Tromey <tromey@redhat.com>
Date: Wed Jan 30 18:45:33 2013 +0000
* dwarf2read.c (compute_delayed_physnames, read_call_site_scope)
(read_structure_type, read_enumeration_type): Remove cast.
commit cd4facd7eba6fe3566a33154ece3b6448ec6b8db
Author: Tom Tromey <tromey@redhat.com>
Date: Wed Jan 30 17:19:51 2013 +0000
* dwarf2read.c (read_namespace_type): Remove cast.
(read_typedef): Likewise.
commit f281ee6ef8632b17fd43f6db89af5e6b4286f3a6
Author: Kai Tietz <kai.tietz@onevision.com>
Date: Wed Jan 30 16:52:34 2013 +0000
PR other/54620
PR target/39064
* md5.h (md5_uintptr, md5_uint32): Define as uintptr_t/uint32_t if
stdint.h and sys/types.h headers are present.
* sha1.h (sha1_uintptr, sha1_uint32): Likewise.
commit 02998939238cb637e10ad20269cbafeb6d969ec7
Author: yufeng <yufeng>
Date: Wed Jan 30 15:43:31 2013 +0000
include/opcode/
2013-01-30 Yufeng Zhang <yufeng.zhang@arm.com>
* aarch64.h (aarch64_op): Add OP_SXTL, OP_SXTL2, OP_UXTL and OP_UXTL2.
opcodes/
2013-01-30 Yufeng Zhang <yufeng.zhang@arm.com>
* aarch64-tbl.h (aarch64_opcode_table): Flag sshll, sshll2, ushll and
ushll2 with F_HAS_ALIAS. Add entries for sxtl, sxtl2, uxtl and uxtl2.
* aarch64-asm.c (convert_xtl_to_shll): New function.
(convert_to_real): Handle OP_SXTL, OP_SXTL2, OP_UXTL and OP_UXTL2 by
calling convert_xtl_to_shll.
* aarch64-dis.c (convert_shll_to_xtl): New function.
(convert_to_alias): Handle OP_SXTL, OP_SXTL2, OP_UXTL and OP_UXTL2 by
calling convert_shll_to_xtl.
* aarch64-gen.c: Update copyright year.
* aarch64-asm-2.c: Re-generate.
* aarch64-dis-2.c: Re-generate.
* aarch64-opc-2.c: Re-generate.
gas/testsuite/
2013-01-30 Yufeng Zhang <yufeng.zhang@arm.com>
* gas/aarch64/alias.s: Add new tests.
* gas/aarch64/alias.d: Update.
* gas/aarch64/no-aliases.d: Update.
commit a17222dbc801b5ce71cdd27f163297136e6890e6
Author: Alan Modra <amodra@bigpond.net.au>
Date: Wed Jan 30 10:07:26 2013 +0000
revert last commit
-----------------------------------------------------------------------
Summary of changes:
bfd/ChangeLog | 29 +
bfd/elf32-rx.c | 14 +-
bfd/elf32-tilepro.c | 32 +-
bfd/elf64-ppc.c | 37 +-
bfd/elfxx-sparc.c | 23 +
bfd/elfxx-tilegx.c | 32 +-
bfd/mach-o.c | 17 +-
bfd/version.h | 2 +-
gdb/ChangeLog | 153 +++++
gdb/auto-load.c | 1 -
gdb/ax-gdb.c | 4 +-
gdb/ax-general.c | 3 -
gdb/blockframe.c | 5 -
gdb/break-catch-sig.c | 1 -
gdb/c-exp.y | 2 +-
gdb/c-lang.c | 16 +-
gdb/c-typeprint.c | 6 +-
gdb/charset.c | 1 -
gdb/cli/cli-cmds.c | 3 -
gdb/completer.c | 1 -
gdb/continuations.c | 2 -
gdb/corelow.c | 3 -
gdb/cp-namespace.c | 4 -
gdb/doc/ChangeLog | 4 +
gdb/doc/gdb.texinfo | 2 +-
gdb/dwarf2-frame.c | 2 -
gdb/dwarf2loc.c | 2 -
gdb/dwarf2read.c | 21 +-
gdb/event-top.c | 3 -
gdb/exec.c | 8 +-
gdb/gdb_bfd.c | 1 -
gdb/gnu-v3-abi.c | 1 -
gdb/hppa-tdep.c | 2 +-
gdb/i386-tdep.c | 2 -
gdb/infcmd.c | 1 -
gdb/infrun.c | 6 +-
gdb/jit.c | 166 ++++--
gdb/jv-lang.c | 2 -
gdb/jv-valprint.c | 1 -
gdb/linux-nat.c | 2 -
gdb/linux-thread-db.c | 1 -
gdb/m2-typeprint.c | 3 -
gdb/macroexp.c | 3 -
gdb/mi/mi-cmd-catch.c | 1 -
gdb/mi/mi-main.c | 9 +-
gdb/objc-lang.c | 2 -
gdb/objfiles.c | 3 -
gdb/python/py-gdb-readline.c | 2 +-
gdb/python/python.c | 2 -
gdb/regcache.c | 2 -
gdb/solib-svr4.c | 3 -
gdb/solib-target.c | 1 -
gdb/stack.c | 2 -
gdb/symfile.c | 2 +-
gdb/symtab.c | 15 +-
gdb/target.c | 4 +-
gdb/testsuite/ChangeLog | 20 +
gdb/testsuite/gdb.base/jit.exp | 60 ++-
gdb/testsuite/gdb.dwarf2/method-ptr.cc | 21 +
gdb/testsuite/gdb.dwarf2/method-ptr.exp | 97 +++
gdb/testsuite/lib/dwarf.exp | 729 ++++++++++++++++++++++
gdb/thread.c | 1 -
gdb/tui/tui-disasm.c | 4 +-
gdb/utils.c | 70 ---
gdb/utils.h | 3 -
gdb/valarith.c | 3 +-
gdb/valops.c | 1 -
gdb/valprint.c | 1 -
gdb/varobj.c | 1 -
gdb/version.in | 2 +-
include/ChangeLog | 8 +
include/md5.h | 5 +
include/opcode/ChangeLog | 4 +
include/opcode/aarch64.h | 7 +-
include/sha1.h | 5 +
libiberty/ChangeLog | 6 +
libiberty/md5.c | 3 +-
opcodes/ChangeLog | 15 +
opcodes/aarch64-asm-2.c | 218 ++++----
opcodes/aarch64-asm.c | 18 +-
opcodes/aarch64-dis-2.c | 1006 ++++++++++++++++---------------
opcodes/aarch64-dis.c | 21 +-
opcodes/aarch64-gen.c | 4 +-
opcodes/aarch64-opc-2.c | 97 ++--
opcodes/aarch64-tbl.h | 12 +-
85 files changed, 2117 insertions(+), 997 deletions(-)
create mode 100644 gdb/testsuite/gdb.dwarf2/method-ptr.cc
create mode 100644 gdb/testsuite/gdb.dwarf2/method-ptr.exp
First 500 lines of diff:
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index ff85ec7..7614ca0 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,32 @@
+2013-02-01 Alan Modra <amodra@gmail.com>
+
+ * elf64-ppc.c (dec_dynrel_count): Don't error when elf_gc_sweep_symbol
+ clears def_regular.
+
+2013-01-31 Tristan Gingold <gingold@adacore.com>
+
+ * mach-o.c (bfd_mach_o_scan): Call bfd_mach_o_flatten_sections
+ earlier. Fix status checking of bfd_mach_o_scan_start_address.
+ (bfd_mach_o_scan_start_address): Handle LC_MAIN.
+
+2013-01-31 Alan Modra <amodra@gmail.com>
+ David S. Miller <davem@davemloft.net>
+
+ PR ld/15056
+ * elfxx-sparc.c (_bfd_sparc_elf_gc_mark_hook): Handle implicit
+ references to __tls_get_addr.
+ * elf32-tilpro.c (tilepro_elf_gc_mark_hook): Likewise. Correct
+ vtinherit and vtentry reloc handling too.
+ * elfxx-tilegx.c (tilegx_elf_gc_mark_hook): As for tilepro.
+
+2013-01-31 Alan Modra <amodra@gmail.com>
+
+ * elf64-ppc.c (ppc_stub_name): Trim off trailing "+0".
+
+2013-01-31 Alan Modra <amodra@gmail.com>
+
+ * elf64-ppc.c (build_plt_stub): Correct plt stub branch to glink.
+
2013-01-28 Alan Modra <amodra@gmail.com>
* elf64-ppc.c: Use %T to print symbols names and remove redundant
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 8b61142..5000eb7 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -3098,15 +3098,9 @@ rx_elf_object_p (bfd * abfd)
{
Elf_Internal_Shdr *sec = elf_tdata(abfd)->elf_sect_ptr[u];
-<<<<<<< elf32-rx.c
- if (phdr[i].p_offset <= (bfd_vma) sec->sh_offset
- && (bfd_vma)sec->sh_offset <= phdr[i].p_offset + (phdr[i].p_filesz - 1)
- && sec->sh_size > 0)
-=======
if (phdr[i].p_filesz
&& phdr[i].p_offset <= (bfd_vma) sec->sh_offset
&& (bfd_vma)sec->sh_offset <= phdr[i].p_offset + (phdr[i].p_filesz - 1))
->>>>>>> 1.20
{
/* Found one! The difference between the two addresses,
plus the difference between the two file offsets, is
@@ -3119,7 +3113,7 @@ rx_elf_object_p (bfd * abfd)
The correct LMA for the section is fffc0140 + (2050-2010).
*/
- phdr[i].p_vaddr = sec->sh_addr - (sec->sh_offset - phdr[i].p_offset);
+ phdr[i].p_vaddr = sec->sh_addr + (sec->sh_offset - phdr[i].p_offset);
break;
}
}
@@ -3129,15 +3123,9 @@ rx_elf_object_p (bfd * abfd)
bsec = abfd->sections;
while (bsec)
{
-<<<<<<< elf32-rx.c
- if (bsec->flags & (SEC_LOAD | SEC_ALLOC)
- && phdr[i].p_offset <= (bfd_vma) bsec->filepos
- && (bfd_vma) bsec->filepos <= phdr[i].p_offset + (phdr[i].p_filesz - 1))
-=======
if (phdr[i].p_filesz
&& phdr[i].p_vaddr <= bsec->vma
&& bsec->vma <= phdr[i].p_vaddr + (phdr[i].p_filesz - 1))
->>>>>>> 1.20
{
bsec->lma = phdr[i].p_paddr + (bsec->vma - phdr[i].p_vaddr);
}
diff --git a/bfd/elf32-tilepro.c b/bfd/elf32-tilepro.c
index fc49e2b..db37403 100644
--- a/bfd/elf32-tilepro.c
+++ b/bfd/elf32-tilepro.c
@@ -1868,11 +1868,33 @@ tilepro_elf_gc_mark_hook (asection *sec,
if (h != NULL)
{
switch (ELF32_R_TYPE (rel->r_info))
- {
- case R_TILEPRO_GNU_VTINHERIT:
- case R_TILEPRO_GNU_VTENTRY:
- break;
- }
+ {
+ case R_TILEPRO_GNU_VTINHERIT:
+ case R_TILEPRO_GNU_VTENTRY:
+ return NULL;
+ }
+ }
+
+ /* FIXME: The test here, in check_relocs and in relocate_section
+ dealing with TLS optimization, ought to be !info->executable. */
+ if (info->shared)
+ {
+ switch (ELF32_R_TYPE (rel->r_info))
+ {
+ case R_TILEPRO_TLS_GD_CALL:
+ /* This reloc implicitly references __tls_get_addr. We know
+ another reloc will reference the same symbol as the one
+ on this reloc, so the real symbol and section will be
+ gc marked when processing the other reloc. That lets
+ us handle __tls_get_addr here. */
+ h = elf_link_hash_lookup (elf_hash_table (info), "__tls_get_addr",
+ FALSE, FALSE, TRUE);
+ BFD_ASSERT (h != NULL);
+ h->mark = 1;
+ if (h->u.weakdef != NULL)
+ h->u.weakdef->mark = 1;
+ sym = NULL;
+ }
}
return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
diff --git a/bfd/elf64-ppc.c b/bfd/elf64-ppc.c
index 2f6999b..310b9d6 100644
--- a/bfd/elf64-ppc.c
+++ b/bfd/elf64-ppc.c
@@ -4074,7 +4074,7 @@ ppc_stub_name (const asection *input_section,
const Elf_Internal_Rela *rel)
{
char *stub_name;
- bfd_size_type len;
+ ssize_t len;
/* rel->r_addend is actually 64 bit, but who uses more than +/- 2^31
offsets from a sym as a branch target? In fact, we could
@@ -4088,10 +4088,10 @@ ppc_stub_name (const asection *input_section,
if (stub_name == NULL)
return stub_name;
- sprintf (stub_name, "%08x.%s+%x",
- input_section->id & 0xffffffff,
- h->elf.root.root.string,
- (int) rel->r_addend & 0xffffffff);
+ len = sprintf (stub_name, "%08x.%s+%x",
+ input_section->id & 0xffffffff,
+ h->elf.root.root.string,
+ (int) rel->r_addend & 0xffffffff);
}
else
{
@@ -4100,13 +4100,13 @@ ppc_stub_name (const asection *input_section,
if (stub_name == NULL)
return stub_name;
- sprintf (stub_name, "%08x.%x:%x+%x",
- input_section->id & 0xffffffff,
- sym_sec->id & 0xffffffff,
- (int) ELF64_R_SYM (rel->r_info) & 0xffffffff,
- (int) rel->r_addend & 0xffffffff);
+ len = sprintf (stub_name, "%08x.%x:%x+%x",
+ input_section->id & 0xffffffff,
+ sym_sec->id & 0xffffffff,
+ (int) ELF64_R_SYM (rel->r_info) & 0xffffffff,
+ (int) rel->r_addend & 0xffffffff);
}
- if (stub_name[len - 2] == '+' && stub_name[len - 1] == '0')
+ if (len > 2 && stub_name[len - 2] == '+' && stub_name[len - 1] == '0')
stub_name[len - 2] = 0;
return stub_name;
}
@@ -7056,14 +7056,15 @@ dec_dynrel_count (bfd_vma r_info,
void *vpp = &elf_section_data (sec)->local_dynrel;
pp = (struct elf_dyn_relocs **) vpp;
}
-
- /* elf_gc_sweep may have already removed all dyn relocs associated
- with local syms for a given section. Don't report a dynreloc
- miscount. */
- if (*pp == NULL)
- return TRUE;
}
+ /* elf_gc_sweep may have already removed all dyn relocs associated
+ with local syms for a given section. Also, symbol flags are
+ changed by elf_gc_sweep_symbol, confusing the test above. Don't
+ report a dynreloc miscount. */
+ if (*pp == NULL && info->gc_sections)
+ return TRUE;
+
while ((p = *pp) != NULL)
{
if (p->sec == sec)
@@ -9772,7 +9773,7 @@ build_plt_stub (struct ppc_link_hash_table *htab,
{
bfd_put_32 (obfd, CMPLDI_R2_0, p), p += 4;
bfd_put_32 (obfd, BNECTR_P4, p), p += 4;
- bfd_put_32 (obfd, B_DOT + cmp_branch_off, p), p += 4;
+ bfd_put_32 (obfd, B_DOT | (cmp_branch_off & 0x3fffffc), p), p += 4;
}
else
bfd_put_32 (obfd, BCTR, p), p += 4;
diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index 196d566..9684ffd 100644
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -1873,6 +1873,29 @@ _bfd_sparc_elf_gc_mark_hook (asection *sec,
return NULL;
}
+ /* FIXME: The test here, in check_relocs and in relocate_section
+ dealing with TLS optimization, ought to be !info->executable. */
+ if (info->shared)
+ {
+ switch (SPARC_ELF_R_TYPE (rel->r_info))
+ {
+ case R_SPARC_TLS_GD_CALL:
+ case R_SPARC_TLS_LDM_CALL:
+ /* This reloc implicitly references __tls_get_addr. We know
+ another reloc will reference the same symbol as the one
+ on this reloc, so the real symbol and section will be
+ gc marked when processing the other reloc. That lets
+ us handle __tls_get_addr here. */
+ h = elf_link_hash_lookup (elf_hash_table (info), "__tls_get_addr",
+ FALSE, FALSE, TRUE);
+ BFD_ASSERT (h != NULL);
+ h->mark = 1;
+ if (h->u.weakdef != NULL)
+ h->u.weakdef->mark = 1;
+ sym = NULL;
+ }
+ }
+
return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
}
diff --git a/bfd/elfxx-tilegx.c b/bfd/elfxx-tilegx.c
index b28d1a8..cd92bf9 100644
--- a/bfd/elfxx-tilegx.c
+++ b/bfd/elfxx-tilegx.c
@@ -2107,11 +2107,33 @@ tilegx_elf_gc_mark_hook (asection *sec,
if (h != NULL)
{
switch (TILEGX_ELF_R_TYPE (rel->r_info))
- {
- case R_TILEGX_GNU_VTINHERIT:
- case R_TILEGX_GNU_VTENTRY:
- break;
- }
+ {
+ case R_TILEGX_GNU_VTINHERIT:
+ case R_TILEGX_GNU_VTENTRY:
+ return NULL;
+ }
+ }
+
+ /* FIXME: The test here, in check_relocs and in relocate_section
+ dealing with TLS optimization, ought to be !info->executable. */
+ if (info->shared)
+ {
+ switch (TILEGX_ELF_R_TYPE (rel->r_info))
+ {
+ case R_TILEGX_TLS_GD_CALL:
+ /* This reloc implicitly references __tls_get_addr. We know
+ another reloc will reference the same symbol as the one
+ on this reloc, so the real symbol and section will be
+ gc marked when processing the other reloc. That lets
+ us handle __tls_get_addr here. */
+ h = elf_link_hash_lookup (elf_hash_table (info), "__tls_get_addr",
+ FALSE, FALSE, TRUE);
+ BFD_ASSERT (h != NULL);
+ h->mark = 1;
+ if (h->u.weakdef != NULL)
+ h->u.weakdef->mark = 1;
+ sym = NULL;
+ }
}
return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym);
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 7f4b968..e3bfa58 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -3979,6 +3979,18 @@ bfd_mach_o_scan_start_address (bfd *abfd)
cmd = &mdata->commands[i].command.thread;
break;
}
+ else if (mdata->commands[i].type == BFD_MACH_O_LC_MAIN
+ && mdata->nsects > 1)
+ {
+ bfd_mach_o_main_command *main_cmd = &mdata->commands[i].command.main;
+ bfd_mach_o_section *text_sect = mdata->sections[0];
+ if (text_sect)
+ {
+ abfd->start_address = main_cmd->entryoff
+ + (text_sect->addr - text_sect->offset);
+ return TRUE;
+ }
+ }
if (cmd == NULL)
return FALSE;
@@ -4121,10 +4133,11 @@ bfd_mach_o_scan (bfd *abfd,
}
}
- if (bfd_mach_o_scan_start_address (abfd) < 0)
+ /* Sections should be flatten before scanning start address. */
+ bfd_mach_o_flatten_sections (abfd);
+ if (!bfd_mach_o_scan_start_address (abfd))
return FALSE;
- bfd_mach_o_flatten_sections (abfd);
return TRUE;
}
diff --git a/bfd/version.h b/bfd/version.h
index f257eda..0e43552 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20130130
+#define BFD_VERSION_DATE 20130201
#define BFD_VERSION @bfd_version@
#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@
#define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 9b2193b..e4cbe05 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,156 @@
+2013-01-31 Tom Tromey <tromey@redhat.com>
+
+ * jit.c (jit_program_space_data): Rename from jit_inferior_data;
+ change type.
+ (struct jit_program_space_data): Rename from jit_inferior_data.
+ Update comments.
+ (get_jit_program_space_data): Rename from get_jit_inferior_data.
+ Change return type. Attach data to program space.
+ (jit_program_space_data_cleanup): Rename from
+ jit_inferior_data_cleanup; change argument type.
+ (jit_read_descriptor): Change 'inf_data' argument to 'ps_data',
+ change type.
+ (jit_register_code): Update.
+ (jit_update_inferior_cache): Remove.
+ (jit_breakpoint_deleted): Get jit data from the location's program
+ space.
+ (jit_breakpoint_re_set_internal): Rename 'inf_data' argument to
+ 'ps_data', change type.
+ (jit_inferior_init, jit_breakpoint_re_set_internal)
+ (jit_event_handler): Update.
+ (free_objfile_data): Get data from objfile's program space.
+ (_initialize_jit): Update.
+
+2013-01-31 Tom Tromey <tromey@redhat.com>
+
+ PR gdb/13987:
+ * jit.c (struct jit_inferior_data) <cached_code_address,
+ jit_breakpoint>: New fields.
+ (jit_breakpoint_re_set_internal): Fix logging. Only create
+ breakpoint if cached address has changed.
+ (jit_update_inferior_cache, jit_breakpoint_deleted): New
+ functions.
+ (_initialize_jit): Register breakpoint deleted observer.
+
+2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * infrun.c (handle_syscall_event): Remove unused gdbarch.
+ (save_infcall_suspend_state): Ifdef out unused inf.
+ (restore_infcall_suspend_state): Ifdef out unused inf.
+ * jit.c (jit_register_code): Remove unused i, b, inf_data.
+ (jit_frame_sniffer): Remove unused inf_data.
+
+2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * c-exp.y (classify_inner_name): Remove unused type.
+ * c-lang.c (c_printstr): Remove unused byte_order, i, things_printed,
+ in_quotes, need_comma, wchar_buf, output, cleanup, iter, finished,
+ need_escape.
+ (c_get_string): Remove unused kind.
+ * c-typeprint.c (c_type_print_args): Remove unused i, len, args, table2.
+
+2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * charset.c (intermediate_encoding): Remove unused i.
+ * completer.c (signal_completer): Remove unused i.
+ * continuations.c (discard_my_continuations_1): Remove unused
+ continuation_ptr.
+ * corelow.c (core_close): Remove unuseD name.
+ (get_core_siginfo): Remove unused pid.
+ * cp-namespace.c (cp_lookup_symbol_imports_or_template): Remove unused
+ i, cps.
+ * dwarf2loc.c (dwarf2_compile_expr_to_ax): Remove unused base_offset.
+ (loclist_describe_location): Remove unused first.
+ * event-top.c (command_line_handler): Remove unused got_eof.
+ * exec.c (exec_close_1): Remove unused need_symtab_cleanup.
+ (resize_section_table): Remove unused old_value.
+ * gdb_bfd.c (gdb_bfd_map_section): Remove unused header.
+ * gnu-v3-abi.c (compute_vtable_size): Remove unused addr.
+ * i386-tdep.c (i386_process_record): Remove unused rex.
+ * infcmd.c (get_return_value): Remove unused uiout.
+ * jv-lang.c (type_from_class): Remove unused is_array.
+ * jv-valprint.c (java_val_print): Remove unused i.
+ * linux-nat.c (linux_nat_stop_lwp): Remove unused ptid.
+ * linux-thread-db.c (thread_db_find_new_threads_2): Remove unuseD pid.
+ * m2-typeprint.c (m2_print_type): Remove unused code.
+ * macroexp.c (get_character_constant): Remove unused body_start.
+ (macro_stringify): Remove unused result.
+ * objc-lang.c (find_methods): Remove unused gdbarch.
+ * objfiles.c (filter_overlapping_sections): Remove unused abfd1, abfd2.
+ * regcache.c (regcache_cooked_read): Remove unused gdbarch.
+ * stack.c (print_frame_args): Remove unused summary.
+ * thread.c (thread_apply_command): Remove unused p.
+ * valarith.c (value_x_unop): Remove unused mangle_ptr.
+ * valops.c (search_struct_method): Remove unused skip.
+ * valprint.c (generic_val_print): Remove unused byte_order.
+ * varobj.c (varobj_update): Remove unused changed.
+ * cli/cli-cmds.c (complete_command): Remove unused next_item.
+ (alias_command): Remove unused c.
+ * mi/mi-cmd-catch.c (mi_catch_load_unload): Remove unused c.
+ * mi/mi-main.c (mi_cmd_data_write_register_values): Remove unused
+ format.
+ (mi_cmd_data_write_memory): Remove unused word_format.
+ (mi_cmd_data_write_memory_bytes): Remove unused r.
+ * python/py-gdb-readline.c (gdbpy_readline_wrapper): Remove unused
+ p_start, p_end.
+ * python/python.c (_initialize_python): Remove unused cmd_name, cmd.
+ * tui/tui-disasm.c (tui_set_disassem_content): Remove unused
+ line_width.
+
+2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * dwarf2-frame.c (dwarf2_compile_cfa_to_ax): Remove unused num_regs.
+ * symtab.c (iterate_over_symtabs): Remove unused s.
+ (find_pc_sect_symtab): Remove unused pspAce.
+ (find_pc_sect_line): Remove unused alt_symtab.
+ (find_pcs_for_symtab_line): Remove unused ix, previous_function.
+ (completion_list_add_name): Remove unused newsize.
+
+2013-01-31 Tom Tromey <tromey@redhat.com>
+
+ PR c++/14998:
+ * dwarf2read.c (read_tag_ptr_to_member_type): Handle
+ TYPE_CODE_FUNC.
+
+2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * target.c (target_read_string): Remove unused origlen.
+
+2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * auto-load.c (auto_load_expand_dir_vars): Remove unused dir_vec.
+ * ax-gdb.c (gen_printf): Remove unused expr, i, bot, fr, flen, fmt.
+ * ax-general.c (ax_print): Remove unused is_float.
+ * blockframe.c (block_innermost_frame): Remove unused start, end.
+ * break-catch-sig.c (catch_signal_command): Remove unused gdbarch.
+
+2013-01-31 Aleksandar Ristovski <aristovski@qnx.com>
+
+ * solib-svr4.c (svr4_keep_data_in_core): Remove unused lmo.
+ (svr4_read_so_list): Remove unused lmo.
+ * solib-target.c (solib_target_relocate_section_addresses): Remove
+ unused flags.
+
+2013-01-30 Tom Tromey <tromey@redhat.com>
+
+ * hppa-tdep.c (read_unwind_info): Use SECT_OFF_TEXT, not "0".
+
+2013-01-30 Tom Tromey <tromey@redhat.com>
+
+ * symfile.c (get_file_crc): Use bfd_calc_gnu_debuglink_crc32.
+ * utils.c (gnu_debuglink_crc32): Remove.
+ * utils.h (gnu_debuglink_crc32): Don't declare.
+
+2013-01-30 Tom Tromey <tromey@redhat.com>
+
+ * dwarf2read.c (compute_delayed_physnames, read_call_site_scope)
+ (read_structure_type, read_enumeration_type): Remove cast.
+
+2013-01-30 Tom Tromey <tromey@redhat.com>
+
+ * dwarf2read.c (read_namespace_type): Remove cast.
+ (read_typedef): Likewise.
+
2013-01-29 Tom Tromey <tromey@redhat.com>
* dwarf2read.c (free_dwo_file): Remove assert.
diff --git a/gdb/auto-load.c b/gdb/auto-load.c
index 850c704..b12995b 100644
--- a/gdb/auto-load.c
+++ b/gdb/auto-load.c
@@ -178,7 +178,6 @@ auto_load_expand_dir_vars (const char *string)
static void
auto_load_safe_path_vec_update (void)
{
- VEC (char_ptr) *dir_vec = NULL;
unsigned len;
int ix;
hooks/post-receive
--
Repository for Project Archer.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [SCM] archer-jankratochvil-absdir: Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
@ 2013-01-30 7:49 jkratoch
0 siblings, 0 replies; 4+ messages in thread
From: jkratoch @ 2013-01-30 7:49 UTC (permalink / raw)
To: archer-commits
The branch, archer-jankratochvil-absdir has been updated
via 025d7cc5769192751cd98fd9cd612b898eeb7cff (commit)
via fd0c7dc35038fbdb7d2bf076c42cc15a420422c2 (commit)
via 76807894080671c81d97f5547af2570ce63a80b1 (commit)
via 6cfc98a1dc3ca715d441c03cfc0e48871f5948f7 (commit)
via 6ebd1dbb3fc6ad7403c6db48346c6cdc22348229 (commit)
via 796e78c0466182ae00e3843799f837090e4df794 (commit)
via 29135d9f9b999b72e7458e1a13f6f0040bfb3914 (commit)
via 66d2941fa3af1574fa08cab6665c72179f082928 (commit)
via c1d614530db8b490b073ef16c1cc1da8370f7d1d (commit)
via 83ac2459dde5a41d76cdbb7fb85e592d526fa13c (commit)
via 9fd1ea27c149a20613b347f3bb1a463787591877 (commit)
via 8d4ef5bcb6c9a70b3f4124ffec43622687fae504 (commit)
via ac57bb335bda3e531626062ac35e613dea0c2e1a (commit)
via 11018aebae2f0c4854a2683cbd3c406e02e8b0a9 (commit)
via a11cceb12f0d95272384302574346ecfe1768d98 (commit)
via d8b160a8782cbfc3361081fdd79fb155f3823321 (commit)
via 187d93c2c778fdd9f49de1e20c62a723dc15836f (commit)
via e323bcf3eaaf20dc9afb357746084b6b7d880b8d (commit)
via ff85bceadfcc78c062cff48270d02bea04aed890 (commit)
via 4ab204323f61ab7814b4e4bb2b2f8093bf706c74 (commit)
via 548c06c4728203086d9f923b03448a9c8ff7ceec (commit)
from 529824ba8bb861477fd7d4c3c9f4b4442acc1cf0 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email.
- Log -----------------------------------------------------------------
commit 025d7cc5769192751cd98fd9cd612b898eeb7cff
Merge: 11018ae fd0c7dc
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:54 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
commit fd0c7dc35038fbdb7d2bf076c42cc15a420422c2
Merge: a11cceb 7680789
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:54 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix
commit 76807894080671c81d97f5547af2570ce63a80b1
Merge: bcd0702 6cfc98a
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:54 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel
commit 6cfc98a1dc3ca715d441c03cfc0e48871f5948f7
Merge: 2df4f62 6ebd1db
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:54 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal
commit 6ebd1dbb3fc6ad7403c6db48346c6cdc22348229
Merge: b5b9c11 796e78c
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:53 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab
commit 796e78c0466182ae00e3843799f837090e4df794
Merge: 88ca091 29135d9
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:53 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui
commit 29135d9f9b999b72e7458e1a13f6f0040bfb3914
Merge: 786a6f9 66d2941
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:53 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2
commit 66d2941fa3af1574fa08cab6665c72179f082928
Merge: dd67baf c1d6145
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:53 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config
commit c1d614530db8b490b073ef16c1cc1da8370f7d1d
Merge: 6d3b488 83ac245
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:52 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname' into xfullpath-locsymtab-isabs-expandfullname-tuifullname
commit 83ac2459dde5a41d76cdbb7fb85e592d526fa13c
Merge: bd35514 9fd1ea2
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:52 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs' into xfullpath-locsymtab-isabs-expandfullname
commit 9fd1ea27c149a20613b347f3bb1a463787591877
Merge: dfc0d77 8d4ef5b
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:52 2013 +0100
Merge branch 'xfullpath-locsymtab' into xfullpath-locsymtab-isabs
commit 8d4ef5bcb6c9a70b3f4124ffec43622687fae504
Merge: 9107110 ac57bb3
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:52 2013 +0100
Merge branch 'xfullpath' into xfullpath-locsymtab
commit ac57bb335bda3e531626062ac35e613dea0c2e1a
Merge: 039b041 ff85bce
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:47:51 2013 +0100
Merge remote-tracking branch 'gdb/master' into xfullpath
commit 11018aebae2f0c4854a2683cbd3c406e02e8b0a9
Merge: d8b160a a11cceb
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:45:02 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
Conflicts:
gdb/doc/gdb.texinfo
commit a11cceb12f0d95272384302574346ecfe1768d98
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:44:37 2013 +0100
.
commit d8b160a8782cbfc3361081fdd79fb155f3823321
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:43:16 2013 +0100
.
commit 187d93c2c778fdd9f49de1e20c62a723dc15836f
Merge: 529824b e323bcf
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:41:18 2013 +0100
Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default
commit e323bcf3eaaf20dc9afb357746084b6b7d880b8d
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed Jan 30 08:41:09 2013 +0100
.
commit ff85bceadfcc78c062cff48270d02bea04aed890
Author: gdbadmin <gdbadmin@sourceware.org>
Date: Wed Jan 30 00:00:34 2013 +0000
*** empty log message ***
commit 4ab204323f61ab7814b4e4bb2b2f8093bf706c74
Author: Alan Modra <amodra@bigpond.net.au>
Date: Tue Jan 29 23:00:05 2013 +0000
daily update
commit 548c06c4728203086d9f923b03448a9c8ff7ceec
Author: DJ Delorie <dj@delorie.com>
Date: Tue Jan 29 22:17:52 2013 +0000
* config/tc-rl78.c (rl78_cons_fix_new): Handle user-specified
relocs in .word/.etc statements.
-----------------------------------------------------------------------
Summary of changes:
bfd/elf32-rx.c | 14 +++++++++++++-
bfd/version.h | 2 +-
gdb/NEWS | 7 +++++--
gdb/doc/gdb.texinfo | 6 ++++++
gdb/version.in | 2 +-
5 files changed, 26 insertions(+), 5 deletions(-)
First 500 lines of diff:
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 5000eb7..8b61142 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -3098,9 +3098,15 @@ rx_elf_object_p (bfd * abfd)
{
Elf_Internal_Shdr *sec = elf_tdata(abfd)->elf_sect_ptr[u];
+<<<<<<< elf32-rx.c
+ if (phdr[i].p_offset <= (bfd_vma) sec->sh_offset
+ && (bfd_vma)sec->sh_offset <= phdr[i].p_offset + (phdr[i].p_filesz - 1)
+ && sec->sh_size > 0)
+=======
if (phdr[i].p_filesz
&& phdr[i].p_offset <= (bfd_vma) sec->sh_offset
&& (bfd_vma)sec->sh_offset <= phdr[i].p_offset + (phdr[i].p_filesz - 1))
+>>>>>>> 1.20
{
/* Found one! The difference between the two addresses,
plus the difference between the two file offsets, is
@@ -3113,7 +3119,7 @@ rx_elf_object_p (bfd * abfd)
The correct LMA for the section is fffc0140 + (2050-2010).
*/
- phdr[i].p_vaddr = sec->sh_addr + (sec->sh_offset - phdr[i].p_offset);
+ phdr[i].p_vaddr = sec->sh_addr - (sec->sh_offset - phdr[i].p_offset);
break;
}
}
@@ -3123,9 +3129,15 @@ rx_elf_object_p (bfd * abfd)
bsec = abfd->sections;
while (bsec)
{
+<<<<<<< elf32-rx.c
+ if (bsec->flags & (SEC_LOAD | SEC_ALLOC)
+ && phdr[i].p_offset <= (bfd_vma) bsec->filepos
+ && (bfd_vma) bsec->filepos <= phdr[i].p_offset + (phdr[i].p_filesz - 1))
+=======
if (phdr[i].p_filesz
&& phdr[i].p_vaddr <= bsec->vma
&& bsec->vma <= phdr[i].p_vaddr + (phdr[i].p_filesz - 1))
+>>>>>>> 1.20
{
bsec->lma = phdr[i].p_paddr + (bsec->vma - phdr[i].p_vaddr);
}
diff --git a/bfd/version.h b/bfd/version.h
index 4e171e2..f257eda 100644
--- a/bfd/version.h
+++ b/bfd/version.h
@@ -1,4 +1,4 @@
-#define BFD_VERSION_DATE 20130129
+#define BFD_VERSION_DATE 20130130
#define BFD_VERSION @bfd_version@
#define BFD_VERSION_STRING @bfd_version_package@ @bfd_version_string@
#define REPORT_BUGS_TO @report_bugs_to@
diff --git a/gdb/NEWS b/gdb/NEWS
index dd4c40a..350a063 100644
--- a/gdb/NEWS
+++ b/gdb/NEWS
@@ -115,10 +115,13 @@ show print type typedefs
Control whether typedef definitions are displayed by "ptype".
The default is to show them.
-set filename-display basename|relative|absolute
+set filename-display basename|relative|absolute|relative-with-system-absolute
+ |basename-with-system-absolute
show filename-display
Control the way in which filenames is displayed.
- The default is "relative", which preserves previous behavior.
+ Previous behavior was "relative".
+ New default is "relative-with-system-absolute", which prints source filenames
+ from files with present separate debug info in absolute form.
* MI changes
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index b349972..cd1a36a 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -6554,6 +6554,9 @@ Determine whether a source filename comes from file having separate debug
information file. In such case display the source filename as absolute one.
Otherwise display it relative to the compilation directory.
+Files having separate debug information file are expected to come from system
+shared libraries.
+
This is the default.
@item set filename-display basename-with-system-absolute
@@ -6561,6 +6564,9 @@ Determine whether a source filename comes from file having separate debug
information file. In such case display the source filename as absolute one.
Otherwise display only basename of the filename.
+Files having separate debug information file are expected to come from system
+shared libraries.
+
@item show filename-display
Show the current way to display filenames.
@end table
diff --git a/gdb/version.in b/gdb/version.in
index bff08f8..eca2805 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1 @@
-7.5.50.20130129-cvs
+7.5.50.20130130-cvs
hooks/post-receive
--
Repository for Project Archer.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-02-03 15:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-02-01 20:54 [SCM] archer-jankratochvil-absdir: Merge branch 'xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix' into xfullpath-locsymtab-isabs-expandfullname-tuifullname-config-simple2-tui-psymtab-dw2fullreal-macrorel-mix-default jkratoch
-- strict thread matches above, loose matches on Subject: below --
2013-02-03 15:40 jkratoch
2013-02-01 20:35 jkratoch
2013-01-30 7:49 jkratoch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).