projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement proper "startup-with-shell" support on gdbserver
[deliverable/binutils-gdb.git]
/
libiberty
/
simple-object-coff.c
diff --git
a/libiberty/simple-object-coff.c
b/libiberty/simple-object-coff.c
index 9ba1dd4bac024df6bd3abf44494e6c2ba253a7dc..0283b15c8033fd5f75739d642b7e1ded2447d86e 100644
(file)
--- a/
libiberty/simple-object-coff.c
+++ b/
libiberty/simple-object-coff.c
@@
-1,5
+1,5
@@
/* simple-object-coff.c -- routines to manipulate COFF object files.
/* simple-object-coff.c -- routines to manipulate COFF object files.
- Copyright
2010
Free Software Foundation, Inc.
+ Copyright
(C) 2010-2017
Free Software Foundation, Inc.
Written by Ian Lance Taylor, Google.
This program is free software; you can redistribute it and/or modify it
Written by Ian Lance Taylor, Google.
This program is free software; you can redistribute it and/or modify it
@@
-308,7
+308,8
@@
simple_object_coff_read_strtab (simple_object_read *sobj, size_t *strtab_size,
size_t strsize;
char *strtab;
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;
if (!simple_object_internal_read (sobj->descriptor, strtab_offset,
strsizebuf, 4, errmsg, err))
return NULL;
@@
-456,15
+457,14
@@
simple_object_coff_release_read (void *data)
/* Compare two attributes structures. */
static const char *
/* Compare two attributes structures. */
static const char *
-simple_object_coff_attributes_
compare (void *data1, void *data2
, int *err)
+simple_object_coff_attributes_
merge (void *todata, void *fromdata
, int *err)
{
{
- struct simple_object_coff_attributes *
attrs1
=
- (struct simple_object_coff_attributes *)
data1
;
- struct simple_object_coff_attributes *
attrs2
=
- (struct simple_object_coff_attributes *)
data2
;
+ struct simple_object_coff_attributes *
to
=
+ (struct simple_object_coff_attributes *)
todata
;
+ struct simple_object_coff_attributes *
from
=
+ (struct simple_object_coff_attributes *)
fromdata
;
- if (attrs1->magic != attrs2->magic
- || attrs1->is_big_endian != attrs2->is_big_endian)
+ if (to->magic != from->magic || to->is_big_endian != from->is_big_endian)
{
*err = 0;
return "COFF object format mismatch";
{
*err = 0;
return "COFF object format mismatch";
@@
-796,7
+796,7
@@
const struct simple_object_functions simple_object_coff_functions =
simple_object_coff_find_sections,
simple_object_coff_fetch_attributes,
simple_object_coff_release_read,
simple_object_coff_find_sections,
simple_object_coff_fetch_attributes,
simple_object_coff_release_read,
- simple_object_coff_attributes_
compar
e,
+ simple_object_coff_attributes_
merg
e,
simple_object_coff_release_attributes,
simple_object_coff_start_write,
simple_object_coff_write_to_file,
simple_object_coff_release_attributes,
simple_object_coff_start_write,
simple_object_coff_write_to_file,
This page took
0.024697 seconds
and
4
git commands to generate.