merge from gcc

This commit is contained in:
DJ Delorie 2010-11-14 21:42:55 +00:00
parent 73c964d623
commit 28fadfc482
2 changed files with 7 additions and 1 deletions

View File

@ -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

View File

@ -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;