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 /gcc/lto | |
| 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 'gcc/lto')
| -rw-r--r-- | gcc/lto/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/lto/lto-object.c | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 21bbeff..c254da1 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,9 @@ +2010-11-16 Ian Lance Taylor <iant@google.com> + + * lto-object.c (lto_obj_file_open): Call + simple_object_attributes_merge rather than + simple_object_attributes_compare. + 2010-11-12 Joseph Myers <joseph@codesourcery.com> * Make-lang.in (lto/lto.o): Use $(OPTS_H). diff --git a/gcc/lto/lto-object.c b/gcc/lto/lto-object.c index e4a9981..4a67580 100644 --- a/gcc/lto/lto-object.c +++ b/gcc/lto/lto-object.c @@ -138,8 +138,8 @@ lto_obj_file_open (const char *filename, bool writable) saved_attributes = attrs; else { - errmsg = simple_object_attributes_compare (saved_attributes, attrs, - &err); + errmsg = simple_object_attributes_merge (saved_attributes, attrs, + &err); if (errmsg != NULL) goto fail_errmsg; } |