aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/ecoff.c5
-rw-r--r--binutils/ChangeLog6
-rw-r--r--binutils/elfcomm.h1
-rw-r--r--binutils/readelf.c14
-rw-r--r--gas/ChangeLog8
-rw-r--r--gas/config/obj-coff.c5
-rw-r--r--gas/config/tc-cr16.c26
-rw-r--r--gas/config/tc-crx.c1
-rw-r--r--include/ChangeLog4
-rw-r--r--include/opcode/cr16.h1
-rw-r--r--ld/ChangeLog6
-rw-r--r--ld/ldbuildid.c7
-rw-r--r--opcodes/ChangeLog8
-rw-r--r--opcodes/arm-dis.c5
-rw-r--r--opcodes/cr16-dis.c2
-rw-r--r--opcodes/score-dis.c8
-rw-r--r--opcodes/score7-dis.c4
18 files changed, 65 insertions, 51 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index aa62c92..4977dc9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2021-04-01 Martin Liska <mliska@suse.cz>
+ * ecoff.c (strneq): Remove strneq and use startswith.
+ (_bfd_ecoff_slurp_armap): Likewise.
+
+2021-04-01 Martin Liska <mliska@suse.cz>
+
* elf-bfd.h (bfd_section_is_ctf): Use startswith function.
* elf.c (_bfd_elf_make_section_from_shdr): Likewise.
(elf_get_reloc_section): Likewise.
diff --git a/bfd/ecoff.c b/bfd/ecoff.c
index f09fc1d..7844a50 100644
--- a/bfd/ecoff.c
+++ b/bfd/ecoff.c
@@ -46,7 +46,6 @@
#include "libiberty.h"
#define streq(a, b) (strcmp ((a), (b)) == 0)
-#define strneq(a, b, n) (strncmp ((a), (b), (n)) == 0)
/* This stuff is somewhat copied from coffcode.h. */
@@ -2870,14 +2869,14 @@ _bfd_ecoff_slurp_armap (bfd *abfd)
return bfd_slurp_armap (abfd);
/* See if the first element is an armap. */
- if (! strneq (nextname, ecoff_backend (abfd)->armap_start, ARMAP_START_LENGTH)
+ if (strncmp (nextname, ecoff_backend (abfd)->armap_start, ARMAP_START_LENGTH) != 0
|| nextname[ARMAP_HEADER_MARKER_INDEX] != ARMAP_MARKER
|| (nextname[ARMAP_HEADER_ENDIAN_INDEX] != ARMAP_BIG_ENDIAN
&& nextname[ARMAP_HEADER_ENDIAN_INDEX] != ARMAP_LITTLE_ENDIAN)
|| nextname[ARMAP_OBJECT_MARKER_INDEX] != ARMAP_MARKER
|| (nextname[ARMAP_OBJECT_ENDIAN_INDEX] != ARMAP_BIG_ENDIAN
&& nextname[ARMAP_OBJECT_ENDIAN_INDEX] != ARMAP_LITTLE_ENDIAN)
- || ! strneq (nextname + ARMAP_END_INDEX, ARMAP_END, sizeof ARMAP_END - 1))
+ || strncmp (nextname + ARMAP_END_INDEX, ARMAP_END, sizeof ARMAP_END - 1) != 0)
{
abfd->has_armap = false;
return true;
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 1ffbdf8..844dbf4 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,5 +1,11 @@
2021-04-01 Martin Liska <mliska@suse.cz>
+ * elfcomm.h (strneq): Remove strneq and use startswith.
+ * readelf.c (ia64_process_unwind): Likewise.
+ (process_note): Likewise.
+
+2021-04-01 Martin Liska <mliska@suse.cz>
+
* dllwrap.c: Use startswith function.
* objcopy.c (is_dwo_section): Likewise.
(handle_remove_section_option): Likewise.
diff --git a/binutils/elfcomm.h b/binutils/elfcomm.h
index 04e909c..921d42c 100644
--- a/binutils/elfcomm.h
+++ b/binutils/elfcomm.h
@@ -47,7 +47,6 @@ extern void byte_get_64 (const unsigned char *, elf_vma *, elf_vma *);
/* This is just a bit of syntatic sugar. */
#define streq(a,b) (strcmp ((a), (b)) == 0)
-#define strneq(a,b,n) (strncmp ((a), (b), (n)) == 0)
/* Structure to hold information about an archive file. */
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 01fba0b..5bc59e4 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -8235,8 +8235,8 @@ ia64_process_unwind (Filedata * filedata)
}
}
else if (SECTION_NAME_VALID (unwsec)
- && strneq (SECTION_NAME (unwsec),
- ELF_STRING_ia64_unwind_once, len))
+ && startswith (SECTION_NAME (unwsec),
+ ELF_STRING_ia64_unwind_once))
{
/* .gnu.linkonce.ia64unw.FOO -> .gnu.linkonce.ia64unwi.FOO. */
len2 = sizeof (ELF_STRING_ia64_unwind_info_once) - 1;
@@ -8245,8 +8245,8 @@ ia64_process_unwind (Filedata * filedata)
i < filedata->file_header.e_shnum;
++i, ++sec)
if (SECTION_NAME_VALID (sec)
- && strneq (SECTION_NAME (sec),
- ELF_STRING_ia64_unwind_info_once, len2)
+ && startswith (SECTION_NAME (sec),
+ ELF_STRING_ia64_unwind_info_once)
&& streq (SECTION_NAME (sec) + len2, suffix))
break;
}
@@ -8258,13 +8258,13 @@ ia64_process_unwind (Filedata * filedata)
len2 = sizeof (ELF_STRING_ia64_unwind_info) - 1;
suffix = "";
if (SECTION_NAME_VALID (unwsec)
- && strneq (SECTION_NAME (unwsec), ELF_STRING_ia64_unwind, len))
+ && startswith (SECTION_NAME (unwsec), ELF_STRING_ia64_unwind))
suffix = SECTION_NAME (unwsec) + len;
for (i = 0, sec = filedata->section_headers;
i < filedata->file_header.e_shnum;
++i, ++sec)
if (SECTION_NAME_VALID (sec)
- && strneq (SECTION_NAME (sec), ELF_STRING_ia64_unwind_info, len2)
+ && startswith (SECTION_NAME (sec), ELF_STRING_ia64_unwind_info)
&& streq (SECTION_NAME (sec) + len2, suffix))
break;
}
@@ -20449,7 +20449,7 @@ process_note (Elf_Internal_Note * pnote,
/* NetBSD-specific core file notes. */
return process_netbsd_elf_note (pnote);
- else if (strneq (pnote->namedata, "SPU/", 4))
+ else if (startswith (pnote->namedata, "SPU/"))
{
/* SPU-specific core file notes. */
nt = pnote->namedata + 4;
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 98918d6..b011f1c 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,13 @@
2021-04-01 Martin Liska <mliska@suse.cz>
+ * config/obj-coff.c (strneq): Remove strneq and use startswith.
+ (weak_is_altname): Likewise.
+ (obj_coff_section): Likewise.
+ * config/tc-cr16.c (process_label_constant): Likewise.
+ * config/tc-crx.c (strneq): Likewise.
+
+2021-04-01 Martin Liska <mliska@suse.cz>
+
* as.c (select_emulation_mode): Use startswith.
* config/m68k-parse.y: Likewise.
* config/obj-aout.c (obj_aout_type): Likewise.
diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index 3c008a3..f3cc327 100644
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -33,7 +33,6 @@
#endif
#define streq(a,b) (strcmp ((a), (b)) == 0)
-#define strneq(a,b,n) (strncmp ((a), (b), (n)) == 0)
/* I think this is probably always correct. */
#ifndef KEEP_RELOC_INFO
@@ -1058,7 +1057,7 @@ obj_coff_val (int ignore ATTRIBUTE_UNUSED)
static int
weak_is_altname (const char * name)
{
- return strneq (name, weak_altprefix, sizeof (weak_altprefix) - 1);
+ return startswith (name, weak_altprefix);
}
/* Return the name of the alternate symbol
@@ -1667,7 +1666,7 @@ obj_coff_section (int ignore ATTRIBUTE_UNUSED)
/* Add SEC_LINK_ONCE and SEC_LINK_DUPLICATES_DISCARD to .gnu.linkonce
sections so adjust_reloc_syms in write.c will correctly handle
relocs which refer to non-local symbols in these sections. */
- if (strneq (name, ".gnu.linkonce", sizeof (".gnu.linkonce") - 1))
+ if (startswith (name, ".gnu.linkonce"))
flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
#endif
diff --git a/gas/config/tc-cr16.c b/gas/config/tc-cr16.c
index 733b08e..1f6b1fe 100644
--- a/gas/config/tc-cr16.c
+++ b/gas/config/tc-cr16.c
@@ -905,34 +905,34 @@ process_label_constant (char *str, ins * cr16_ins)
cr16_ins->rtype = BFD_RELOC_NONE;
relocatable = 1;
- if (strneq (input_line_pointer, "@c", 2))
+ if (startswith (input_line_pointer, "@c"))
symbol_with_at = 1;
- if (strneq (input_line_pointer, "@l", 2)
- || strneq (input_line_pointer, ":l", 2))
+ if (startswith (input_line_pointer, "@l")
+ || startswith (input_line_pointer, ":l"))
symbol_with_l = 1;
- if (strneq (input_line_pointer, "@m", 2)
- || strneq (input_line_pointer, ":m", 2))
+ if (startswith (input_line_pointer, "@m")
+ || startswith (input_line_pointer, ":m"))
symbol_with_m = 1;
- if (strneq (input_line_pointer, "@s", 2)
- || strneq (input_line_pointer, ":s", 2))
+ if (startswith (input_line_pointer, "@s")
+ || startswith (input_line_pointer, ":s"))
symbol_with_s = 1;
- if (strneq (input_line_pointer, "@cGOT", 5)
- || strneq (input_line_pointer, "@cgot", 5))
+ if (startswith (input_line_pointer, "@cGOT")
+ || startswith (input_line_pointer, "@cgot"))
{
if (GOT_symbol == NULL)
GOT_symbol = symbol_find_or_make (GLOBAL_OFFSET_TABLE_NAME);
symbol_with_at_gotc = 1;
}
- else if (strneq (input_line_pointer, "@GOT", 4)
- || strneq (input_line_pointer, "@got", 4))
+ else if (startswith (input_line_pointer, "@GOT")
+ || startswith (input_line_pointer, "@got"))
{
- if ((strneq (input_line_pointer, "+", 1))
- || (strneq (input_line_pointer, "-", 1)))
+ if ((startswith (input_line_pointer, "+"))
+ || (startswith (input_line_pointer, "-")))
as_warn (_("GOT bad expression with %s."), input_line_pointer);
if (GOT_symbol == NULL)
diff --git a/gas/config/tc-crx.c b/gas/config/tc-crx.c
index a82acb5..d33a0bf 100644
--- a/gas/config/tc-crx.c
+++ b/gas/config/tc-crx.c
@@ -43,7 +43,6 @@
/* Utility macros for string comparison. */
#define streq(a, b) (strcmp (a, b) == 0)
-#define strneq(a, b, c) (strncmp (a, b, c) == 0)
/* Assign a number NUM, shifted by SHIFT bytes, into a location
pointed by index BYTE of array 'output_opcode'. */
diff --git a/include/ChangeLog b/include/ChangeLog
index ab3f029..9eb5f0a 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,7 @@
+2021-04-01 Martin Liska <mliska@suse.cz>
+
+ * opcode/cr16.h (strneq): Remove strneq and use startswith.
+
2021-03-31 Alan Modra <amodra@gmail.com>
* bfdlink.h: Replace bfd_boolean with bool throughout.
diff --git a/include/opcode/cr16.h b/include/opcode/cr16.h
index a96b337..09e2712 100644
--- a/include/opcode/cr16.h
+++ b/include/opcode/cr16.h
@@ -425,7 +425,6 @@ extern const char * cr16_no_op_insn[];
/* Utility macros for string comparison. */
#define streq(a, b) (strcmp (a, b) == 0)
-#define strneq(a, b, c) (strncmp (a, b, c) == 0)
/* Long long type handling. */
/* Replace all appearances of 'long long int' with LONGLONG. */
diff --git a/ld/ChangeLog b/ld/ChangeLog
index d2c3c04..7b8e411 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,9 @@
+2021-04-01 Martin Liska <mliska@suse.cz>
+
+ * ldbuildid.c (strneq): Remove strneq and use startswith.
+ (validate_build_id_style): Likewise.
+ (compute_build_id_size): Likewise.
+
2021-03-31 Alan Modra <amodra@gmail.com>
* sysdep.h (POISON_BFD_BOOLEAN): Define.
diff --git a/ld/ldbuildid.c b/ld/ldbuildid.c
index c0e91bc..0642ec0 100644
--- a/ld/ldbuildid.c
+++ b/ld/ldbuildid.c
@@ -30,13 +30,12 @@
#endif
#define streq(a,b) strcmp ((a), (b)) == 0
-#define strneq(a,b,n) strncmp ((a), (b), (n)) == 0
bool
validate_build_id_style (const char *style)
{
if ((streq (style, "md5")) || (streq (style, "sha1"))
- || (streq (style, "uuid")) || (strneq (style, "0x", 2)))
+ || (streq (style, "uuid")) || (startswith (style, "0x")))
return true;
return false;
@@ -51,7 +50,7 @@ compute_build_id_size (const char *style)
if (streq (style, "sha1"))
return 160 / 8;
- if (strneq (style, "0x", 2))
+ if (startswith (style, "0x"))
{
bfd_size_type size = 0;
/* ID is in string form (hex). Count the bytes. */
@@ -156,7 +155,7 @@ generate_build_id (bfd *abfd,
(size_t) size < sizeof (UUID) ? (size_t) size : sizeof (UUID));
#endif /* __MINGW32__ */
}
- else if (strneq (style, "0x", 2))
+ else if (startswith (style, "0x"))
{
/* ID is in string form (hex). Convert to bits. */
const char *id = style + 2;
diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index d89e876..a08e57a 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,11 @@
+2021-04-01 Martin Liska <mliska@suse.cz>
+
+ * arm-dis.c (strneq): Remove strneq and use startswith.
+ * cr16-dis.c (print_insn_cr16): Likewise.
+ * score-dis.c (streq): Likewise.
+ (strneq): Likewise.
+ * score7-dis.c (strneq): Likewise.
+
2021-04-01 Alan Modra <amodra@gmail.com>
PR 27675
diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 7979987..4130919 100644
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -39,11 +39,6 @@
#include "elf/arm.h"
#include "mach-o.h"
-/* FIXME: Belongs in global header. */
-#ifndef strneq
-#define strneq(a,b,n) (strncmp ((a), (b), (n)) == 0)
-#endif
-
/* Cached mapping symbol state. */
enum map_type
{
diff --git a/opcodes/cr16-dis.c b/opcodes/cr16-dis.c
index d5840cb..ac85552 100644
--- a/opcodes/cr16-dis.c
+++ b/opcodes/cr16-dis.c
@@ -800,7 +800,7 @@ print_insn_cr16 (bfd_vma memaddr, struct disassemble_info *info)
/* If found, print the instruction's mnemonic and arguments. */
if (is_decoded > 0 && (cr16_words[0] != 0 || cr16_words[1] != 0))
{
- if (strneq (instruction->mnemonic, "cinv", 4))
+ if (startswith (instruction->mnemonic, "cinv"))
info->fprintf_func (info->stream,"%s",
getcinvstring (instruction->mnemonic));
else
diff --git a/opcodes/score-dis.c b/opcodes/score-dis.c
index c1b9227..3ec5c6a 100644
--- a/opcodes/score-dis.c
+++ b/opcodes/score-dis.c
@@ -477,14 +477,6 @@ static struct score_opcode score_opcodes[] =
};
-#ifndef streq
-#define streq(a,b) (strcmp ((a), (b)) == 0)
-#endif
-
-#ifndef strneq
-#define strneq(a,b,n) (strncmp ((a), (b), (n)) == 0)
-#endif
-
#ifndef NUM_ELEM
#define NUM_ELEM(a) (sizeof (a) / sizeof (a)[0])
#endif
diff --git a/opcodes/score7-dis.c b/opcodes/score7-dis.c
index 5387307..6ffc7f6 100644
--- a/opcodes/score7-dis.c
+++ b/opcodes/score7-dis.c
@@ -37,10 +37,6 @@
#define streq(a,b) (strcmp ((a), (b)) == 0)
#endif
-#ifndef strneq
-#define strneq(a,b,n) (strncmp ((a), (b), (n)) == 0)
-#endif
-
#ifndef NUM_ELEM
#define NUM_ELEM(a) (sizeof (a) / sizeof (a)[0])
#endif
generated by cgit v1.1 at 2024-11-29 21:35:16 +0000