From 28fadfc482c2f8c4f7611c45d7d473768c8acb6f Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Sun, 14 Nov 2010 21:42:55 +0000 Subject: merge from gcc --- libiberty/ChangeLog | 5 +++++ libiberty/simple-object-coff.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) 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 + + * simple-object-coff.c (simple_object_coff_read_strtab): Fix reading + offset. + 2010-11-12 Ian Lance Taylor 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; -- cgit v1.1