moxie fixes in gas.

gas/:
	* Makefile.am (TARGET_CPU_CFILES): Add config/tc-moxie.c.
	* config/tc-moxie.c (md_assemble): Fix typos in strings.  Fix
	syntax error.
	* Makefile.in: Regenerate.
	* po/POTFILES.in: Likewise.
	* po/gas.pot: Likewise.

6 files changed, 91 insertions, 26 deletions

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 58ed242..d62da94 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-26  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* Makefile.am (TARGET_CPU_CFILES): Add config/tc-moxie.c.
+	* config/tc-moxie.c (md_assemble): Fix typos in strings.  Fix
+	syntax error.
+	* Makefile.in: Regenerate.
+	* po/POTFILES.in: Likewise.
+	* po/gas.pot: Likewise.
+
 2009-08-26  Nick Clifton  <nickc@redhat.com>
 
 	* config/obj-coff-seh.c (seh_arm_write_pdata): Test for
diff --git a/gas/Makefile.am b/gas/Makefile.am
index 27a7d1a..b8e86b1 100644
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -275,6 +275,7 @@ TARGET_CPU_CFILES = \
 	config/tc-mmix.c \
 	config/tc-mn10200.c \
 	config/tc-mn10300.c \
+	config/tc-moxie.c \
 	config/tc-msp430.c \
 	config/tc-mt.c \
 	config/tc-ns32k.c \
diff --git a/gas/Makefile.in b/gas/Makefile.in
index 9f6f02e..6d837e3 100644
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -539,6 +539,7 @@ TARGET_CPU_CFILES = \
 	config/tc-mmix.c \
 	config/tc-mn10200.c \
 	config/tc-mn10300.c \
+	config/tc-moxie.c \
 	config/tc-msp430.c \
 	config/tc-mt.c \
 	config/tc-ns32k.c \
@@ -975,6 +976,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-mmix.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-mn10200.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-mn10300.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-moxie.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-msp430.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-mt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tc-ns32k.Po@am__quote@
@@ -1513,6 +1515,20 @@ tc-mn10300.obj: config/tc-mn10300.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-mn10300.obj `if test -f 'config/tc-mn10300.c'; then $(CYGPATH_W) 'config/tc-mn10300.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-mn10300.c'; fi`
 
+tc-moxie.o: config/tc-moxie.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-moxie.o -MD -MP -MF $(DEPDIR)/tc-moxie.Tpo -c -o tc-moxie.o `test -f 'config/tc-moxie.c' || echo '$(srcdir)/'`config/tc-moxie.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-moxie.Tpo $(DEPDIR)/tc-moxie.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-moxie.c' object='tc-moxie.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-moxie.o `test -f 'config/tc-moxie.c' || echo '$(srcdir)/'`config/tc-moxie.c
+
+tc-moxie.obj: config/tc-moxie.c
+@am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-moxie.obj -MD -MP -MF $(DEPDIR)/tc-moxie.Tpo -c -o tc-moxie.obj `if test -f 'config/tc-moxie.c'; then $(CYGPATH_W) 'config/tc-moxie.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-moxie.c'; fi`
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-moxie.Tpo $(DEPDIR)/tc-moxie.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='config/tc-moxie.c' object='tc-moxie.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o tc-moxie.obj `if test -f 'config/tc-moxie.c'; then $(CYGPATH_W) 'config/tc-moxie.c'; else $(CYGPATH_W) '$(srcdir)/config/tc-moxie.c'; fi`
+
 tc-msp430.o: config/tc-msp430.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT tc-msp430.o -MD -MP -MF $(DEPDIR)/tc-msp430.Tpo -c -o tc-msp430.o `test -f 'config/tc-msp430.c' || echo '$(srcdir)/'`config/tc-msp430.c
 @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/tc-msp430.Tpo $(DEPDIR)/tc-msp430.Po
diff --git a/gas/config/tc-moxie.c b/gas/config/tc-moxie.c
index f5140c5..3ec00a7 100644
--- a/gas/config/tc-moxie.c
+++ b/gas/config/tc-moxie.c
@@ -199,7 +199,7 @@ md_assemble (char *str)
 	reg = parse_register_operand (&op_end);
 	iword += (reg << 8);
 	if (*op_end != ',')
-	  as_warn (_("expecting comma delimeted register operands"));
+	  as_warn (_("expecting comma delimited register operands"));
 	op_end++;
 	op_end = parse_exp_save_ilp (op_end, &arg);
 	fix_new_exp (frag_now,
@@ -218,7 +218,7 @@ md_assemble (char *str)
 	int dest, src;
 	dest = parse_register_operand (&op_end);
 	if (*op_end != ',')
-	  as_warn (_("expecting comma delimeted register operands"0);
+	  as_warn (_("expecting comma delimited register operands"));
 	op_end++;
 	src  = parse_register_operand (&op_end);
 	iword += (dest << 4) + src;
@@ -309,7 +309,7 @@ md_assemble (char *str)
 	int a, b;
 	a = parse_register_operand (&op_end);
 	if (*op_end != ',')
-	  as_warn (_("expecting comma delimeted register operands"));
+	  as_warn (_("expecting comma delimited register operands"));
 	op_end++;
 	if (*op_end != '(')
 	  {
@@ -355,7 +355,7 @@ md_assemble (char *str)
 	  }
 	op_end++;
 	if (*op_end != ',')
-	  as_warn (_("expecting comma delimeted register operands"));
+	  as_warn (_("expecting comma delimited register operands"));
 	op_end++;
 	b = parse_register_operand (&op_end);
 	iword += (a << 4) + b;
diff --git a/gas/po/POTFILES.in b/gas/po/POTFILES.in
index 5ca5ea1..1a3a671 100644
--- a/gas/po/POTFILES.in
+++ b/gas/po/POTFILES.in
@@ -105,6 +105,7 @@ config/tc-mn10200.c
 config/tc-mn10200.h
 config/tc-mn10300.c
 config/tc-mn10300.h
+config/tc-moxie.c
 config/tc-msp430.c
 config/tc-msp430.h
 config/tc-mt.c
diff --git a/gas/po/gas.pot b/gas/po/gas.pot
index 71683c9..6ca354b 100644
--- a/gas/po/gas.pot
+++ b/gas/po/gas.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: bug-binutils@gnu.org\n"
-"POT-Creation-Date: 2009-08-22 19:14+0200\n"
+"POT-Creation-Date: 2009-08-26 20:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -2878,7 +2878,7 @@ msgstr ""
 
 #: config/tc-arm.c:19637 config/tc-arm.c:19652 config/tc-arm.c:19667
 #: config/tc-arm.c:19678 config/tc-arm.c:19701 config/tc-arm.c:20413
-#: config/tc-pj.c:449 config/tc-sh.c:4187
+#: config/tc-moxie.c:664 config/tc-pj.c:449 config/tc-sh.c:4187
 msgid "offset out of range"
 msgstr ""
 
@@ -3011,8 +3011,8 @@ msgid "internal_relocation (type: OFFSET_IMM) not fixed up"
 msgstr ""
 
 #: config/tc-arm.c:20839 config/tc-cris.c:3985 config/tc-mcore.c:1926
-#: config/tc-microblaze.c:1834 config/tc-mmix.c:2862 config/tc-ns32k.c:2248
-#: config/tc-score.c:7484
+#: config/tc-microblaze.c:1834 config/tc-mmix.c:2862 config/tc-moxie.c:759
+#: config/tc-ns32k.c:2248 config/tc-score.c:7484
 msgid "<unknown>"
 msgstr ""
 
@@ -3579,8 +3579,8 @@ msgid "reloc %d not supported by object file format"
 msgstr ""
 
 #: config/tc-avr.c:1350 config/tc-h8300.c:1884 config/tc-mcore.c:881
-#: config/tc-microblaze.c:825 config/tc-msp430.c:1821 config/tc-pj.c:253
-#: config/tc-sh.c:2544 config/tc-z8k.c:1216
+#: config/tc-microblaze.c:825 config/tc-moxie.c:178 config/tc-msp430.c:1821
+#: config/tc-pj.c:253 config/tc-sh.c:2544 config/tc-z8k.c:1216
 msgid "can't find opcode "
 msgstr ""
 
@@ -4096,13 +4096,13 @@ msgstr ""
 msgid "invalid <arch> in --march=<arch>: %s"
 msgstr ""
 
-#: config/tc-cris.c:3937
+#: config/tc-cris.c:3937 config/tc-moxie.c:711
 msgid ""
 "Semantics error.  This type of operand can not be relocated, it must be an "
 "assembly-time constant"
 msgstr ""
 
-#: config/tc-cris.c:3986
+#: config/tc-cris.c:3986 config/tc-moxie.c:760
 #, c-format
 msgid "Cannot generate relocation type for symbol %s, code %s"
 msgstr ""
@@ -7306,7 +7306,7 @@ msgstr ""
 msgid "missing `.end'"
 msgstr ""
 
-#: config/tc-lm32.c:234
+#: config/tc-lm32.c:234 config/tc-moxie.c:575
 msgid "bad call to md_atof"
 msgstr ""
 
@@ -10149,6 +10149,57 @@ msgstr ""
 msgid "Bad relocation fixup type (%d)"
 msgstr ""
 
+#: config/tc-moxie.c:100
+msgid "expecting register"
+msgstr ""
+
+#: config/tc-moxie.c:119 config/tc-moxie.c:135
+msgid "illegal register number"
+msgstr ""
+
+#: config/tc-moxie.c:184 config/tc-pj.c:260
+#, c-format
+msgid "unknown opcode %s"
+msgstr ""
+
+#: config/tc-moxie.c:202 config/tc-moxie.c:221 config/tc-moxie.c:312
+#: config/tc-moxie.c:358
+msgid "expecting comma delimited register operands"
+msgstr ""
+
+#: config/tc-moxie.c:228 config/tc-moxie.c:288 config/tc-moxie.c:300
+#: config/tc-moxie.c:333 config/tc-moxie.c:365 config/tc-moxie.c:398
+#: config/tc-moxie.c:452 config/tc-moxie.c:506 config/tc-moxie.c:516
+#: config/tc-moxie.c:544 config/tc-pj.c:307
+msgid "extra stuff on line ignored"
+msgstr ""
+
+#: config/tc-moxie.c:248 config/tc-moxie.c:388 config/tc-moxie.c:418
+#: config/tc-moxie.c:493
+msgid "expecting comma delimited operands"
+msgstr ""
+
+#: config/tc-moxie.c:316 config/tc-moxie.c:344
+msgid "expecting indirect register `($rA)'"
+msgstr ""
+
+#: config/tc-moxie.c:324 config/tc-moxie.c:352 config/tc-moxie.c:443
+#: config/tc-moxie.c:485
+msgid "missing closing parenthesis"
+msgstr ""
+
+#: config/tc-moxie.c:435 config/tc-moxie.c:477
+msgid "expecting indirect register `($rX)'"
+msgstr ""
+
+#: config/tc-moxie.c:547 config/tc-pj.c:312
+msgid "Something forgot to clean up\n"
+msgstr ""
+
+#: config/tc-moxie.c:651
+msgid "pcrel too far BFD_RELOC_MOXIE_10"
+msgstr ""
+
 #: config/tc-msp430.c:547
 msgid ".profiler pseudo requires at least two operands."
 msgstr ""
@@ -10724,23 +10775,10 @@ msgstr ""
 msgid "can't have relocation for ipush"
 msgstr ""
 
-#: config/tc-pj.c:260
-#, c-format
-msgid "unknown opcode %s"
-msgstr ""
-
 #: config/tc-pj.c:288
 msgid "expected expresssion"
 msgstr ""
 
-#: config/tc-pj.c:307
-msgid "extra stuff on line ignored"
-msgstr ""
-
-#: config/tc-pj.c:312
-msgid "Something forgot to clean up\n"
-msgstr ""
-
 #: config/tc-pj.c:354
 #, c-format
 msgid ""