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.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.c')
| -rw-r--r-- | libiberty/simple-object.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libiberty/simple-object.c b/libiberty/simple-object.c index c9bd82f..d000cfc 100644 --- a/libiberty/simple-object.c +++ b/libiberty/simple-object.c @@ -257,20 +257,19 @@ simple_object_release_read (simple_object_read *sobj) XDELETE (sobj); } -/* Compare attributes. */ +/* Merge attributes. */ const char * -simple_object_attributes_compare (simple_object_attributes *attrs1, - simple_object_attributes *attrs2, - int *err) +simple_object_attributes_merge (simple_object_attributes *to, + simple_object_attributes *from, + int *err) { - if (attrs1->functions != attrs2->functions) + if (to->functions != from->functions) { *err = 0; return "different object file format"; } - return attrs1->functions->attributes_compare (attrs1->data, attrs2->data, - err); + return to->functions->attributes_merge (to->data, from->data, err); } /* Release an attributes structure. */ |