diff options
| author | Ian Lance Taylor <iant@google.com> | 2010-11-17 01:03:06 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2010-11-17 01:03:06 +0000 |
| commit | d82f74d3ab985da4b217a4942a0b4e2e55021fab (patch) | |
| tree | 8567ed627560514ebbb02791cf4486d8aac87378 /libiberty/simple-object.c | |
| parent | 354d8ce1084fadee6f9761fb6b1d1dd897b69ef4 (diff) | |
| download | gcc-d82f74d3ab985da4b217a4942a0b4e2e55021fab.zip gcc-d82f74d3ab985da4b217a4942a0b4e2e55021fab.tar.gz gcc-d82f74d3ab985da4b217a4942a0b4e2e55021fab.tar.bz2 | |
simple-object.h (simple_object_attributes_merge): Declare, replacing simple_object_attributes_compare.
include/:
* simple-object.h (simple_object_attributes_merge): Declare,
replacing simple_object_attributes_compare.
libiberty/:
* simple-object.c (simple_object_attributes_merge): Rename from
simple_object_attributes_compare. Call merge field.
* simple-object-common.h (struct simple_object_functions): Rename
attributes_compare field to attribute_merge.
* simple-object-elf.c (EM_SPARC): Define.
(EM_SPARC32PLUS): Define.
(simple_object_elf_attributes_merge): Renamed from
simple_object_elf_attributes_compare. Permit EM_SPARC and
EM_SPARC32PLUS objects to be merged.
(simple_object_elf_functions): Update function name.
* simple-object-coff.c (simple_object_coff_attributes_merge):
Rename from simple_object_coff_attributes_compare.
(simple_object_coff_functions): Update function name.
* simple-object-mach-o.c (simple_object_mach_o_attributes_merge):
Renamed from simple_object_mach_o_attributes_compare.
(simple_object_mach_o_functions): Update function name.
gcc/lto/:
* lto-object.c (lto_obj_file_open): Call
simple_object_attributes_merge rather than
simple_object_attributes_compare.
From-SVN: r166848
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. */ |