summaryrefslogtreecommitdiff
path: root/libiberty
diff options
context:
space:
mode:
authorDJ Delorie <dj@delorie.com>2010-11-14 21:42:54 +0000
committerDJ Delorie <dj@delorie.com>2010-11-14 21:42:54 +0000
commit1f3223243cb9dce65d15e485eb7b10c3c29b3e0e (patch)
tree50f23862bf921833db6ef7eb34fde4be51af2b94 /libiberty
parent91e77a2dadfcc2da238145c8f7538e1bf60cd893 (diff)
downloadgdb-1f3223243cb9dce65d15e485eb7b10c3c29b3e0e.tar.gz
merge from gcc
Diffstat (limited to 'libiberty')
-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 8cd4a285684..4bd5b209bf3 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 9ba1dd4bac0..ff8fee46b74 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;