Committed, CRIS: fix assembling for other ISA variant

[Hans-Peter Nilsson <hans-peter dot nilsson at axis dot com>]

If you specified another ISA variant with e.g. -march=, that
option got through to the compiler proper and the assembler only
if it was -march=v32.  Now fixed, tested crisv32-elf and cris-elf.

gcc:
	* config/cris/cris.h (CC1_SPEC): Pass through all -march=
	and -mcpu= options.
	(ASM_SPEC): Ditto, not just -march=v32, but translate non-v10,
	non-v32 into --march=v0_v10.

gcc/testsuite:
	* gcc.target/cris/asm-v8.S, gcc.target/cris/asm-v10.S,
	gcc.target/cris/asm-other.S, gcc.target/cris/inasm-v8.c,
	gcc.target/cris/inasm-v10.c, gcc.target/cris/inasm-other.c:
	New tests.

--- gcc/config/cris/cris.h	Tue May 29 04:13:08 2012
+++ gcc/config/cris/cris.h	Thu May 31 04:28:11 2012
@@ -156,11 +156,13 @@ extern int cris_cpu_version;
     " -D__CRIS_arch_tune=" CRIS_DEFAULT_TUNE "}}}}}"\
  CRIS_ARCH_CPP_DEFAULT
 
-/* Override previous definitions (linux.h).  */
+/* Override previous definitions (../linux.h).  */
 #undef CC1_SPEC
 #define CC1_SPEC \
  "%{metrax4:-march=v3}\
   %{metrax100:-march=v8}\
+  %{march=*:-march=%*}\
+  %{mcpu=*:-mcpu=%*}\
   %(cc1_subtarget)"
 
 /* For the cris-*-elf subtarget.  */
@@ -190,7 +192,9 @@ extern int cris_cpu_version;
  MAYBE_AS_NO_MUL_BUG_ABORT \
  "%(asm_subtarget)\
  %{march=*:%{mcpu=*:%edo not specify both -march=... and -mcpu=...}}\
- %{march=v32:--march=v32} %{mcpu=v32:--march=v32}"
+ %{march=v0|mcpu=v0|march=v3|mcpu=v3|march=v8|mcpu=v8:--march=v0_v10}\
+ %{march=v10|mcpu=v10:--march=v10}\
+ %{march=v32|mcpu=v32:--march=v32}"
 
 /* For the cris-*-elf subtarget.  */
 #define CRIS_ASM_SUBTARGET_SPEC \
--- /dev/null	Tue Oct 29 15:57:07 2002
+++ gcc/testsuite/gcc.target/cris/asm-other.S	Thu May 31 03:47:27 2012
@@ -0,0 +1,15 @@
+/* { dg-do assemble } */
+/* { dg-options "-DOTHER_ISA=0 -march=v0" { target crisv32-*-* } } */
+/* { dg-options "-DOTHER_ISA=32 -march=v32" { target cris-*-* } } */
+
+/* Make sure we can assemble for the "other" variant, with the twist
+   that the gcc option -march=v0 isn't valid for the assembler.  */
+        .text
+#if OTHER_ISA == 32
+	addoq 42,$r1,$acr
+#else
+0:
+	move.d [$r2=$r0+42],$r1
+	bwf 0b
+	nop
+#endif
--- /dev/null	Tue Oct 29 15:57:07 2002
+++ gcc/testsuite/gcc.target/cris/inasm-other.c	Thu May 31 03:56:29 2012
@@ -0,0 +1,23 @@
+/* { dg-do assemble } */
+/* { dg-options "-DOTHER_ISA=0 -march=v0" { target crisv32-*-* } } */
+/* { dg-options "-DOTHER_ISA=32 -march=v32" { target cris-*-* } } */
+
+/* Make sure we can (generate code and) assemble for the "other"
+   variant, with the twist that the gcc option -march=v0 isn't
+   valid for the assembler.  We don't check that the generated code
+   is for the other variant; other tests cover that already, but they
+   don't *assemble* the result.  We can't trust the prologue and
+   epilogue to contain incompatible insns (they actually deliberately
+   don't, usually and it'd be brittle to tweak the function signature
+   to make it so), so we force some with inline asm.  */
+
+void f(void)
+{
+#if OTHER_ISA == 32
+  asm volatile ("addoq 42,$r11,$acr");
+#else
+  asm volatile ("0: move.d [$r12=$sp+42],$r10\n\t"
+		"bwf 0b\n\t"
+		"nop");
+#endif
+}
--- /dev/null	Tue Oct 29 15:57:07 2002
+++ gcc/testsuite/gcc.target/cris/inasm-v10.c	Thu May 31 04:22:03 2012
@@ -0,0 +1,6 @@
+/* { dg-do assemble } */
+/* { dg-options "-DOTHER_ISA=10 -march=v10" } */
+
+/* Check that -march=v10 is also recognized.  */
+
+#include "inasm-other.c"
--- /dev/null	Tue Oct 29 15:57:07 2002
+++ gcc/testsuite/gcc.target/cris/inasm-v8.c	Thu May 31 04:22:46 2012
@@ -0,0 +1,6 @@
+/* { dg-do assemble } */
+/* { dg-options "-DOTHER_ISA=8 -march=v8" } */
+
+/* Check that -march=v8 is also recognized.  */
+
+#include "inasm-other.c"
--- /dev/null	Tue Oct 29 15:57:07 2002
+++ gcc/testsuite/gcc.target/cris/asm-v10.S	Thu May 31 04:22:03 2012
@@ -0,0 +1,6 @@
+/* { dg-do assemble } */
+/* { dg-options "-DOTHER_ISA=10 -march=v10" } */
+
+/* Check that -march=v10 is also recognized.  */
+
+#include "asm-other.S"
--- /dev/null	Tue Oct 29 15:57:07 2002
+++ gcc/testsuite/gcc.target/cris/asm-v8.S	Thu May 31 04:22:46 2012
@@ -0,0 +1,6 @@
+/* { dg-do assemble } */
+/* { dg-options "-DOTHER_ISA=8 -march=v8" } */
+
+/* Check that -march=v8 is also recognized.  */
+
+#include "asm-other.S"

brgds, H-P