Mostly trivial enum fixes

[deliverable/binutils-gdb.git] / gas / expr.c

diff --git a/gas/expr.c b/gas/expr.c
index 64011b497de2cea263b2355b868f0651799591ab..106f06db21f2e6d4c98c7f386fec52cd6a7d689a 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1,7 +1,5 @@
 /* expr.c -operands, expressions-
-   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011,
-   2012 Free Software Foundation, Inc.
+   Copyright (C) 1987-2015 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -29,7 +27,6 @@
 
 #include "as.h"
 #include "safe-ctype.h"
-#include "obstack.h"
 
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
@@ -127,7 +124,7 @@ make_expr_symbol (expressionS *expressionP)
 int
 expr_symbol_where (symbolS *sym, char **pfile, unsigned int *pline)
 {
-  register struct expr_symbol_line *l;
+  struct expr_symbol_line *l;
 
   for (l = expr_symbol_lines; l != NULL; l = l->next)
     {
@@ -1024,7 +1021,8 @@ operand (expressionS *expressionP, enum expr_mode mode)
            /* input_line_pointer -> char after operand.  */
            if (c == '-')
              {
-               expressionP->X_add_number = - expressionP->X_add_number;
+               expressionP->X_add_number
+                 = - (addressT) expressionP->X_add_number;
                /* Notice: '-' may overflow: no warning is given.
                   This is compatible with other people's
                   assemblers.  Sigh.  */
@@ -1729,7 +1727,7 @@ operatorf (int *num_chars)
    signed word values can be represented in an O_constant expression, which is
    useful e.g. for .sleb128 directives.  */
 
-static void
+void
 add_to_result (expressionS *resultP, offsetT amount, int rhs_highbit)
 {
   valueT ures = resultP->X_add_number;
@@ -1745,7 +1743,7 @@ add_to_result (expressionS *resultP, offsetT amount, int rhs_highbit)
 
 /* Similarly, for subtraction.  */
 
-static void
+void
 subtract_from_result (expressionS *resultP, offsetT amount, int rhs_highbit)
 {
   valueT ures = resultP->X_add_number;