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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@188051 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 10f66ba92d3c656d577f1cda603332aa6866fc84..ee2afa57900892c79c7c354cfeb1764e1a0c79de 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+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

diff --git a/gcc/config/cris/cris.h b/gcc/config/cris/cris.h
index edb5f97e18b2d290fc4d97bacaa510202d40c691..78fbe6840782a9918be3a17fdebc620927dc9028 100644 (file)
--- a/gcc/config/cris/cris.h
+++ b/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 \