diff options
| author | DJ Delorie <dj@redhat.com> | 2010-11-17 02:03:43 +0000 |
|---|---|---|
| committer | DJ Delorie <dj@redhat.com> | 2010-11-17 02:03:43 +0000 |
| commit | f9e6589d8755e896e2b48ebafad988e572eed2e7 (patch) | |
| tree | 2ca17c836711a86d1c79c82930b3215c4700b950 /libiberty/simple-object-mach-o.c | |
| parent | ab8056e082820630f09bde048adbebbee05d6ddb (diff) | |
| download | gdb-f9e6589d8755e896e2b48ebafad988e572eed2e7.zip gdb-f9e6589d8755e896e2b48ebafad988e572eed2e7.tar.gz gdb-f9e6589d8755e896e2b48ebafad988e572eed2e7.tar.bz2 | |
merge from gcc
Diffstat (limited to 'libiberty/simple-object-mach-o.c')
| -rw-r--r-- | libiberty/simple-object-mach-o.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/libiberty/simple-object-mach-o.c b/libiberty/simple-object-mach-o.c index 4067b16..bbbbd09 100644 --- a/libiberty/simple-object-mach-o.c +++ b/libiberty/simple-object-mach-o.c @@ -624,16 +624,16 @@ simple_object_mach_o_release_read (void *data) /* Compare two attributes structures. */ static const char * -simple_object_mach_o_attributes_compare (void *data1, void *data2, int *err) +simple_object_mach_o_attributes_merge (void *todata, void *fromdata, int *err) { - struct simple_object_mach_o_attributes *attrs1 = - (struct simple_object_mach_o_attributes *) data1; - struct simple_object_mach_o_attributes *attrs2 = - (struct simple_object_mach_o_attributes *) data2; - - if (attrs1->magic != attrs2->magic - || attrs1->is_big_endian != attrs2->is_big_endian - || attrs1->cputype != attrs2->cputype) + struct simple_object_mach_o_attributes *to = + (struct simple_object_mach_o_attributes *) todata; + struct simple_object_mach_o_attributes *from = + (struct simple_object_mach_o_attributes *) fromdata; + + if (to->magic != from->magic + || to->is_big_endian != from->is_big_endian + || to->cputype != from->cputype) { *err = 0; return "Mach-O object format mismatch"; @@ -1014,7 +1014,7 @@ const struct simple_object_functions simple_object_mach_o_functions = simple_object_mach_o_find_sections, simple_object_mach_o_fetch_attributes, simple_object_mach_o_release_read, - simple_object_mach_o_attributes_compare, + simple_object_mach_o_attributes_merge, simple_object_mach_o_release_attributes, simple_object_mach_o_start_write, simple_object_mach_o_write_to_file, |