Regenerate configure

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

diff --git a/gas/config/tc-fr30.h b/gas/config/tc-fr30.h
index 4119bd929c19fa31e937a36fb365da9c67e14a91..590cfa68b2a0ac1917db3603fea8a50114c683b2 100644 (file)
--- a/gas/config/tc-fr30.h
+++ b/gas/config/tc-fr30.h
@@ -1,12 +1,11 @@
 /* tc-fr30.h -- Header file for tc-fr30.c.
 /* tc-fr30.h -- Header file for tc-fr30.c.

-   Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2005
-   Free Software Foundation, Inc.
+   Copyright (C) 1998-2016 Free Software Foundation, Inc.

 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)

    any later version.
 
    GAS is distributed in the hope that it will be useful,
    any later version.
 
    GAS is distributed in the hope that it will be useful,


@@ -16,16 +15,11 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to

-   the Free Software Foundation, 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */

 
 #define TC_FR30
 
 
 #define TC_FR30
 

-#ifndef BFD_ASSEMBLER
-/* Leading space so will compile with cc.  */
- #error FR30 support requires BFD_ASSEMBLER
-#endif
-

 #define LISTING_HEADER "FR30 GAS "
 
 /* The target BFD architecture.  */
 #define LISTING_HEADER "FR30 GAS "
 
 /* The target BFD architecture.  */


@@ -43,10 +37,10 @@
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 

-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */

 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #define MD_APPLY_SYM_VALUE(FIX) 0
 

-#define md_apply_fix3 gas_cgen_md_apply_fix3
+#define md_apply_fix gas_cgen_md_apply_fix

 
 #define tc_fix_adjustable(FIX) fr30_fix_adjustable (FIX)
 struct fix;
 
 #define tc_fix_adjustable(FIX) fr30_fix_adjustable (FIX)
 struct fix;


@@ -64,12 +58,8 @@ extern const struct relax_type md_relax_table[];
 
 /* We need a special version of the TC_START_LABEL macro so that we
    allow the LDI:8, LDI:20, LDI:32 and delay slot instructions to be
 
 /* We need a special version of the TC_START_LABEL macro so that we
    allow the LDI:8, LDI:20, LDI:32 and delay slot instructions to be

-   parsed as such.  Note - in a HORRIBLE HACK, we make use of the
-   knowledge that this marco is only ever evaluated in one place
-   (read_a_source_file in read.c) where we can access the local
-   variable 's' - the start of the symbol that was terminated by
-   'character'.  Also we need to be able to change the contents of
-   the local variable 'c' which is passed to this macro as 'character'.  */
-#define TC_START_LABEL(character, i_l_p)                       \
-  ((character) != ':' ? 0 : (character = fr30_is_colon_insn (s)) ? 0 : ((character = ':'), 1))
-extern char fr30_is_colon_insn (char *);
+   parsed as such.  We need to be able to change the contents of the
+   var storing what was at the NUL delimiter.  */
+#define TC_START_LABEL(STR, NUL_CHAR, NEXT_CHAR)               \
+  (NEXT_CHAR == ':' && !fr30_is_colon_insn (STR, &NUL_CHAR))
+extern int fr30_is_colon_insn (char *, char *);