* tc.h (struct relax_type, relax_typeS): Move from here..

[deliverable/binutils-gdb.git] / gas / config / tc-mcore.c

diff --git a/gas/config/tc-mcore.c b/gas/config/tc-mcore.c
index c10b75d226c76f9aaed71dbe32e4c1b4dc85e6cf..02f21394c5ec52da3ddafa27262895db3c0febe4 100644 (file)
--- a/gas/config/tc-mcore.c
+++ b/gas/config/tc-mcore.c
@@ -1,5 +1,6 @@
 /* tc-mcore.c -- Assemble code for M*Core
-   Copyright 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002, 2003, 2005
+   Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -42,7 +43,7 @@ static void   mcore_cons PARAMS ((int));
 static void   mcore_float_cons PARAMS ((int));
 static void   mcore_stringer PARAMS ((int));
 static void   mcore_fill   PARAMS ((int));
-static int    log2 PARAMS ((unsigned int));
+static int    mylog2 PARAMS ((unsigned int));
 static char * parse_reg    PARAMS ((char *, unsigned *));
 static char * parse_creg   PARAMS ((char *, unsigned *));
 static char * parse_exp    PARAMS ((char *, expressionS *));
@@ -412,7 +413,7 @@ md_begin ()
 
 /* Get a log2(val).  */
 static int
-log2 (val)
+mylog2 (val)
     unsigned int val;
 {
     int log = -1;
@@ -1146,7 +1147,7 @@ md_assemble (str)
          op_end = parse_imm (op_end + 1, & reg, 1, 1 << 31);
          /* Further restrict the immediate to a power of two.  */
          if ((reg & (reg - 1)) == 0)
-           reg = log2 (reg);
+           reg = mylog2 (reg);
          else
            {
              reg = 0;
@@ -1203,7 +1204,7 @@ md_assemble (str)
 
          /* Further restrict the immediate to a power of two.  */
          if ((reg & (reg - 1)) == 0)
-           reg = log2 (reg);
+           reg = mylog2 (reg);
          else
            {
              reg = 0;