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-common.h | |
| 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-common.h')
| -rw-r--r-- | libiberty/simple-object-common.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libiberty/simple-object-common.h b/libiberty/simple-object-common.h index 8f74390..264b179 100644 --- a/libiberty/simple-object-common.h +++ b/libiberty/simple-object-common.h @@ -123,10 +123,10 @@ struct simple_object_functions /* Release the private data for an simple_object_read. */ void (*release_read) (void *); - /* Compare the private data for the attributes of two files. If - they are the same, in the sense that they could be linked - together, return NULL. Otherwise return an error message. */ - const char *(*attributes_compare) (void *, void *, int *err); + /* Merge the private data for the attributes of two files. If they + could be linked together, return NULL. Otherwise return an error + message. */ + const char *(*attributes_merge) (void *, void *, int *err); /* Release the private data for an simple_object_attributes. */ void (*release_attributes) (void *); |