From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 29910 invoked by alias); 30 Jan 2013 07:49:27 -0000 Mailing-List: contact archer-commits-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: Received: (qmail 29726 invoked by uid 9674); 30 Jan 2013 07:49:19 -0000 Date: Wed, 30 Jan 2013 07:49:00 -0000 Message-ID: <20130130074919.29703.qmail@sourceware.org> From: jkratoch@sourceware.org To: archer-commits@sourceware.org Subject: [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 X-Git-Refname: refs/heads/archer-jankratochvil-absdir X-Git-Reftype: branch X-Git-Oldrev: 529824ba8bb861477fd7d4c3c9f4b4442acc1cf0 X-Git-Newrev: 025d7cc5769192751cd98fd9cd612b898eeb7cff X-SW-Source: 2013-q1/txt/msg00034.txt.bz2 List-Id: 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 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 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 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 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 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 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 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 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 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 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 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 Date: Wed Jan 30 08:47:52 2013 +0100 Merge branch 'xfullpath' into xfullpath-locsymtab commit ac57bb335bda3e531626062ac35e613dea0c2e1a Merge: 039b041 ff85bce Author: Jan Kratochvil 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 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 Date: Wed Jan 30 08:44:37 2013 +0100 . commit d8b160a8782cbfc3361081fdd79fb155f3823321 Author: Jan Kratochvil Date: Wed Jan 30 08:43:16 2013 +0100 . commit 187d93c2c778fdd9f49de1e20c62a723dc15836f Merge: 529824b e323bcf Author: Jan Kratochvil 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 Date: Wed Jan 30 08:41:09 2013 +0100 . commit ff85bceadfcc78c062cff48270d02bea04aed890 Author: gdbadmin Date: Wed Jan 30 00:00:34 2013 +0000 *** empty log message *** commit 4ab204323f61ab7814b4e4bb2b2f8093bf706c74 Author: Alan Modra Date: Tue Jan 29 23:00:05 2013 +0000 daily update commit 548c06c4728203086d9f923b03448a9c8ff7ceec Author: DJ Delorie 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.