Skip to content
Snippets Groups Projects
  • Ian Lance Taylor's avatar
    d82f74d3
    simple-object.h (simple_object_attributes_merge): Declare, replacing... · d82f74d3
    Ian Lance Taylor authored
    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
    d82f74d3
    History
    simple-object.h (simple_object_attributes_merge): Declare, replacing...
    Ian Lance Taylor authored
    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