Fix T_SHORT macro conflict.

2 files changed, 122 insertions, 115 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 08232fd..519e710 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,26 +1,30 @@
+2000-12-06  Mark Elbrecht  <snowball3@bigfoot.com>
+
+	* config/tc-i386.c (T_SHORT): Undefine before defining.
+
 2000-12-05  Kazu Hirata  <kazu@hxi.com>
 
 	* config/tc-mips.c: Fix formatting.
 
 2000-12-04  Matthew Hiller  <hiller@redhat.com>
-	
-        * config/tc-d10v.c (flag_allow_gstabs_packing): New variable.
-        (md_longopts): New options --gstabs-packing, --no-gstabs-packing.
-        (md_show_usage): Ditto.
-        (md_parse_option): Ditto.
-        (d10v_cleanup): Writes pending instruction only if
-        ! outputting_stabs_line_debug || ! flag_allow_gstabs_packing.
+
+	* config/tc-d10v.c (flag_allow_gstabs_packing): New variable.
+	(md_longopts): New options --gstabs-packing, --no-gstabs-packing.
+	(md_show_usage): Ditto.
+	(md_parse_option): Ditto.
+	(d10v_cleanup): Writes pending instruction only if
+	! outputting_stabs_line_debug || ! flag_allow_gstabs_packing.
 	Fix compile time warning messages.
-	
-        * doc/c-d10v.texi: Documents new options.
+
+	* doc/c-d10v.texi: Documents new options.
 
 2000-12-04  Matthew Hiller  <hiller@redhat.com>
 
-        * stabs.c (outputting_stabs_line_debug): New variable.
+	* stabs.c (outputting_stabs_line_debug): New variable.
 	(stabs_generate_asm_lineno): Set outputting_stabs_line_debug at
 	function entry and unset at function exit.
 
-        * read.h (outputting_stabs_line_debug): New extern declaration.
+	* read.h (outputting_stabs_line_debug): New extern declaration.
 
 	* as.c: Include dwarf2dbg.h for definition of dwarf2_finish.
 
@@ -50,81 +54,81 @@
 
 2000-12-01  Chris Demetriou  <cgd@sibyte.com>
 
-        * config/tc-mips.c (mips_ip): When calculating offsets,
-        don't accept as constant the difference between the
-        addresses of symbols in two different sections.
-
-        * config/tc-mips.c (macro_build): Add new 'U' and 'J' operand
-        specifiers.
-        (validate_mips_insn): Likewise.  Also, update 'B' operand
-        specifier to use OP_*_CODE20 constants and delete 'm' operand
-        specifier.
-        (mips_ip): Remove 'm' operand specifier, add 'U' and 'J'
-        operand specifiers.  Change warning generated by 'B' operand
-        specifier to reflect its new multi-purpose usage.
-
-        * config/tc-mips.c (mips_set_options): Use ISA_UNKNOWN rather than
-        -1, and update comment.
-        (file_mips_isa): Likewise.
-        (mips_cpu): Use CPU_UNKNOWN rather than -1, and update comment.
-        (ISA_HAS_COPROC_DELAYS, ISA_HAS_64BIT_REGS, gpr_interlocks): Use
-        ISA_* constants rather than hard-coded numbers.
-        (mips_cpu_info): New structure.
-        (mips_cpu_info_table): New table describing CPU and ISA names
-        and numbers.
-        (mips_cpu_info_from_name, mips_cpu_info_from_isa,
-        mips_cpu_info_from_cpu): New functions.
-        (mips_isa_to_str): New function to get string for ISA name.
-        (mips_cpu_to_str): Convert to use mips_cpu_info_from_cpu, and
-        return const char *.
-        (md_begin): Redo CPU and ISA selection logic, using
-        mips_cpu_info_from_*.  Convert to use ISA_* constants rather
-        than hard-coded numbers.
-        (append_insn, mips_emit_delays, macro, macro2): Convert to use
-        ISA_* constants rather than hard-coded numbers.
-        (mips_ip): Convert to use mips_isa_to_str to get ISA name.
-        (md_longopts): Delete OPTION_NO_MIPS32.
-        (md_parse_option): Convert to use ISA_* constants rather than
-        hard-coded numbers.  Make OPTIONS_MIPS32 case treat MIPS32
-        as an ISA.  Delete OPTION_NO_MIPS32 case.  Convert OPTION_MCPU
-        to use strcasecmp to recognize "default" and to use
-        mips_cpu_info_from_name to get CPU numbers from argument.
-        (md_show_usage): Move -mips32 so it's with the rest of the ISA
-        flags.  Change 4Kc, 4Kp and 4Km CPU entries to just be
-        mips32-4k.
-        (s_mipsset): Accept ISA value 32.
-        * doc/as.texinfo: Clean up MIPS options summary slightly,
-        remove -no-mips32.  Add note about -mips4 and -mips32
-        specifying those ISA levels.  Delete -mips32 and -no-mips32
-        cpu flag descriptions.
-        * doc/c-mips.texi: Add -mips32 to list of ISA switches.  Clean
-        up the supported CPU switch list, and replace 4Kc, 4Km, and
-        4Kp entries with a single mips32-4k entry.  Note that you can
-        use ".set mips32".
-
-        * tc-mips.c (ISA_HAS_64BIT_REGS): Add checks for ISA_MIPS5 and
-        ISA_MIPS64.
-        (md_longopts, OPTION_MIPS5, OPTION_MIPS64): Add options for
-        -mips5 and -mips64.
-        (md_parse_option): Add cases for OPTION_MIPS5 and
-        OPTION_MIPS64.
-        (md_show_usage): Mention -mips5 and -mips64 arguments.
-        (s_mipsset): Add cases for MIPS5 and MIPS64.
-        (mips_cpu_info_table): Add entries for MIPS5 and MIPS64 ISAs
-        and pseudo-CPUs.
-        * doc/as.texinfo: Mention -mips5 and -mips64 options
-        and their meanings.
-        * doc/c-mips.texi: Likewise.  Also update introduction
-        and ".set" usage information.
-
-        * config/tc-mips.c (md_show_usage): Add "sb1" to the
-        CPU list.
-        (mips_cpu_info_table): Add SB-1 entries.
-        * doc/c-mips.texi: Add "sb1" to the list of CPUs
-        known to the -mcpu option.
-        
-        * doc/as.texinfo: Correct description of MIPS -mcpu
-        option, by copying some of the text from doc/c-mips.texi.
+	* config/tc-mips.c (mips_ip): When calculating offsets,
+	don't accept as constant the difference between the
+	addresses of symbols in two different sections.
+
+	* config/tc-mips.c (macro_build): Add new 'U' and 'J' operand
+	specifiers.
+	(validate_mips_insn): Likewise.  Also, update 'B' operand
+	specifier to use OP_*_CODE20 constants and delete 'm' operand
+	specifier.
+	(mips_ip): Remove 'm' operand specifier, add 'U' and 'J'
+	operand specifiers.  Change warning generated by 'B' operand
+	specifier to reflect its new multi-purpose usage.
+
+	* config/tc-mips.c (mips_set_options): Use ISA_UNKNOWN rather than
+	-1, and update comment.
+	(file_mips_isa): Likewise.
+	(mips_cpu): Use CPU_UNKNOWN rather than -1, and update comment.
+	(ISA_HAS_COPROC_DELAYS, ISA_HAS_64BIT_REGS, gpr_interlocks): Use
+	ISA_* constants rather than hard-coded numbers.
+	(mips_cpu_info): New structure.
+	(mips_cpu_info_table): New table describing CPU and ISA names
+	and numbers.
+	(mips_cpu_info_from_name, mips_cpu_info_from_isa,
+	mips_cpu_info_from_cpu): New functions.
+	(mips_isa_to_str): New function to get string for ISA name.
+	(mips_cpu_to_str): Convert to use mips_cpu_info_from_cpu, and
+	return const char *.
+	(md_begin): Redo CPU and ISA selection logic, using
+	mips_cpu_info_from_*.  Convert to use ISA_* constants rather
+	than hard-coded numbers.
+	(append_insn, mips_emit_delays, macro, macro2): Convert to use
+	ISA_* constants rather than hard-coded numbers.
+	(mips_ip): Convert to use mips_isa_to_str to get ISA name.
+	(md_longopts): Delete OPTION_NO_MIPS32.
+	(md_parse_option): Convert to use ISA_* constants rather than
+	hard-coded numbers.  Make OPTIONS_MIPS32 case treat MIPS32
+	as an ISA.  Delete OPTION_NO_MIPS32 case.  Convert OPTION_MCPU
+	to use strcasecmp to recognize "default" and to use
+	mips_cpu_info_from_name to get CPU numbers from argument.
+	(md_show_usage): Move -mips32 so it's with the rest of the ISA
+	flags.  Change 4Kc, 4Kp and 4Km CPU entries to just be
+	mips32-4k.
+	(s_mipsset): Accept ISA value 32.
+	* doc/as.texinfo: Clean up MIPS options summary slightly,
+	remove -no-mips32.  Add note about -mips4 and -mips32
+	specifying those ISA levels.  Delete -mips32 and -no-mips32
+	cpu flag descriptions.
+	* doc/c-mips.texi: Add -mips32 to list of ISA switches.  Clean
+	up the supported CPU switch list, and replace 4Kc, 4Km, and
+	4Kp entries with a single mips32-4k entry.  Note that you can
+	use ".set mips32".
+
+	* tc-mips.c (ISA_HAS_64BIT_REGS): Add checks for ISA_MIPS5 and
+	ISA_MIPS64.
+	(md_longopts, OPTION_MIPS5, OPTION_MIPS64): Add options for
+	-mips5 and -mips64.
+	(md_parse_option): Add cases for OPTION_MIPS5 and
+	OPTION_MIPS64.
+	(md_show_usage): Mention -mips5 and -mips64 arguments.
+	(s_mipsset): Add cases for MIPS5 and MIPS64.
+	(mips_cpu_info_table): Add entries for MIPS5 and MIPS64 ISAs
+	and pseudo-CPUs.
+	* doc/as.texinfo: Mention -mips5 and -mips64 options
+	and their meanings.
+	* doc/c-mips.texi: Likewise.  Also update introduction
+	and ".set" usage information.
+
+	* config/tc-mips.c (md_show_usage): Add "sb1" to the
+	CPU list.
+	(mips_cpu_info_table): Add SB-1 entries.
+	* doc/c-mips.texi: Add "sb1" to the list of CPUs
+	known to the -mcpu option.
+
+	* doc/as.texinfo: Correct description of MIPS -mcpu
+	option, by copying some of the text from doc/c-mips.texi.
 
 2000-12-01      Joel Sherrill <joel@OARcorp.com>
 
@@ -137,7 +141,7 @@
 	* Makefile.in: Regenerate.
 	* aclocal.m4: Regenerate.
 	* po/gas.pot: Regenerate.
-	
+
 2000-11-30  Philip Blundell  <pb@futuretv.com>
 
 	* config/obj-coff.c (obj_coff_weak): Use S_SET_WEAK if it exists,
@@ -207,7 +211,7 @@
 	* Makefile.in: Regenerate.
 
 	* config/tc-cris.c: Include dwarf2dbg.h.
- 	(md_pseudo_table): Add .file and .loc.
+	(md_pseudo_table): Add .file and .loc.
 	(md_assemble): Call dwarf2_emit_insn if generating ELF.
 	(s_cris_file, s_cris_loc): New.
 	* config/tc-cris.h (DWARF2_LINE_MIN_INSN_LENGTH): Define.
@@ -328,7 +332,7 @@
 2000-11-17  Richard Henderson  <rth@redhat.com>
 
 	* dwarf2dbg.c (dwarf2_gen_line_info): Early out for no line number.
-	* config/obj-elf.h (ECOFF_DEBUGGING) [TC_ALPHA]: Adjust for 
+	* config/obj-elf.h (ECOFF_DEBUGGING) [TC_ALPHA]: Adjust for
 	tri-state definition of alpha_flag_mdebug.
 	* config/tc-alpha.c (alpha_flag_mdebug): Init to -1.
 	(s_alpha_file): Store first .file directive.
@@ -423,7 +427,7 @@
 
 	* config/tc-v850.c (cons_fix_new_v850): Don't rely on
 	parse_cons_expression_v850 to initialize hold_cons_reloc.
-	
+
 2000-11-15  Bernd Schmidt  <bernds@redhat.com>
 
 	* tc-ia64.c (struct md): New entries LAST_GROUPS, GROUP_IDX.
@@ -526,7 +530,7 @@
 	BIG_ENDIAN macros.
 	* gas/config/tc-arc.c: Use S_IS_LOCAL to test local symbols.
 	Fix compile time warning messages.
-	
+
 2000-11-07  Nick Clifton  <nickc@redhat.com>
 
 	* stabs.c (generate_asm_file): Increase length of xmalloc'ed
@@ -550,7 +554,7 @@
 	* config/te-hpux.h: New file.
 	* configure.in: Add "ia64-*-hpux*" target to configure.
 	* configure: Regenerate.
-	
+
 2000-11-06  Kazu Hirata  <kazu@hxi.com>
 
 	* as.c: Fix formatting.
@@ -601,7 +605,7 @@
 
 2000-11-02  Theo Honohan  <th@futuretv.com>
 
-	* config/tc-arm.c (do_msr): Improve error message. 
+	* config/tc-arm.c (do_msr): Improve error message.
 
 2000-10-31  Eric Christopher  <echristo@redhat.com>
 
@@ -654,9 +658,9 @@
 
 2000-10-27  Aldy Hernandez  <aldyh@redhat.com>
 
-        * config/tc-arm.c (psrs): Remove lowercase versions of spsr* and
-        cpsr*.
-        (arm_psr_parse): Handle lowercase CPSR and SPSR.
+	* config/tc-arm.c (psrs): Remove lowercase versions of spsr* and
+	cpsr*.
+	(arm_psr_parse): Handle lowercase CPSR and SPSR.
 
 2000-10-25  Nick Clifton  <nickc@redhat.com>
 
@@ -744,10 +748,10 @@
 
 2000-10-18  Michael Sokolov  <msokolov@ivan.Harhan.ORG>
 
-        * config/tc-m68k.h (RELAX_RELOC_*): New definitions for both
-        BFD_ASSEMBLER and !BFD_ASSEMBLER.
-        * config/tc-m68k.c (md_convert_frag_1): Use them instead of
-        BFD_RELOC_*.
+	* config/tc-m68k.h (RELAX_RELOC_*): New definitions for both
+	BFD_ASSEMBLER and !BFD_ASSEMBLER.
+	* config/tc-m68k.c (md_convert_frag_1): Use them instead of
+	BFD_RELOC_*.
 
 2000-10-17  Kazu Hirata  <kazu@hxi.com>
 
@@ -998,19 +1002,19 @@
 
 2000-09-13  Anders Norlander  <anorland@acc.umu.se>
 
- 	* config/tc-mips.c (md_begin): Recognize 4Kc, 4Km and 4Kp processors.
- 	(md_parse_option): Ditto.
- 	(md_longopts): Add -mips32 option.
- 	(md_show_usage): Document new options.
- 	(mips_ip): Assemble sdbbp 20 bit 'm' args for MIPS32.
- 	(mips_ip): Assemble mfc0 with a sub-selection code.
- 	(validate_mips_insn): Handle 'H' (OP_*_SEL) and 'm' (OP_*_CODE20).
+	* config/tc-mips.c (md_begin): Recognize 4Kc, 4Km and 4Kp processors.
+	(md_parse_option): Ditto.
+	(md_longopts): Add -mips32 option.
+	(md_show_usage): Document new options.
+	(mips_ip): Assemble sdbbp 20 bit 'm' args for MIPS32.
+	(mips_ip): Assemble mfc0 with a sub-selection code.
+	(validate_mips_insn): Handle 'H' (OP_*_SEL) and 'm' (OP_*_CODE20).
 	(mips_cpu_to_str): New function.
 	(mips_ip): Use mips_cpu_to_str instead of printing numeric cpu value.
 	Use CPU_* defines instead of hardcoded numbers.
 
- 	* doc/as.texinfo: Document new options.
- 	* doc/c-mips.texi: Ditto.
+	* doc/as.texinfo: Document new options.
+	* doc/c-mips.texi: Ditto.
 
 2000-09-12  Kazu Hirata  <kazu@hxi.com>
 
@@ -1438,8 +1442,8 @@ Thu Aug 24 20:41:05 2000  Denis Chertykov  <denisc@overta.ru>
 2000-08-14  Mark Elbrecht  <snowball3@bigfoot.com>
 
 	* config/obj-coff.c (obj_coff_endef) [BFD_ASSEMBLER]: Set the debug
-	  flag for storage types C_ARG, C_REGPARM, C_FIELD, C_MOS, C_MOE,
-	  C_MOU, and C_EOS.
+	flag for storage types C_ARG, C_REGPARM, C_FIELD, C_MOS, C_MOE,
+	C_MOU, and C_EOS.
 
 2000-08-14  Jason Eckhardt  <jle@cygnus.com>
 
@@ -1771,7 +1775,7 @@ Thu Jul 27 11:25:01 2000  Andrew Cagney  <cagney@b1.cygnus.com>
 2000-07-12  Mark Elbrecht  <snowball3@bigfoot.com>
 
 	* config/obj-coff.c (coff_frob_section): Add padding to the last
-	  section when aligning it increases its size.
+	section when aligning it increases its size.
 
 2000-07-11  Kazu Hirata  <kazu@hxi.com>
 
@@ -2813,7 +2817,7 @@ Tue Apr 25 11:02:02 2000  Jeffrey A Law  (law@cygnus.com)
 
 2000-04-24  Mark Klein <mklein@dis.com>
 
-	 * obj-som.c: Terminate obj_pseudo_table.
+	* obj-som.c: Terminate obj_pseudo_table.
 
 Mon Apr 24 15:21:11 2000  Clinton Popetz  <cpopetz@cygnus.com>
 
@@ -7340,7 +7344,7 @@ Fri Jun  5 10:50:53 1998  Nick Clifton  <nickc@cygnus.com>
 	* config/tc-d30v.c (md_assemble): Store previous segment state
 	with previous instruction.
 
-Wed Jun	 3 18:21:56 1998  Alan Modra  <alan@spri.levels.unisa.edu.au>
+Wed Jun  3 18:21:56 1998  Alan Modra  <alan@spri.levels.unisa.edu.au>
 
 	* config/tc-i386.c (SCALE1_WHEN_NO_INDEX): Define.
 	(ebp, esp): Remove static variables.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 5cf87bd..eaecabc 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4330,7 +4330,9 @@ struct intel_token
 
 static struct intel_token cur_token, prev_token;
 
-/* Token codes for the intel parser.  */
+
+/* Token codes for the intel parser. Since T_SHORT is already used
+   by COFF, undefine it first to prevent a warning.  */
 #define T_NIL		-1
 #define T_CONST		1
 #define T_REG		2
@@ -4339,6 +4341,7 @@ static struct intel_token cur_token, prev_token;
 #define	T_DWORD		5
 #define T_QWORD		6
 #define T_XWORD		7
+#undef  T_SHORT
 #define T_SHORT		8
 #define T_OFFSET	9
 #define T_PTR		10