Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/elftoolchain/dist merge conflicts
details: https://anonhg.NetBSD.org/src/rev/e9a99e0761c4
branches: trunk
changeset: 343672:e9a99e0761c4
user: christos <christos%NetBSD.org@localhost>
date: Sat Feb 20 02:43:41 2016 +0000
description:
merge conflicts
diffstat:
external/bsd/elftoolchain/dist/common/_elftc.h | 52 +-
external/bsd/elftoolchain/dist/common/elfdefinitions.h | 294 ++++++++-
external/bsd/elftoolchain/dist/libdwarf/_libdwarf.h | 64 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf.3 | 66 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf.h | 61 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_abbrev.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_comp_dir.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_const_value_string.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_dataref.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_flag.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_location_expr.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_name.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_producer.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_ref_address.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_reference.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_signed_const.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_string.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_AT_targ_address.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_arange.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_die_to_debug.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_directory_decl.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_expr_addr.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_expr_gen.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_fde_inst.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_file_decl.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_frame_cie.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_frame_fde.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_funcname.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_line_entry.3 | 7 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_pubname.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_typename.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_varname.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_add_weakname.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_arange.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_attr.3 | 5 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_attr.c | 43 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_attrlist.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_attroffset.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval.c | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_attrval_signed.3 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_child.3 | 98 ++-
external/bsd/elftoolchain/dist/libdwarf/dwarf_cu.c | 96 ++-
external/bsd/elftoolchain/dist/libdwarf/dwarf_dealloc.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_dealloc.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_def_macro.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_die.c | 162 ++++-
external/bsd/elftoolchain/dist/libdwarf/dwarf_die_abbrev_code.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_die_link.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_diename.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_dieoffset.3 | 52 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_dump.c | 98 +++-
external/bsd/elftoolchain/dist/libdwarf/dwarf_end_macro_file.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_errmsg.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_errmsg.c | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_errno.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_expand_frame_instructions.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_expr_current_offset.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_expr_into_block.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_fde_cfa_offset.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_find_macro_value_start.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_finish.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_finish.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_form.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_formaddr.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_formblock.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_formexprloc.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_formflag.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_formref.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_formsig8.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_formstring.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_formudata.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_frame.c | 10 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_funcs.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_AT_name.3 | 5 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_abbrev.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_abbrev_children_flag.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_abbrev_code.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_abbrev_entry.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_abbrev_tag.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_address_size.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_arange.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_arange_info.3 | 5 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_aranges.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_cie_index.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_cie_info.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_cie_of_fde.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_cu_die_offset.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_die_infotypes_flag.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_elf.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_at_pc.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_info_for_all_regs.3 | 7 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_info_for_all_regs3.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_info_for_cfa_reg3.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_info_for_reg.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_info_for_reg3.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_instr_bytes.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_list.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_n.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_fde_range.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_form_class.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_funcs.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_globals.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_loclist_entry.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_macro_details.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_pubtypes.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_ranges.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_relocation_info.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_relocation_info_count.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_section_bytes.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_section_max_offsets.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_str.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_types.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_vars.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_get_weaks.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_hasattr.3 | 7 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_hasform.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_highpc.3 | 41 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_init.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_init.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_lineno.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_lineno.c | 10 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_lne_end_sequence.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_lne_set_address.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_loclist.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_loclist.c | 227 ++++---
external/bsd/elftoolchain/dist/libdwarf/dwarf_loclist_from_expr.3 | 38 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_macinfo.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_nametbl.m4 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_new_die.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_new_expr.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_new_fde.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_next_cu_header.3 | 211 +++++--
external/bsd/elftoolchain/dist/libdwarf/dwarf_next_types_section.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_object_init.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_arange.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_attr.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_die.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_expr.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_finish.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_frame.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_funcs.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_init.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_lineno.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_macinfo.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_nametbl.m4 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_pubnames.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_reloc.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_sections.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_types.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_vars.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pro_weaks.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_producer_init.3 | 6 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_producer_set_isa.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pubnames.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_pubtypes.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_ranges.c | 8 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_reloc.c | 10 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_reset_section_bytes.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_sections.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_set_frame_cfa_value.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_set_reloc_application.3 | 8 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_seterrarg.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_seterror.c | 8 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_srcfiles.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_srclines.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_start_macro_file.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_str.c | 12 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_tag.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_transform_to_disk_form.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_types.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_undef_macro.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_vars.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_vendor_ext.3 | 2 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_weaks.m4 | 4 +-
external/bsd/elftoolchain/dist/libdwarf/dwarf_whatattr.3 | 7 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf.c | 8 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf.h | 48 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_abbrev.c | 10 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_arange.c | 12 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_attr.c | 9 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_die.c | 12 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_elf_access.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_elf_init.c | 73 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_error.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_frame.c | 85 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_info.c | 134 ++++-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_init.c | 23 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_lineno.c | 24 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_loc.c | 112 ++-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_loclist.c | 136 +---
external/bsd/elftoolchain/dist/libdwarf/libdwarf_macinfo.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_nametbl.c | 8 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_ranges.c | 4 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_reloc.c | 21 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_rw.c | 18 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_sections.c | 29 +-
external/bsd/elftoolchain/dist/libdwarf/libdwarf_str.c | 4 +-
external/bsd/elftoolchain/dist/libelf/_libelf.h | 85 +-
external/bsd/elftoolchain/dist/libelf/_libelf_ar.h | 15 +-
external/bsd/elftoolchain/dist/libelf/_libelf_config.h | 18 +-
external/bsd/elftoolchain/dist/libelf/elf.3 | 41 +-
external/bsd/elftoolchain/dist/libelf/elf.c | 4 +-
external/bsd/elftoolchain/dist/libelf/elf_begin.3 | 6 +-
external/bsd/elftoolchain/dist/libelf/elf_begin.c | 4 +-
external/bsd/elftoolchain/dist/libelf/elf_cntl.3 | 4 +-
external/bsd/elftoolchain/dist/libelf/elf_cntl.c | 4 +-
external/bsd/elftoolchain/dist/libelf/elf_data.c | 36 +-
external/bsd/elftoolchain/dist/libelf/elf_end.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_end.c | 6 +-
external/bsd/elftoolchain/dist/libelf/elf_errmsg.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_errmsg.c | 10 +-
external/bsd/elftoolchain/dist/libelf/elf_errno.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_fill.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_fill.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_flag.c | 12 +-
external/bsd/elftoolchain/dist/libelf/elf_flagdata.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getarhdr.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getarhdr.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_getarsym.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getarsym.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_getbase.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getbase.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_getdata.3 | 6 +-
external/bsd/elftoolchain/dist/libelf/elf_getident.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getident.c | 6 +-
external/bsd/elftoolchain/dist/libelf/elf_getphdrnum.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getphnum.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getscn.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getshdrnum.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getshdrstrndx.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getshnum.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_getshstrndx.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_hash.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_hash.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_kind.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_kind.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_memory.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_memory.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_next.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_next.c | 16 +-
external/bsd/elftoolchain/dist/libelf/elf_open.3 | 6 +-
external/bsd/elftoolchain/dist/libelf/elf_open.c | 6 +-
external/bsd/elftoolchain/dist/libelf/elf_phnum.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_rand.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_rand.c | 10 +-
external/bsd/elftoolchain/dist/libelf/elf_rawfile.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_rawfile.c | 12 +-
external/bsd/elftoolchain/dist/libelf/elf_scn.c | 28 +-
external/bsd/elftoolchain/dist/libelf/elf_shnum.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_shstrndx.c | 8 +-
external/bsd/elftoolchain/dist/libelf/elf_strptr.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_strptr.c | 10 +-
external/bsd/elftoolchain/dist/libelf/elf_types.m4 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_update.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_update.c | 127 ++-
external/bsd/elftoolchain/dist/libelf/elf_version.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/elf_version.c | 8 +-
external/bsd/elftoolchain/dist/libelf/gelf.3 | 7 +-
external/bsd/elftoolchain/dist/libelf/gelf.h | 14 +-
external/bsd/elftoolchain/dist/libelf/gelf_cap.c | 11 +-
external/bsd/elftoolchain/dist/libelf/gelf_checksum.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_checksum.c | 8 +-
external/bsd/elftoolchain/dist/libelf/gelf_dyn.c | 16 +-
external/bsd/elftoolchain/dist/libelf/gelf_ehdr.c | 7 +-
external/bsd/elftoolchain/dist/libelf/gelf_fsize.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_fsize.c | 8 +-
external/bsd/elftoolchain/dist/libelf/gelf_getcap.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getclass.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getclass.c | 8 +-
external/bsd/elftoolchain/dist/libelf/gelf_getdyn.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getehdr.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getmove.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getphdr.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getrel.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getrela.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getshdr.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getsym.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getsyminfo.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_getsymshndx.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_move.c | 16 +-
external/bsd/elftoolchain/dist/libelf/gelf_newehdr.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_newphdr.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_phdr.c | 9 +-
external/bsd/elftoolchain/dist/libelf/gelf_rel.c | 21 +-
external/bsd/elftoolchain/dist/libelf/gelf_rela.c | 21 +-
external/bsd/elftoolchain/dist/libelf/gelf_shdr.c | 7 +-
external/bsd/elftoolchain/dist/libelf/gelf_sym.c | 21 +-
external/bsd/elftoolchain/dist/libelf/gelf_syminfo.c | 15 +-
external/bsd/elftoolchain/dist/libelf/gelf_symshndx.c | 15 +-
external/bsd/elftoolchain/dist/libelf/gelf_update_ehdr.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/gelf_xlate.c | 8 +-
external/bsd/elftoolchain/dist/libelf/gelf_xlatetof.3 | 2 +-
external/bsd/elftoolchain/dist/libelf/libelf.h | 14 +-
external/bsd/elftoolchain/dist/libelf/libelf_align.c | 16 +-
external/bsd/elftoolchain/dist/libelf/libelf_allocate.c | 8 +-
external/bsd/elftoolchain/dist/libelf/libelf_ar.c | 55 +-
external/bsd/elftoolchain/dist/libelf/libelf_ar_util.c | 53 +-
external/bsd/elftoolchain/dist/libelf/libelf_checksum.c | 14 +-
external/bsd/elftoolchain/dist/libelf/libelf_convert.m4 | 209 +++---
external/bsd/elftoolchain/dist/libelf/libelf_data.c | 34 +-
external/bsd/elftoolchain/dist/libelf/libelf_ehdr.c | 20 +-
external/bsd/elftoolchain/dist/libelf/libelf_extended.c | 18 +-
external/bsd/elftoolchain/dist/libelf/libelf_fsize.m4 | 4 +-
external/bsd/elftoolchain/dist/libelf/libelf_memory.c | 10 +-
external/bsd/elftoolchain/dist/libelf/libelf_msize.m4 | 6 +-
external/bsd/elftoolchain/dist/libelf/libelf_open.c | 12 +-
external/bsd/elftoolchain/dist/libelf/libelf_phdr.c | 9 +-
external/bsd/elftoolchain/dist/libelf/libelf_shdr.c | 8 +-
external/bsd/elftoolchain/dist/libelf/libelf_xlate.c | 14 +-
309 files changed, 2717 insertions(+), 1549 deletions(-)
diffs (truncated from 10894 to 300 lines):
diff -r 2533b38121ec -r e9a99e0761c4 external/bsd/elftoolchain/dist/common/_elftc.h
--- a/external/bsd/elftoolchain/dist/common/_elftc.h Sat Feb 20 02:42:00 2016 +0000
+++ b/external/bsd/elftoolchain/dist/common/_elftc.h Sat Feb 20 02:43:41 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: _elftc.h,v 1.3 2015/09/29 19:43:39 christos Exp $ */
+/* $NetBSD: _elftc.h,v 1.4 2016/02/20 02:43:41 christos Exp $ */
/*-
* Copyright (c) 2009 Joseph Koshy
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * Id: _elftc.h 2922 2013-03-17 22:53:15Z kaiwang27
+ * Id: _elftc.h 3244 2015-08-31 19:53:08Z emaste
*/
/**
@@ -78,10 +78,17 @@
* SUCH DAMAGE.
*/
+#ifndef LIST_FOREACH_SAFE
+#define LIST_FOREACH_SAFE(var, head, field, tvar) \
+ for ((var) = LIST_FIRST((head)); \
+ (var) && ((tvar) = LIST_NEXT((var), field), 1); \
+ (var) = (tvar))
+#endif
+
#ifndef SLIST_FOREACH_SAFE
-#define SLIST_FOREACH_SAFE(var, head, field, tvar) \
- for ((var) = SLIST_FIRST((head)); \
- (var) && ((tvar) = SLIST_NEXT((var), field), 1); \
+#define SLIST_FOREACH_SAFE(var, head, field, tvar) \
+ for ((var) = SLIST_FIRST((head)); \
+ (var) && ((tvar) = SLIST_NEXT((var), field), 1); \
(var) = (tvar))
#endif
@@ -289,7 +296,8 @@
#define ELFTC_VCSID(ID) __FBSDID(ID)
#endif
-#if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__)
+#if defined(__APPLE__) || defined(__GLIBC__) || defined(__GNU__) || \
+ defined(__linux__)
#if defined(__GNUC__)
#define ELFTC_VCSID(ID) __asm__(".ident\t\"" ID "\"")
#else
@@ -329,8 +337,8 @@
#ifndef ELFTC_GETPROGNAME
-#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__minix) || \
- defined(__NetBSD__)
+#if defined(__APPLE__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
+ defined(__minix) || defined(__NetBSD__)
#include <stdlib.h>
@@ -339,17 +347,18 @@
#endif /* __DragonFly__ || __FreeBSD__ || __minix || __NetBSD__ */
-#if defined(__GLIBC__)
-
+#if defined(__GLIBC__) || defined(__linux__)
+#ifndef _GNU_SOURCE
/*
* GLIBC based systems have a global 'char *' pointer referencing
* the executable's name.
*/
extern const char *program_invocation_short_name;
+#endif /* !_GNU_SOURCE */
#define ELFTC_GETPROGNAME() program_invocation_short_name
-#endif /* __GLIBC__ */
+#endif /* __GLIBC__ || __linux__ */
#if defined(__OpenBSD__)
@@ -367,6 +376,23 @@
** Per-OS configuration.
**/
+#if defined(__APPLE__)
+
+#include <libkern/OSByteOrder.h>
+#define htobe32(x) OSSwapHostToBigInt32(x)
+#define roundup2 roundup
+
+#define ELFTC_BYTE_ORDER _BYTE_ORDER
+#define ELFTC_BYTE_ORDER_LITTLE_ENDIAN _LITTLE_ENDIAN
+#define ELFTC_BYTE_ORDER_BIG_ENDIAN _BIG_ENDIAN
+
+#define ELFTC_HAVE_MMAP 1
+#define ELFTC_HAVE_STRMODE 1
+
+#define ELFTC_NEED_BYTEORDER_EXTENSIONS 1
+#endif /* __APPLE__ */
+
+
#if defined(__DragonFly__)
#include <osreldate.h>
@@ -380,7 +406,7 @@
#endif
-#if defined(__GLIBC__)
+#if defined(__GLIBC__) || defined(__linux__)
#include <endian.h>
@@ -400,7 +426,7 @@
#define roundup2 roundup
-#endif /* __GLIBC__ */
+#endif /* __GLIBC__ || __linux__ */
#if defined(__FreeBSD__)
diff -r 2533b38121ec -r e9a99e0761c4 external/bsd/elftoolchain/dist/common/elfdefinitions.h
--- a/external/bsd/elftoolchain/dist/common/elfdefinitions.h Sat Feb 20 02:42:00 2016 +0000
+++ b/external/bsd/elftoolchain/dist/common/elfdefinitions.h Sat Feb 20 02:43:41 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: elfdefinitions.h,v 1.2 2014/03/09 16:58:03 christos Exp $ */
+/* $NetBSD: elfdefinitions.h,v 1.3 2016/02/20 02:43:41 christos Exp $ */
/*-
* Copyright (c) 2010 Joseph Koshy
@@ -25,7 +25,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * Id: elfdefinitions.h 2950 2013-06-15 13:36:02Z jkoshy
+ * Id: elfdefinitions.h 3392 2016-02-05 19:51:22Z emaste
*/
/*
@@ -173,7 +173,7 @@
"size of DT_MOVETAB entries") \
_ELF_DEFINE_DT(DT_MOVESZ, 0x6FFFFDFBUL, \
"total size of the MOVETAB table") \
-_ELF_DEFINE_DT(DT_FEATURE_1, 0x6FFFFDFCUL, "feature values") \
+_ELF_DEFINE_DT(DT_FEATURE, 0x6FFFFDFCUL, "feature values") \
_ELF_DEFINE_DT(DT_POSFLAG_1, 0x6FFFFDFDUL, \
"dynamic position flags") \
_ELF_DEFINE_DT(DT_SYMINSZ, 0x6FFFFDFEUL, \
@@ -567,6 +567,7 @@
_ELF_DEFINE_EM(EM_386, 3, "Intel 80386") \
_ELF_DEFINE_EM(EM_68K, 4, "Motorola 68000") \
_ELF_DEFINE_EM(EM_88K, 5, "Motorola 88000") \
+_ELF_DEFINE_EM(EM_IAMCU, 6, "Intel MCU") \
_ELF_DEFINE_EM(EM_860, 7, "Intel 80860") \
_ELF_DEFINE_EM(EM_MIPS, 8, "MIPS I Architecture") \
_ELF_DEFINE_EM(EM_S370, 9, "IBM System/370 Processor") \
@@ -772,6 +773,8 @@
"Freescale Extended Time Processing Unit") \
_ELF_DEFINE_EM(EM_SLE9X, 179, \
"Infineon Technologies SLE9X core") \
+_ELF_DEFINE_EM(EM_AARCH64, 183, \
+ "AArch64 (64-bit ARM)") \
_ELF_DEFINE_EM(EM_AVR32, 185, \
"Atmel Corporation 32-bit microprocessor family") \
_ELF_DEFINE_EM(EM_STM8, 186, \
@@ -812,7 +815,8 @@
_ELF_DEFINE_EM(EM_KMX32, 211, "KM211 KMX32 32-bit processor") \
_ELF_DEFINE_EM(EM_KMX16, 212, "KM211 KMX16 16-bit processor") \
_ELF_DEFINE_EM(EM_KMX8, 213, "KM211 KMX8 8-bit processor") \
-_ELF_DEFINE_EM(EM_KVARC, 214, "KM211 KMX32 KVARC processor")
+_ELF_DEFINE_EM(EM_KVARC, 214, "KM211 KMX32 KVARC processor") \
+_ELF_DEFINE_EM(EM_RISCV, 243, "RISC-V")
#undef _ELF_DEFINE_EM
#define _ELF_DEFINE_EM(N, V, DESCR) N = V ,
@@ -821,7 +825,8 @@
EM__LAST__
};
-/* Older synonyms. */
+/* Other synonyms. */
+#define EM_AMD64 EM_X86_64
#define EM_ARC_A5 EM_ARC_COMPACT
/*
@@ -857,6 +862,12 @@
#define GRP_MASKPROC 0xf0000000 /* processor-specific flags */
/*
+ * Flags / mask for .gnu.versym sections.
+ */
+#define VERSYM_VERSION 0x7fff
+#define VERSYM_HIDDEN 0x8000
+
+/*
* Flags used by program header table entries.
*/
@@ -1180,6 +1191,8 @@
"obsolete") \
_ELF_DEFINE_SHT(SHT_MIPS_PDR_EXCEPTION, 0x70000029UL, \
"runtime procedure descriptor table exception information") \
+_ELF_DEFINE_SHT(SHT_MIPS_ABIFLAGS, 0x7000002AUL, \
+ "ABI flags") \
_ELF_DEFINE_SHT(SHT_SPARC_GOTDATA, 0x70000000UL, \
"SPARC-specific data") \
_ELF_DEFINE_SHT(SHT_AMD64_UNWIND, 0x70000001UL, \
@@ -1217,6 +1230,7 @@
_ELF_DEFINE_STB(STB_WEAK, 2, \
"visible across all object files but with low precedence") \
_ELF_DEFINE_STB(STB_LOOS, 10, "start of OS-specific range") \
+_ELF_DEFINE_STB(STB_GNU_UNIQUE, 10, "unique symbol (GNU)") \
_ELF_DEFINE_STB(STB_HIOS, 12, "end of OS-specific range") \
_ELF_DEFINE_STB(STB_LOPROC, 13, \
"start of processor-specific range") \
@@ -1248,6 +1262,7 @@
"start of processor-specific types") \
_ELF_DEFINE_STT(STT_ARM_TFUNC, 13, "Thumb function (GNU)") \
_ELF_DEFINE_STT(STT_ARM_16BIT, 15, "Thumb label (GNU)") \
+_ELF_DEFINE_STT(STT_SPARC_REGISTER, 13, "SPARC register information") \
_ELF_DEFINE_STT(STT_HIPROC, 15, \
"end of processor-specific types")
@@ -1384,7 +1399,7 @@
_ELF_DEFINE_RELOC(R_386_PLT32, 4) \
_ELF_DEFINE_RELOC(R_386_COPY, 5) \
_ELF_DEFINE_RELOC(R_386_GLOB_DAT, 6) \
-_ELF_DEFINE_RELOC(R_386_JMP_SLOT, 7) \
+_ELF_DEFINE_RELOC(R_386_JUMP_SLOT, 7) \
_ELF_DEFINE_RELOC(R_386_RELATIVE, 8) \
_ELF_DEFINE_RELOC(R_386_GOTOFF, 9) \
_ELF_DEFINE_RELOC(R_386_GOTPC, 10) \
@@ -1395,6 +1410,132 @@
_ELF_DEFINE_RELOC(R_386_PC8, 23)
/*
+ */
+#define _ELF_DEFINE_AARCH64_RELOCATIONS() \
+_ELF_DEFINE_RELOC(R_AARCH64_NONE, 0) \
+_ELF_DEFINE_RELOC(R_AARCH64_ABS64, 257) \
+_ELF_DEFINE_RELOC(R_AARCH64_ABS32, 258) \
+_ELF_DEFINE_RELOC(R_AARCH64_ABS16, 259) \
+_ELF_DEFINE_RELOC(R_AARCH64_PREL64, 260) \
+_ELF_DEFINE_RELOC(R_AARCH64_PREL32, 261) \
+_ELF_DEFINE_RELOC(R_AARCH64_PREL16, 262) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G0, 263) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G0_NC, 264) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G1, 265) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G1_NC, 266) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G2, 267) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G2_NC, 268) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_UABS_G3, 269) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_SABS_G0, 270) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_SABS_G1, 271) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_SABS_G2, 272) \
+_ELF_DEFINE_RELOC(R_AARCH64_LD_PREL_LO19, 273) \
+_ELF_DEFINE_RELOC(R_AARCH64_ADR_PREL_LO21, 274) \
+_ELF_DEFINE_RELOC(R_AARCH64_ADR_PREL_PG_HI21, 275) \
+_ELF_DEFINE_RELOC(R_AARCH64_ADR_PREL_PG_HI21_NC, 276) \
+_ELF_DEFINE_RELOC(R_AARCH64_ADD_ABS_LO12_NC, 277) \
+_ELF_DEFINE_RELOC(R_AARCH64_LDST8_ABS_LO12_NC, 278) \
+_ELF_DEFINE_RELOC(R_AARCH64_TSTBR14, 279) \
+_ELF_DEFINE_RELOC(R_AARCH64_CONDBR19, 280) \
+_ELF_DEFINE_RELOC(R_AARCH64_JUMP26, 282) \
+_ELF_DEFINE_RELOC(R_AARCH64_CALL26, 283) \
+_ELF_DEFINE_RELOC(R_AARCH64_LDST16_ABS_LO12_NC, 284) \
+_ELF_DEFINE_RELOC(R_AARCH64_LDST32_ABS_LO12_NC, 285) \
+_ELF_DEFINE_RELOC(R_AARCH64_LDST64_ABS_LO12_NC, 286) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G0, 287) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G0_NC, 288) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G1, 289) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G1_NC, 290) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G2, 291) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G2_NC, 292) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_PREL_G3, 293) \
+_ELF_DEFINE_RELOC(R_AARCH64_LDST128_ABS_LO12_NC, 299) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G0, 300) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G0_NC, 301) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G1, 302) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G1_NC, 303) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G2, 304) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G2_NC, 305) \
+_ELF_DEFINE_RELOC(R_AARCH64_MOVW_GOTOFF_G3, 306) \
+_ELF_DEFINE_RELOC(R_AARCH64_GOTREL64, 307) \
+_ELF_DEFINE_RELOC(R_AARCH64_GOTREL32, 308) \
+_ELF_DEFINE_RELOC(R_AARCH64_GOT_LD_PREL19, 309) \
+_ELF_DEFINE_RELOC(R_AARCH64_LD64_GOTOFF_LO15, 310) \
+_ELF_DEFINE_RELOC(R_AARCH64_ADR_GOT_PAGE, 311) \
+_ELF_DEFINE_RELOC(R_AARCH64_LD64_GOT_LO12_NC, 312) \
+_ELF_DEFINE_RELOC(R_AARCH64_LD64_GOTPAGE_LO15, 313) \
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_ADR_PREL21, 512) \
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_ADR_PAGE21, 513) \
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_ADD_LO12_NC, 514) \
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_MOVW_G1, 515) \
+_ELF_DEFINE_RELOC(R_AARCH64_TLSGD_MOVW_G0_NC, 516) \
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_ADR_PREL21, 517) \
+_ELF_DEFINE_RELOC(R_AARCH64_TLSLD_ADR_PAGE21, 518) \
Home |
Main Index |
Thread Index |
Old Index