aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2010-11-14 21:42:55 +0000
committerDJ Delorie <dj@redhat.com>2010-11-14 21:42:55 +0000
commit28fadfc482c2f8c4f7611c45d7d473768c8acb6f (patch)
tree1e2c8ec03cb284ab57e452b4a3d77f0e68d7089d
parent73c964d623bc742a965522ef9591294588d50452 (diff)
downloadgdb-28fadfc482c2f8c4f7611c45d7d473768c8acb6f.zip
gdb-28fadfc482c2f8c4f7611c45d7d473768c8acb6f.tar.gz
gdb-28fadfc482c2f8c4f7611c45d7d473768c8acb6f.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/simple-object-coff.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 8cd4a28..4bd5b20 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-14 Kai Tietz <kai.tietz@onevision.com>
+
+ * simple-object-coff.c (simple_object_coff_read_strtab): Fix reading
+ offset.
+
2010-11-12 Ian Lance Taylor <iant@google.com>
PR other/46332
diff --git a/libiberty/simple-object-coff.c b/libiberty/simple-object-coff.c
index 9ba1dd4..ff8fee4 100644
--- a/libiberty/simple-object-coff.c
+++ b/libiberty/simple-object-coff.c
@@ -308,7 +308,8 @@ simple_object_coff_read_strtab (simple_object_read *sobj, size_t *strtab_size,
size_t strsize;
char *strtab;
- strtab_offset = ocr->symptr + ocr->nsyms * sizeof (struct external_syment);
+ strtab_offset = sobj->offset + ocr->symptr
+ + ocr->nsyms * sizeof (struct external_syment);
if (!simple_object_internal_read (sobj->descriptor, strtab_offset,
strsizebuf, 4, errmsg, err))
return NULL;