diff options
Diffstat (limited to 'gas')
-rw-r--r-- | gas/config/obj-coff.c | 5 | ||||
-rw-r--r-- | gas/config/tc-cr16.c | 26 | ||||
-rw-r--r-- | gas/config/tc-crx.c | 1 |
3 files changed, 15 insertions, 17 deletions
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'. */ |