* doc/invoke.texi: Document -mtune, delete -mcpu

        option for S/390 and zSeries.
        * config/s390/s390.c (s390_tune_string) New variable.
        (s390_cpu_string) Delete variable.
        (override_options): Use s390_tune_string instead of
        s390_cpu_string.
        * config/s390/s390.h: (TARGET_OPTIONS) '-mtune' instead of '-mcpu'.


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

2 files changed, 10 insertions, 10 deletions

diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c
index 9be760d98f6..25956ec62bc 100644
--- a/gcc/config/s390/s390.c
+++ b/gcc/config/s390/s390.c
@@ -117,13 +117,13 @@ struct s390_address
   int pointer;
 };
 
-/* Which cpu are we scheduling for.  */
+/* Which cpu are we tuning for.  */
 enum processor_type s390_cpu;
 /* Which instruction set architecture to use.  */
 enum processor_type s390_arch;
 
 /* Strings to hold which cpu and instruction set architecture  to use.  */
-const char *s390_cpu_string;		/* for -mcpu=<xxx> */
+const char *s390_tune_string;		/* for -mtune=<xxx> */
 const char *s390_arch_string;		/* for -march=<xxx> */
 
 /* Define the structure for the machine field in struct function.  */
@@ -869,10 +869,10 @@ override_options ()
   init_machine_status = s390_init_machine_status;
  
   /* Set cpu and arch, if only partially given.  */
-  if (!s390_cpu_string && s390_arch_string)
-    s390_cpu_string = s390_arch_string;
-  if (!s390_cpu_string)
-    s390_cpu_string = cpu_names [TARGET_64BIT ? TARGET_CPU_DEFAULT_2064
+  if (!s390_tune_string && s390_arch_string)
+    s390_tune_string = s390_arch_string;
+  if (!s390_tune_string)
+    s390_tune_string = cpu_names [TARGET_64BIT ? TARGET_CPU_DEFAULT_2064
                                               :	TARGET_CPU_DEFAULT_9672];
   if (!s390_arch_string)
 #ifdef DEFAULT_TARGET_64BIT
@@ -912,14 +912,14 @@ override_options ()
     }
 
   for (i = 0; i < pta_size; i++)
-    if (! strcmp (s390_cpu_string, processor_alias_table[i].name))
+    if (! strcmp (s390_tune_string, processor_alias_table[i].name))
       {
 	s390_cpu = processor_alias_table[i].processor;
 	break;
       }
 
   if (i == pta_size)
-    error ("bad value (%s) for -mcpu= switch", s390_cpu_string);
+    error ("bad value (%s) for -mtune= switch", s390_tune_string);
 }
 
 /* Map for smallest class containing reg regno.  */
diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h
index fce6c48867d..bf54f789f6a 100644
--- a/gcc/config/s390/s390.h
+++ b/gcc/config/s390/s390.h
@@ -41,7 +41,7 @@ enum processor_type
 };
 
 extern enum processor_type s390_cpu;
-extern const char *s390_cpu_string;
+extern const char *s390_tune_string;
 
 extern enum processor_type s390_arch;
 extern const char *s390_arch_string;
@@ -113,7 +113,7 @@ extern int target_flags;
   { "", TARGET_DEFAULT, 0 } }
 
 #define TARGET_OPTIONS                                          \
-{ { "cpu=",             &s390_cpu_string,                       \
+{ { "tune=",            &s390_tune_string,                      \
     N_("Schedule code for given CPU")},                         \
   { "arch=",            &s390_arch_string,                      \
     N_("Generate code for given CPU")},                         \