diff options
author | Martin Liska <mliska@suse.cz> | 2021-03-19 11:50:26 +0100 |
---|---|---|
committer | Martin Liska <mliska@suse.cz> | 2021-03-22 11:01:43 +0100 |
commit | 08dedd6631efefbcba63c4dbf60ef97fb615e022 (patch) | |
tree | acadfab6919e8d5c761f6877d33d6f0869083567 /binutils | |
parent | 1e7fcccb8d6d0a6bd295a50400c553cc595250f1 (diff) | |
download | gdb-08dedd6631efefbcba63c4dbf60ef97fb615e022.zip gdb-08dedd6631efefbcba63c4dbf60ef97fb615e022.tar.gz gdb-08dedd6631efefbcba63c4dbf60ef97fb615e022.tar.bz2 |
Add startswith function and use it instead of CONST_STRNEQ.
bfd/ChangeLog:
* bfd-in.h (startswith): Add startswith function.
(CONST_STRNEQ): Remove.
* bfd-in2.h (startswith): Regenerate with make headers.
* archive.c (bfd_slurp_armap): Replace usage of CONST_STRNEQ with startswith.
(_bfd_slurp_extended_name_table): Likewise.
* archive64.c (_bfd_archive_64_bit_slurp_armap): Likewise.
* bfd.c (bfd_get_sign_extend_vma): Likewise.
(bfd_convert_section_size): Likewise.
(bfd_convert_section_contents): Likewise.
* coff-stgo32.c (go32exe_create_stub): Likewise.
(go32exe_check_format): Likewise.
* coffcode.h (styp_to_sec_flags): Likewise.
(GNU_DEBUGALTLINK): Likewise.
* coffgen.c (_bfd_coff_section_already_linked): Likewise.
(coff_gc_sweep): Likewise.
(bfd_coff_gc_sections): Likewise.
* cofflink.c (coff_link_add_symbols): Likewise.
(process_embedded_commands): Likewise.
* compress.c (bfd_is_section_compressed_with_header): Likewise.
(bfd_init_section_decompress_status): Likewise.
* dwarf2.c (find_debug_info): Likewise.
(place_sections): Likewise.
* ecoff.c (_bfd_ecoff_slurp_armap): Likewise.
* elf-m10300.c (_bfd_mn10300_elf_size_dynamic_sections): Likewise.
* elf.c (_bfd_elf_make_section_from_shdr): Likewise.
(assign_section_numbers): Likewise.
(elfcore_grok_win32pstatus): Likewise.
* elf32-arm.c (cmse_scan): Likewise.
(elf32_arm_gc_mark_extra_sections): Likewise.
(elf32_arm_size_dynamic_sections): Likewise.
(is_arm_elf_unwind_section_name): Likewise.
* elf32-bfin.c (bfin_size_dynamic_sections): Likewise.
* elf32-cr16.c (_bfd_cr16_elf_size_dynamic_sections): Likewise.
* elf32-cris.c (elf_cris_size_dynamic_sections): Likewise.
* elf32-csky.c (csky_elf_size_dynamic_sections): Likewise.
* elf32-hppa.c (elf32_hppa_size_dynamic_sections): Likewise.
* elf32-iq2000.c (iq2000_elf_check_relocs): Likewise.
* elf32-lm32.c (lm32_elf_size_dynamic_sections): Likewise.
* elf32-m32r.c (m32r_elf_size_dynamic_sections): Likewise.
* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
* elf32-metag.c (elf_metag_size_dynamic_sections): Likewise.
* elf32-msp430.c (msp430_elf_relax_delete_bytes): Likewise.
* elf32-nios2.c (nios2_elf32_size_dynamic_sections): Likewise.
* elf32-or1k.c (or1k_elf_size_dynamic_sections): Likewise.
* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise.
* elf32-s390.c (elf_s390_size_dynamic_sections): Likewise.
* elf32-score.c (s3_bfd_score_elf_size_dynamic_sections): Likewise.
* elf32-score7.c (s7_bfd_score_elf_size_dynamic_sections): Likewise.
* elf32-sh.c (sh_elf_size_dynamic_sections): Likewise.
* elf32-tic6x.c (is_tic6x_elf_unwind_section_name): Likewise.
(elf32_tic6x_size_dynamic_sections): Likewise.
* elf32-vax.c (elf_vax_size_dynamic_sections): Likewise.
* elf32-xtensa.c (elf_xtensa_size_dynamic_sections): Likewise.
(xtensa_is_insntable_section): Likewise.
(xtensa_is_littable_section): Likewise.
(xtensa_is_proptable_section): Likewise.
(xtensa_property_section_name): Likewise.
(xtensa_callback_required_dependence): Likewise.
* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Likewise.
* elf64-hppa.c (elf64_hppa_size_dynamic_sections): Likewise.
* elf64-ia64-vms.c (is_unwind_section_name): Likewise.
(get_reloc_section): Likewise.
(elf64_ia64_size_dynamic_sections): Likewise.
(elf64_ia64_object_p): Likewise.
* elf64-mmix.c (mmix_elf_add_symbol_hook): Likewise.
* elf64-ppc.c (ppc64_elf_size_dynamic_sections): Likewise.
* elf64-s390.c (elf_s390_size_dynamic_sections): Likewise.
* elflink.c (elf_link_add_object_symbols): Likewise.
(_bfd_elf_gc_mark_extra_sections): Likewise.
(bfd_elf_parse_eh_frame_entries): Likewise.
(_bfd_elf_section_already_linked): Likewise.
* elfnn-aarch64.c (elfNN_aarch64_size_dynamic_sections): Likewise.
* elfnn-ia64.c (is_unwind_section_name): Likewise.
(elfNN_ia64_size_dynamic_sections): Likewise.
(elfNN_ia64_object_p): Likewise.
* elfxx-mips.c (FN_STUB_P): Likewise.
(CALL_STUB_P): Likewise.
(CALL_FP_STUB_P): Likewise.
(_bfd_mips_elf_section_from_shdr): Likewise.
(_bfd_mips_elf_fake_sections): Likewise.
(_bfd_mips_elf_size_dynamic_sections): Likewise.
(_bfd_mips_final_write_processing): Likewise.
(_bfd_mips_elf_final_link): Likewise.
* elfxx-sparc.c (_bfd_sparc_elf_size_dynamic_sections): Likewise.
* elfxx-x86.c (elf_i386_is_reloc_section): Likewise.
(elf_x86_64_is_reloc_section): Likewise.
* hpux-core.c (thread_section_p): Likewise.
* libcoff.h (bfd_pei_p): Likewise.
* linker.c (REAL): Likewise.
(unwrap_hash_lookup): Likewise.
(_bfd_generic_link_add_one_symbol): Likewise.
* mmo.c (mmo_internal_write_section): Likewise.
* osf-core.c (osf_core_core_file_p): Likewise.
* pef.c (bfd_pef_print_symbol): Likewise.
* pei-x86_64.c (pex64_print_all_pdata_sections): Likewise.
* som.c (som_slurp_symbol_table): Likewise.
(som_slurp_armap): Likewise.
* wasm-module.c (wasm_compute_custom_section_file_position): Likewise.
binutils/ChangeLog:
* dlltool.c (scan_drectve_symbols): Replace usage of CONST_STRNEQ with startswith.
* emul_aix.c (ar_emul_aix_parse_arg): Likewise.
* objcopy.c (is_mergeable_note_section): Likewise.
* objdump.c (dump_dwarf_section): Likewise.
* prdbg.c (pr_method_type): Likewise.
(pr_class_baseclass): Likewise.
(tg_class_baseclass): Likewise.
* readelf.c (process_lto_symbol_tables): Likewise.
* stabs.c (ULLHIGH): Likewise.
(parse_stab_argtypes): Likewise.
(stab_demangle_function_name): Likewise.
gas/ChangeLog:
* config/tc-i386.c (md_parse_option): Replace usage of CONST_STRNEQ with startswith.
(x86_64_section_word): Likewise.
* config/tc-sparc.c (md_parse_option): Likewise.
gdb/ChangeLog:
* arm-tdep.c (show_disassembly_style_sfunc): Replace usage of CONST_STRNEQ with startswith.
(_initialize_arm_tdep): Likewise.
ld/ChangeLog:
* emultempl/aix.em: Replace usage of CONST_STRNEQ with startswith.
* emultempl/beos.em: Likewise.
* emultempl/elf.em: Likewise.
* emultempl/pe.em: Likewise.
* emultempl/pep.em: Likewise.
* emultempl/xtensaelf.em: Likewise.
* ldctor.c (ctor_prio): Likewise.
* ldelf.c (ldelf_try_needed): Likewise.
(ldelf_parse_ld_so_conf): Likewise.
(ldelf_after_open): Likewise.
(output_rel_find): Likewise.
(ldelf_place_orphan): Likewise.
* ldfile.c (ldfile_add_library_path): Likewise.
* ldlang.c (lang_add_input_file): Likewise.
* ldmain.c (get_sysroot): Likewise.
(get_emulation): Likewise.
(add_archive_element): Likewise.
* ldwrite.c (unsplittable_name): Likewise.
(clone_section): Likewise.
* lexsup.c (parse_args): Likewise.
* pe-dll.c (is_import): Likewise.
(pe_implied_import_dll): Likewise.
opcodes/ChangeLog:
* aarch64-dis.c (parse_aarch64_dis_option): Replace usage of CONST_STRNEQ with startswith.
* arc-dis.c (parse_option): Likewise.
* arm-dis.c (parse_arm_disassembler_options): Likewise.
* cris-dis.c (print_with_operands): Likewise.
* h8300-dis.c (bfd_h8_disassemble): Likewise.
* i386-dis.c (print_insn): Likewise.
* ia64-gen.c (fetch_insn_class): Likewise.
(parse_resource_users): Likewise.
(in_iclass): Likewise.
(lookup_specifier): Likewise.
(insert_opcode_dependencies): Likewise.
* mips-dis.c (parse_mips_ase_option): Likewise.
(parse_mips_dis_option): Likewise.
* s390-dis.c (disassemble_init_s390): Likewise.
* wasm32-dis.c (parse_wasm32_disassembler_options): Likewise.
Diffstat (limited to 'binutils')
-rw-r--r-- | binutils/ChangeLog | 14 | ||||
-rw-r--r-- | binutils/dlltool.c | 4 | ||||
-rw-r--r-- | binutils/emul_aix.c | 8 | ||||
-rw-r--r-- | binutils/objcopy.c | 2 | ||||
-rw-r--r-- | binutils/objdump.c | 2 | ||||
-rw-r--r-- | binutils/prdbg.c | 8 | ||||
-rw-r--r-- | binutils/readelf.c | 2 | ||||
-rw-r--r-- | binutils/stabs.c | 12 |
8 files changed, 33 insertions, 19 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog index c6f7963..461a1f5 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,17 @@ +2021-03-22 Martin Liska <mliska@suse.cz> + + * dlltool.c (scan_drectve_symbols): Replace usage of CONST_STRNEQ with startswith. + * emul_aix.c (ar_emul_aix_parse_arg): Likewise. + * objcopy.c (is_mergeable_note_section): Likewise. + * objdump.c (dump_dwarf_section): Likewise. + * prdbg.c (pr_method_type): Likewise. + (pr_class_baseclass): Likewise. + (tg_class_baseclass): Likewise. + * readelf.c (process_lto_symbol_tables): Likewise. + * stabs.c (ULLHIGH): Likewise. + (parse_stab_argtypes): Likewise. + (stab_demangle_function_name): Likewise. + 2021-03-19 H.J. Lu <hongjiu.lu@intel.com> * readelf.c (get_machine_name): Add EM_INTELGT. diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 3d44a0b..ca31df9 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -1367,7 +1367,7 @@ scan_drectve_symbols (bfd *abfd) while (p < e) { if (p[0] == '-' - && CONST_STRNEQ (p, "-export:")) + && startswith (p, "-export:")) { char * name; char * c; @@ -1399,7 +1399,7 @@ scan_drectve_symbols (bfd *abfd) char *tag_start = ++p; while (p < e && *p != ' ' && *p != '-') p++; - if (CONST_STRNEQ (tag_start, "data")) + if (startswith (tag_start, "data")) flags &= ~BSF_FUNCTION; } diff --git a/binutils/emul_aix.c b/binutils/emul_aix.c index 5be8f38..c11c28b 100644 --- a/binutils/emul_aix.c +++ b/binutils/emul_aix.c @@ -91,25 +91,25 @@ ar_emul_aix_replace (bfd **after_bfd, bfd *new_bfd, static bfd_boolean ar_emul_aix_parse_arg (char *arg) { - if (CONST_STRNEQ (arg, "-X32_64")) + if (startswith (arg, "-X32_64")) { big_archive = TRUE; X32 = TRUE; X64 = TRUE; } - else if (CONST_STRNEQ (arg, "-X32")) + else if (startswith (arg, "-X32")) { big_archive = TRUE; X32 = TRUE; X64 = FALSE; } - else if (CONST_STRNEQ (arg, "-X64")) + else if (startswith (arg, "-X64")) { big_archive = TRUE; X32 = FALSE; X64 = TRUE; } - else if (CONST_STRNEQ (arg, "-g")) + else if (startswith (arg, "-g")) { big_archive = FALSE; X32 = TRUE; diff --git a/binutils/objcopy.c b/binutils/objcopy.c index d58f910..f5e48e8 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -1316,7 +1316,7 @@ is_mergeable_note_section (bfd * abfd, asection * sec) && elf_section_data (sec)->this_hdr.sh_type == SHT_NOTE /* FIXME: We currently only support merging GNU_BUILD_NOTEs. We should add support for more note types. */ - && (CONST_STRNEQ (sec->name, GNU_BUILD_ATTRS_SECTION_NAME))) + && (startswith (sec->name, GNU_BUILD_ATTRS_SECTION_NAME))) return TRUE; return FALSE; diff --git a/binutils/objdump.c b/binutils/objdump.c index 0aa0373..cb5ce5b 100644 --- a/binutils/objdump.c +++ b/binutils/objdump.c @@ -3748,7 +3748,7 @@ dump_dwarf_section (bfd *abfd, asection *section, const char *match; int i; - if (CONST_STRNEQ (name, ".gnu.linkonce.wi.")) + if (startswith (name, ".gnu.linkonce.wi.")) match = ".debug_info"; else match = name; diff --git a/binutils/prdbg.c b/binutils/prdbg.c index a93dccd..614d7f9 100644 --- a/binutils/prdbg.c +++ b/binutils/prdbg.c @@ -937,10 +937,10 @@ pr_method_type (void *p, bfd_boolean domain, int argcount, bfd_boolean varargs) domain_type = pop_type (info); if (domain_type == NULL) return FALSE; - if (CONST_STRNEQ (domain_type, "class ") + if (startswith (domain_type, "class ") && strchr (domain_type + sizeof "class " - 1, ' ') == NULL) domain_type += sizeof "class " - 1; - else if (CONST_STRNEQ (domain_type, "union class ") + else if (startswith (domain_type, "union class ") && (strchr (domain_type + sizeof "union class " - 1, ' ') == NULL)) domain_type += sizeof "union class " - 1; @@ -1349,7 +1349,7 @@ pr_class_baseclass (void *p, bfd_vma bitpos, bfd_boolean is_virtual, if (t == NULL) return FALSE; - if (CONST_STRNEQ (t, "class ")) + if (startswith (t, "class ")) t += sizeof "class " - 1; /* Push it back on to take advantage of the prepend_type and @@ -2238,7 +2238,7 @@ tg_class_baseclass (void *p, bfd_vma bitpos ATTRIBUTE_UNUSED, if (t == NULL) return FALSE; - if (CONST_STRNEQ (t, "class ")) + if (startswith (t, "class ")) t += sizeof "class " - 1; /* Push it back on to take advantage of the prepend_type and diff --git a/binutils/readelf.c b/binutils/readelf.c index cf62843..7370aa9 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -12708,7 +12708,7 @@ process_lto_symbol_tables (Filedata * filedata) i < filedata->file_header.e_shnum; i++, section++) if (SECTION_NAME_VALID (section) - && CONST_STRNEQ (SECTION_NAME (section), ".gnu.lto_.symtab.")) + && startswith (SECTION_NAME (section), ".gnu.lto_.symtab.")) res &= display_lto_symtab (filedata, section); return res; diff --git a/binutils/stabs.c b/binutils/stabs.c index 90254fd..5b6842e 100644 --- a/binutils/stabs.c +++ b/binutils/stabs.c @@ -1760,12 +1760,12 @@ parse_stab_range_type (void * dhandle, #define ULLHIGH "01777777777777777777777;" if (index_type == DEBUG_TYPE_NULL) { - if (CONST_STRNEQ (s2, LLLOW) - && CONST_STRNEQ (s3, LLHIGH)) + if (startswith (s2, LLLOW) + && startswith (s3, LLHIGH)) return debug_make_int_type (dhandle, 8, FALSE); if (! ov2 && n2 == 0 - && CONST_STRNEQ (s3, ULLHIGH)) + && startswith (s3, ULLHIGH)) return debug_make_int_type (dhandle, 8, TRUE); } @@ -2987,7 +2987,7 @@ parse_stab_argtypes (void *dhandle, struct stab_handle *info, && (ISDIGIT (argtypes[2]) || argtypes[2] == 'Q' || argtypes[2] == 't')) - || CONST_STRNEQ (argtypes, "__ct")); + || startswith (argtypes, "__ct")); is_constructor = (is_full_physname_constructor || (tagname != NULL @@ -2995,7 +2995,7 @@ parse_stab_argtypes (void *dhandle, struct stab_handle *info, is_destructor = ((argtypes[0] == '_' && (argtypes[1] == '$' || argtypes[1] == '.') && argtypes[2] == '_') - || CONST_STRNEQ (argtypes, "__dt")); + || startswith (argtypes, "__dt")); is_v3 = argtypes[0] == '_' && argtypes[1] == 'Z'; if (!(is_destructor || is_full_physname_constructor || is_v3)) @@ -3995,7 +3995,7 @@ stab_demangle_function_name (struct stab_demangle_info *minfo, *pp = scan + 2; if (*pp - name >= 5 - && CONST_STRNEQ (name, "type") + && startswith (name, "type") && (name[4] == '$' || name[4] == '.')) { const char *tem; |