cris.h (CC1_SPEC): Pass through all -march= and -mcpu= options.

	* 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_v0_v10.

From-SVN: r188051

gcc/ChangeLog

+2012-05-31  Hans-Peter Nilsson  <hp@axis.com>
+
+	* 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_v0_v10.
+
 2012-05-31  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* ira-int.h (target_ira_int): Rename x_move_cost to

gcc/config/cris/cris.h

@@ -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 \