* expr.c (integer_constant): Remove TARGET_WORD_SIZE hack.

	* config/tc-m68k.h (TARGET_WORD_SIZE): Delete.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4aaef65..63ee0ec 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
 2005-03-02  Alan Modra  <amodra@bigpond.net.au>
 
+       * expr.c (integer_constant): Remove TARGET_WORD_SIZE hack.
+       * config/tc-m68k.h (TARGET_WORD_SIZE): Delete.
+
        * symbols.c (fb_label_name): Allow an augend of 2 for mmix.
 
 2005-03-01  Ramana Radhakrishnan  <ramana.radhakrishnan@codito.com>

diff --git a/gas/config/tc-m68k.h b/gas/config/tc-m68k.h
index 559d5e3..123b824 100644 (file)
--- a/gas/config/tc-m68k.h
+++ b/gas/config/tc-m68k.h
@@ -1,6 +1,6 @@
 /* This file is tc-m68k.h
    Copyright 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-   1998, 1999, 2000, 2001, 2002, 2003, 2004
+   1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -206,7 +206,6 @@ extern int m68k_parse_long_option PARAMS ((char *));
 
 #define md_operand(x)
 
-#define TARGET_WORD_SIZE 32
 #define TARGET_ARCH bfd_arch_m68k
 
 extern struct relax_type md_relax_table[];

diff --git a/gas/expr.c b/gas/expr.c
index 49517c5..1f50eac 100644 (file)
--- a/gas/expr.c
+++ b/gas/expr.c
@@ -1,6 +1,6 @@
 /* expr.c -operands, expressions-
    Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-   1999, 2000, 2001, 2002
+   1999, 2000, 2001, 2002, 2003, 2004, 2005
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -609,10 +609,6 @@ integer_constant (int radix, expressionS *expressionP)
       else
        {
          expressionP->X_op = O_constant;
-#ifdef TARGET_WORD_SIZE
-         /* Sign extend NUMBER.  */
-         number |= (-(number >> (TARGET_WORD_SIZE - 1))) << (TARGET_WORD_SIZE - 1);
-#endif
          expressionP->X_add_number = number;
          input_line_pointer--; /* Restore following character.  */
        }                       /* Really just a number.  */