diff options
| author | vonPalitroque | 2015-10-02 10:26:05 -0400 |
|---|---|---|
| committer | vonPalitroque | 2015-10-02 10:26:05 -0400 |
| commit | cb11dd545607bc2aca84915f792aef0948557da0 (patch) | |
| tree | 26c059858dc1ae7b2e3275c00b8b0e370da62bd0 | |
| parent | 5cec9e9d216eb219d083e46b9a5fe3fee2351ee3 (diff) | |
| download | aur-cb11dd545607bc2aca84915f792aef0948557da0.tar.gz | |
Cleaned up patch.
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | fix-dwarf2read.patch | 50 |
3 files changed, 23 insertions, 35 deletions
@@ -1,7 +1,7 @@ pkgbase = msp430-elf-gdb pkgdesc = The GNU Debugger for msp430-elf. pkgver = 7.10 - pkgrel = 2 + pkgrel = 3 url = https://www.gnu.org/software/gdb/download/ arch = x86_64 arch = x86 @@ -12,7 +12,7 @@ pkgbase = msp430-elf-gdb source = http://ftp.gnu.org/gnu/gdb/gdb-7.10.tar.xz source = fix-dwarf2read.patch sha256sums = 7ebdaa44f9786ce0c142da4e36797d2020c55fa091905ac5af1846b5756208a8 - sha256sums = 889e4db508dfb572e5530c44b8a1bbccd59857d30729201cf0cd3b778c5140a5 + sha256sums = 94dbe29525a65b0427548551f2a8c17fd1bfb58dcfeac0a57e14b7b1ab2cccb5 pkgname = msp430-elf-gdb @@ -3,7 +3,7 @@ _target=msp430-elf pkgname="${_target}-gdb" pkgver=7.10 -pkgrel=2 +pkgrel=3 pkgdesc="The GNU Debugger for ${_target}." arch=('x86_64' 'x86') url="https://www.gnu.org/software/gdb/download/" @@ -14,7 +14,7 @@ options=('strip') source=("http://ftp.gnu.org/gnu/gdb/gdb-${pkgver}.tar.xz" fix-dwarf2read.patch) sha256sums=('7ebdaa44f9786ce0c142da4e36797d2020c55fa091905ac5af1846b5756208a8' - '889e4db508dfb572e5530c44b8a1bbccd59857d30729201cf0cd3b778c5140a5') + '94dbe29525a65b0427548551f2a8c17fd1bfb58dcfeac0a57e14b7b1ab2cccb5') prepare() { cd "$srcdir/gdb-$pkgver" diff --git a/fix-dwarf2read.patch b/fix-dwarf2read.patch index 4a3b11c05018..e29de15e7aaa 100644 --- a/fix-dwarf2read.patch +++ b/fix-dwarf2read.patch @@ -1,39 +1,27 @@ -From 29b0f9d4e7a5956385e8a14279462252c5d45148 Mon Sep 17 00:00:00 2001 -From: Simon Marchi <simon.marchi@ericsson.com> -Date: Wed, 30 Sep 2015 17:25:43 -0400 -Subject: [PATCH] Ugly fix - ---- - gdb/dwarf2read.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c -index 5b12342..618d7d6 100644 ---- a/gdb/dwarf2read.c -+++ b/gdb/dwarf2read.c -@@ -4341,6 +4341,7 @@ read_comp_unit_head (struct comp_unit_head *cu_header, - cu_header->offset_size = (bytes_read == 4) ? 4 : 8; - info_ptr += bytes_read; - cu_header->version = read_2_bytes (abfd, info_ptr); -+ printf("Version is %d\n", cu_header->version); - info_ptr += 2; - cu_header->abbrev_offset.sect_off = read_offset (abfd, info_ptr, cu_header, - &bytes_read); -@@ -17902,8 +17903,13 @@ dwarf_decode_lines_1 (struct line_header *lh, struct dwarf2_cu *cu, +diff -rupN gdb-7.10-pristine/gdb/dwarf2read.c gdb-7.10-modified/gdb/dwarf2read.c +--- gdb-7.10-pristine/gdb/dwarf2read.c 2015-08-28 17:22:07.000000000 -0400 ++++ gdb-7.10-modified/gdb/dwarf2read.c 2015-10-02 10:16:58.959920909 -0400 +@@ -17845,8 +17845,21 @@ dwarf_decode_lines_1 (struct line_header break; case DW_LNE_set_address: { - CORE_ADDR address - = read_address (abfd, line_ptr, cu, &bytes_read); -+ unsigned char oplen = extended_end - line_ptr, old_address_size; -+ CORE_ADDR address; -+ old_address_size = cu->header.addr_size; -+ //printf("oplen = %d\n", oplen); -+ cu->header.addr_size = oplen; -+ address = read_address (abfd, line_ptr, cu, &bytes_read); -+ cu->header.addr_size = old_address_size; ++ /* temporary fix until ++ * https://sourceware.org/bugzilla/show_bug.cgi?id=19033 ++ * is resolved. ++ * ++ * Contributed by: ++ * Simon Marchi <simon.marchi@ericsson.com> ++ * Wed, 30 Sep 2015 17:25:43 -0400 ++ */ ++ unsigned char oplen = extended_end - line_ptr, old_address_size; ++ CORE_ADDR address; ++ old_address_size = cu->header.addr_size; ++ cu->header.addr_size = oplen; ++ address = read_address(abfd, line_ptr, cu, &bytes_read); ++ cu->header.addr_size = old_address_size; ++ /* end fix */ line_ptr += bytes_read; check_line_address (cu, &state_machine, line_ptr, --- -2.5.1 |