gas/

	* doc/as.texinfo (Target TIC6X options): Don't mention "-matomic".
	* doc/c-tic6x.texi (TIC6X Directives): Don't mention ".atomic".
	(TIC6X Options): Don't mention "-matomic".
	* config/tc-tic6x.c (OPTION_MATOMIC, OPTION_MNO_ATOMIC): Delete.
	(md_longopts): Remove corresponding entries.
	(md_parse_option): Don't handle them.
	(md_show_usage): Don't document them.
	(tic6x_atomic): Delete variable.
	(tic6x_update_features): Always copy tic6x_arch_enable to
	tic6x_features.
	(tic6x_arch_enable): Remove references to TIC6X_INSN_ATOMIC.
	(s_tic6x_atomic, s_tic6x_noatomic): Remove functions.
	(md_pseudo_table): Remove ".atomic" and ".noatomic".

	gas/testsuite/
	* gas/tic6x/dir-junk.l: Remove tests for .atomic and .noatomic.
	* gas/tic6x/dir-junk.s: Likewise.
	* gas/tic6x/insns-c674x-bad.d: Remove test.
	* gas/tic6x/insns-c674x-bad.l: Likewise.
	* gas/tic6x/insns-atomic.d: Remove "-matomic" switch.

	include/opcode/
	* tic6x-opcode-table.h (cmtl, ll, sl): Available on C64XP.
	* tic6x.h (TIC6X_INSN_ATOMIC): Remove.

7 files changed, 11 insertions, 34 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index cad113a..412fbc0 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2011-02-04  Bernd Schmidt  <bernds@codesourcery.com>
+
+	* gas/tic6x/dir-junk.l: Remove tests for .atomic and .noatomic.
+	* gas/tic6x/dir-junk.s: Likewise.
+	* gas/tic6x/insns-c674x-bad.d: Remove test.
+	* gas/tic6x/insns-c674x-bad.l: Likewise.
+	* gas/tic6x/insns-c674x-bad.s: Likewise.
+	* gas/tic6x/insns-atomic.d: Remove "-matomic" switch.
+
 2011-01-31  Nick Clifton  <nickc@redhat.com>
 
 	* gas/all/align.d: Skip for the RX.
diff --git a/gas/testsuite/gas/tic6x/dir-junk.l b/gas/testsuite/gas/tic6x/dir-junk.l
index 8c7f256..f993d71 100644
--- a/gas/testsuite/gas/tic6x/dir-junk.l
+++ b/gas/testsuite/gas/tic6x/dir-junk.l
@@ -1,5 +1,3 @@
 [^:]*: Assembler messages:
 [^:]*:2: Error: junk at end of line, first unrecognized character is `c'
-[^:]*:3: Error: junk at end of line, first unrecognized character is `f'
-[^:]*:6: Error: junk at end of line, first unrecognized character is `b'
-[^:]*:7: Error: junk at end of line, first unrecognized character is `x'
+[^:]*:3: Error: junk at end of line, first unrecognized character is `x'
diff --git a/gas/testsuite/gas/tic6x/dir-junk.s b/gas/testsuite/gas/tic6x/dir-junk.s
index 6318068..4da3a52 100644
--- a/gas/testsuite/gas/tic6x/dir-junk.s
+++ b/gas/testsuite/gas/tic6x/dir-junk.s
@@ -1,7 +1,3 @@
 .arch c64x 
 .arch c64x c64x
-.atomic foo
-.atomic ; comment OK
-.noatomic
-.noatomic bar
 .nocmp x
diff --git a/gas/testsuite/gas/tic6x/insns-atomic.d b/gas/testsuite/gas/tic6x/insns-atomic.d
index 351d11c..f23de25 100644
--- a/gas/testsuite/gas/tic6x/insns-atomic.d
+++ b/gas/testsuite/gas/tic6x/insns-atomic.d
@@ -1,6 +1,6 @@
 #objdump: -dr --prefix-addresses --show-raw-insn
 #name: C6X atomic instructions
-#as: -march=c674x -matomic -mlittle-endian
+#as: -march=c674x -mlittle-endian
 
 .*: *file format elf32-tic6x-le
 
diff --git a/gas/testsuite/gas/tic6x/insns-c674x-bad.d b/gas/testsuite/gas/tic6x/insns-c674x-bad.d
deleted file mode 100644
index 88c9240..0000000
--- a/gas/testsuite/gas/tic6x/insns-c674x-bad.d
+++ /dev/null
@@ -1,3 +0,0 @@
-#name: C674x bad instructions
-#as: -march=c674x
-#error-output: insns-c674x-bad.l
diff --git a/gas/testsuite/gas/tic6x/insns-c674x-bad.l b/gas/testsuite/gas/tic6x/insns-c674x-bad.l
deleted file mode 100644
index d48b875..0000000
--- a/gas/testsuite/gas/tic6x/insns-c674x-bad.l
+++ /dev/null
@@ -1,7 +0,0 @@
-[^:]*: Assembler messages:
-[^:]*:6: Error: 'cmtl' instruction not supported on this architecture
-[^:]*:7: Error: 'll' instruction not supported on this architecture
-[^:]*:8: Error: 'sl' instruction not supported on this architecture
-[^:]*:14: Error: 'cmtl' instruction not supported on this architecture
-[^:]*:15: Error: 'll' instruction not supported on this architecture
-[^:]*:16: Error: 'sl' instruction not supported on this architecture
diff --git a/gas/testsuite/gas/tic6x/insns-c674x-bad.s b/gas/testsuite/gas/tic6x/insns-c674x-bad.s
deleted file mode 100644
index 065e241..0000000
--- a/gas/testsuite/gas/tic6x/insns-c674x-bad.s
+++ /dev/null
@@ -1,16 +0,0 @@
-# Test instructions not present on C674x.
-.text
-.nocmp
-.globl f
-f:
-	cmtl .D2T2 *b0,b1
-	ll .D2T2 *b0,b1
-	sl .D2T2 b0,*b1
-.atomic
-	cmtl .D2T2 *b0,b1
-	ll .D2T2 *b0,b1
-	sl .D2T2 b0,*b1
-.noatomic
-	cmtl .D2T2 *b0,b1
-	ll .D2T2 *b0,b1
-	sl .D2T2 b0,*b1