From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 10297 invoked by alias); 6 Jan 2013 20:45:02 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 10213 invoked by uid 9674); 6 Jan 2013 20:45:01 -0000 Date: Sun, 06 Jan 2013 20:45:00 -0000 Message-ID: <20130106204500.10198.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [SCM] archer-jankratochvil-absdir: Merge branch 'substfix-locsymtab-dos-isabs-macfullname-config-all-priv' into substfix-locsymtab-dos-isabs-macfullname-config-all-priv-annotate X-Git-Refname: refs/heads/archer-jankratochvil-absdir X-Git-Reftype: branch X-Git-Oldrev: 72179804a3fd2217235bf5192904c21870d12d6f X-Git-Newrev: d07e0c15918d1e0f28bfa44a377eebe137f6b606 X-SW-Source: 2013-q1/txt/msg00003.txt.bz2 List-Id: The branch, archer-jankratochvil-absdir has been updated via d07e0c15918d1e0f28bfa44a377eebe137f6b606 (commit) via 9e1fdaf18fc55999e65f43114ee7255b513fbe13 (commit) via e39fcb24e907b7f31f6b2e15cba29b48e9781975 (commit) via f88bf5e8af344cba4fbefa01b433dbf52e1ab940 (commit) via 05acfd2aa5a9e9ed68a77e3abae3cc17b4077a58 (commit) via 2984187f85998015c4c1ea9dabcb29d29a3c6518 (commit) via 550877241115e1f26ef3345b8cd9007e4fa0a2b5 (commit) via 57991995d84a00a589df6d45e0cfb38463dc6e5c (commit) via 5c492d5b8ff5b01d366b6f851c6366a9fb9c609f (commit) from 72179804a3fd2217235bf5192904c21870d12d6f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit d07e0c15918d1e0f28bfa44a377eebe137f6b606 Merge: 7217980 9e1fdaf Author: Jan Kratochvil Date: Sun Jan 6 21:44:49 2013 +0100 Merge branch 'substfix-locsymtab-dos-isabs-macfullname-config-all-priv' into substfix-locsymtab-dos-isabs-macfullname-config-all-priv-annotate commit 9e1fdaf18fc55999e65f43114ee7255b513fbe13 Merge: 67453db e39fcb2 Author: Jan Kratochvil Date: Sun Jan 6 21:44:46 2013 +0100 Merge branch 'substfix-locsymtab-dos-isabs-macfullname-config-all' into substfix-locsymtab-dos-isabs-macfullname-config-all-priv Conflicts: gdb/source.c commit e39fcb24e907b7f31f6b2e15cba29b48e9781975 Merge: 6612040 f88bf5e Author: Jan Kratochvil Date: Sun Jan 6 21:44:26 2013 +0100 Merge branch 'substfix-locsymtab-dos-isabs-macfullname-config' into substfix-locsymtab-dos-isabs-macfullname-config-all commit f88bf5e8af344cba4fbefa01b433dbf52e1ab940 Merge: 4023867 05acfd2 Author: Jan Kratochvil Date: Sun Jan 6 21:44:25 2013 +0100 Merge branch 'substfix-locsymtab-dos-isabs-macfullname' into substfix-locsymtab-dos-isabs-macfullname-config commit 05acfd2aa5a9e9ed68a77e3abae3cc17b4077a58 Merge: c0758fd 2984187 Author: Jan Kratochvil Date: Sun Jan 6 21:44:24 2013 +0100 Merge branch 'substfix-locsymtab-dos-isabs' into substfix-locsymtab-dos-isabs-macfullname commit 2984187f85998015c4c1ea9dabcb29d29a3c6518 Merge: 23b5273 5508772 Author: Jan Kratochvil Date: Sun Jan 6 21:44:23 2013 +0100 Merge branch 'substfix-locsymtab-dos' into substfix-locsymtab-dos-isabs commit 550877241115e1f26ef3345b8cd9007e4fa0a2b5 Merge: fb278a2 5799199 Author: Jan Kratochvil Date: Sun Jan 6 21:44:22 2013 +0100 Merge branch 'substfix-locsymtab' into substfix-locsymtab-dos commit 57991995d84a00a589df6d45e0cfb38463dc6e5c Merge: 11c130a 5c492d5 Author: Jan Kratochvil Date: Sun Jan 6 21:44:21 2013 +0100 Merge branch 'substfix' into substfix-locsymtab commit 5c492d5b8ff5b01d366b6f851c6366a9fb9c609f Author: Jan Kratochvil Date: Sun Jan 6 21:44:15 2013 +0100 . ----------------------------------------------------------------------- Summary of changes: gdb/source.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/gdb/source.c b/gdb/source.c index b8ce6f8..5991f97 100644 --- a/gdb/source.c +++ b/gdb/source.c @@ -1123,7 +1123,7 @@ symtab_to_fullname (struct symtab *s) /* rewrite_source_path would be applied by find_and_open_source, we should report the pathname where GDB tried to find the file. */ - if (IS_ABSOLUTE_PATH (s->filename_) || s->dirname == NULL) + if (s->dirname == NULL || IS_ABSOLUTE_PATH (s->filename_)) fullname = xstrdup (s->filename_); else fullname = concat (s->dirname, SLASH_STRING, s->filename_, NULL); hooks/post-receive -- Repository for Project Archer.