[ARM] Fix NULL dereference of march_ext_opt

[deliverable/binutils-gdb.git] / gas / config / tc-bfin.h

diff --git a/gas/config/tc-bfin.h b/gas/config/tc-bfin.h
index f949b4e46582bfa8954d9a31372f77c771c92b69..a6b2ba8758d953d03cf0b75ba6f98c5d47e71596 100644 (file)
--- a/gas/config/tc-bfin.h
+++ b/gas/config/tc-bfin.h
@@ -1,6 +1,5 @@
 /* tc-bfin.h - header file for tc-bfin.c
-   Copyright 2005, 2006, 2007, 2008, 2009
-   Free Software Foundation, Inc.
+   Copyright (C) 2005-2018 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -28,21 +27,19 @@
 
 /*
  * Define the target format macro here.   The value for this should be
- * "elf32-bfin", not "elf32-little-bfin".  Since the BFD source file 
+ * "elf32-bfin", not "elf32-little-bfin".  Since the BFD source file
  * elf32-bfin.c defines TARGET_LITTLE_NAME to be "elf32-little-bfin",
  * we must use this value, until this is corrected and BFD is rebuilt.  */
 #ifdef OBJ_ELF
-#define TARGET_FORMAT          "elf32-bfin" 
+#define TARGET_FORMAT          "elf32-bfin"
 #endif
 
 #define LISTING_HEADER "BFIN GAS "
 
 #define WORKING_DOT_WORD
 
-extern void bfin_start_line_hook (void);
-extern bfd_boolean bfin_start_label (char *, char *);
+extern bfd_boolean bfin_start_label (char *);
 
-#define md_start_line_hook()    bfin_start_line_hook()
 #define md_number_to_chars     number_to_chars_littleendian
 #define md_convert_frag(b,s,f) as_fatal ("bfin convert_frag\n");
 
@@ -55,13 +52,14 @@ extern bfd_boolean bfin_eol_in_insn (char *);
 /* Almost all instructions of Blackfin contain an = character.  */
 #define TC_EQUAL_IN_INSN(C, NAME) 1
 
-#define NOP_OPCODE 0x0000 
+#define NOP_OPCODE 0x0000
 
 #define LOCAL_LABELS_FB 1
 
 #define DOUBLESLASH_LINE_COMMENTS
 
-#define TC_START_LABEL(c, s, ptr) (c == ':' && bfin_start_label (s, ptr))
+#define TC_START_LABEL(STR, NUL_CHAR, NEXT_CHAR)       \
+  (NEXT_CHAR == ':' && bfin_start_label (STR))
 #define tc_fix_adjustable(FIX) bfin_fix_adjustable (FIX)
 extern bfd_boolean bfin_fix_adjustable (struct fix *);