diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-17 01:03:06 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-11-17 01:03:06 +0000 |
| commit | 2e521e132eea9fc1ae6cada871f28c58eb743510 (patch) | |
| tree | 8567ed627560514ebbb02791cf4486d8aac87378 /include | |
| parent | 53cd8676c7a598acc85c4e28ba19598ad0cfe1b7 (diff) | |
| download | gcc-2e521e132eea9fc1ae6cada871f28c58eb743510.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@166848 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'include')
| -rw-r--r-- | include/ChangeLog | 5 | ||||
| -rw-r--r-- | include/simple-object.h | 13 |
2 files changed, 12 insertions, 6 deletions
diff --git a/include/ChangeLog b/include/ChangeLog index 0be337dbfd4..3a3e2443e7e 100644 --- a/include/ChangeLog +++ b/include/ChangeLog @@ -1,3 +1,8 @@ +2010-11-16 Ian Lance Taylor <iant@google.com> + + * simple-object.h (simple_object_attributes_merge): Declare, + replacing simple_object_attributes_compare. + 2010-11-04 Ian Lance Taylor <iant@google.com> * dwarf2.h (enum dwarf_source_language): Add DW_LANG_Go. diff --git a/include/simple-object.h b/include/simple-object.h index a72e4a19bc2..c4786757a1e 100644 --- a/include/simple-object.h +++ b/include/simple-object.h @@ -117,14 +117,15 @@ extern simple_object_attributes * simple_object_fetch_attributes (simple_object_read *simple_object, const char **errmsg, int *err); -/* Compare ATTRS1 and ATTRS2. If they could be linked together - without error, return NULL. Otherwise, return an error message, - set *ERR to an errno value or 0 if there isn't one. */ +/* Merge the FROM attributes into TO. If two objects with these + attributes could be linked together without error, returns NULL. + Otherwise, returns an error message, and sets *ERR to an errno + value or 0 if there isn't one. */ extern 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); /* Release all resources associated with ATTRS. */ |