[SCM] archer-jankratochvil-absdir: Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand-priv' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand-priv-annotate

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-absdir has been updated
       via  0ddf797d756e1a70d92918f7e8ba3955425f95db (commit)
       via  21f8401866ad045502b5e0d0167acec8f0fe326d (commit)
       via  c11ac5f5ed1213ae7e13214ec4a98bbd9234c902 (commit)
       via  ed9fc8073e2b7c8e15aa3680502b5153ccaecb38 (commit)
       via  251129bde41fa9885cc5cf0b77f3a8bc15e757b3 (commit)
       via  e0826544658ca0c832a9c56648133538c3701b64 (commit)
       via  a0f637effdd26e5d165977c887c064a55764aa39 (commit)
       via  9ce5be7b89386623e5f72b2252822d2d99dde5bf (commit)
       via  c6c2167ffe2ec9b4a9043a4990b5eab7ae671cfd (commit)
       via  0f9a323b7efe9bf7367d117ce41134cfec5b6fac (commit)
       via  253cc8119415ab6a92e0636744d62f18d7c2ef54 (commit)
       via  e2e6218ec3c98d87c3213269e417a52038aaba0e (commit)
      from  9a49145cd2433c5d0c8777f7bca71fa7ee37279c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 0ddf797d756e1a70d92918f7e8ba3955425f95db
Merge: 9ce5be7 21f8401
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:10:47 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand-priv' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand-priv-annotate

commit 21f8401866ad045502b5e0d0167acec8f0fe326d
Merge: c6c2167 c11ac5f
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:10:46 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand-priv

commit c11ac5f5ed1213ae7e13214ec4a98bbd9234c902
Merge: 0f9a323 ed9fc80
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:10:45 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand

commit ed9fc8073e2b7c8e15aa3680502b5153ccaecb38
Merge: e2e6218 251129b
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:10:44 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel

commit 251129bde41fa9885cc5cf0b77f3a8bc15e757b3
Merge: 1eda7cb e082654
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:10:44 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex

commit e0826544658ca0c832a9c56648133538c3701b64
Merge: 6bcf95f a0f637e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:10:43 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple

commit a0f637effdd26e5d165977c887c064a55764aa39
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:10:39 2013 +0100

    .

commit 9ce5be7b89386623e5f72b2252822d2d99dde5bf
Merge: 9a49145 c6c2167
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:09:05 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand-priv' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand-priv-annotate

commit c6c2167ffe2ec9b4a9043a4990b5eab7ae671cfd
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:08:57 2013 +0100

    .

commit 0f9a323b7efe9bf7367d117ce41134cfec5b6fac
Merge: e47f00d e2e6218
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:08:46 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand

commit 253cc8119415ab6a92e0636744d62f18d7c2ef54
Merge: 356c99f 0f9a323
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:08:46 2013 +0100

    Merge branch 'substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand' into substfix-locsymtab-dos-isabs-expandfullname-tuifullname-config-allsimple-allcomplex-macrorel-dw2expand-priv

commit e2e6218ec3c98d87c3213269e417a52038aaba0e
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Jan 12 20:08:40 2013 +0100

    .

-----------------------------------------------------------------------

Summary of changes:
 gdb/doc/gdb.texinfo |   16 ++++++++--------
 gdb/macrotab.h      |   10 ++++++++--
 2 files changed, 16 insertions(+), 10 deletions(-)

First 500 lines of diff:
diff --git a/gdb/doc/gdb.texinfo b/gdb/doc/gdb.texinfo
index 58b6a5b..394b4e6 100644
--- a/gdb/doc/gdb.texinfo
+++ b/gdb/doc/gdb.texinfo
@@ -6506,22 +6506,22 @@ unlimited.
 Display the current limit on backtrace levels.
 @end table
 
-You can control how file names are displayed in backtraces.
+You can control how file names are displayed.
 
 @table @code
-@item set backtrace filename-display
-@itemx set backtrace filename-display relative
-@cindex backtrace filename-display
+@item set filename-display
+@itemx set filename-display relative
+@cindex filename-display
 Display file names relative to the compilation directory.  This is the default.
 
-@item set backtrace filename-display basename
+@item set filename-display basename
 Display only basename of a filename.
 
-@item set backtrace filename-display absolute
+@item set filename-display absolute
 Display an absolute filename.
 
-@item show backtrace filename-display
-Show the current way to display filenames in backtraces.
+@item show filename-display
+Show the current way to display filenames.
 @end table
 
 @node Selection
diff --git a/gdb/macrotab.h b/gdb/macrotab.h
index f96b8c8..899ca23 100644
--- a/gdb/macrotab.h
+++ b/gdb/macrotab.h
@@ -125,7 +125,9 @@ struct macro_source_file
      a part of.  */
   struct macro_table *table;
 
-  /* A source file --- possibly a header file.  */
+  /* A source file --- possibly a header file.  This filename is relative to
+     the compilation directory (table->comp_dir), it exactly matches the
+     symtab->filename_ content.  */
   const char *filename;
 
   /* The location we were #included from, or zero if we are the
@@ -352,7 +354,11 @@ void macro_for_each_in_scope (struct macro_source_file *file, int line,
 /* Return FILE->filename with possibly prepended compilation directory name.
    This is raw concatenation without the "set substitute-path" and gdb_realpath
    applications done by symtab_to_fullname.  Returned string must be freed by
-   xfree.  */
+   xfree.
+
+   THis function ignores the "set filename-display" setting.  Its default
+   setting is "relative" which is backward compatible but the former behavior
+   of macro filenames printing was "absolute".  */
 extern char *macro_source_fullname (struct macro_source_file *file);
 
 #endif /* MACROTAB_H */


hooks/post-receive
--
Repository for Project Archer.