remove -mcpu=rs6000

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

diff --git a/gcc/config/rs6000/aix3newas.h b/gcc/config/rs6000/aix3newas.h
index b790bb3..285b9ee 100644 (file)
--- a/gcc/config/rs6000/aix3newas.h
+++ b/gcc/config/rs6000/aix3newas.h
@@ -35,7 +35,6 @@ Boston, MA 02111-1307, USA.  */
   %{!mno-power: %{mpowerpc*: -m601}} \
   %{!mno-power: %{!mpowerpc*: %{!mpower2: -mpwr}}}} \
 %{mcpu=common: -mcom} \
-%{mcpu=rs6000: -mpwr} \
 %{mcpu=power: -mpwr} \
 %{mcpu=power2: -mpwrx} \
 %{mcpu=powerpc: -mppc} \

diff --git a/gcc/config/rs6000/aix41.h b/gcc/config/rs6000/aix41.h
index fa8d168..e3edbc3 100644 (file)
--- a/gcc/config/rs6000/aix41.h
+++ b/gcc/config/rs6000/aix41.h
@@ -32,7 +32,6 @@ Boston, MA 02111-1307, USA.  */
   %{mpowerpc*: %{mpower: -m601}} \
   %{!mpowerpc*: %{!mpower*: -mcom}}} \
 %{mcpu=common: -mcom} \
-%{mcpu=rs6000: -mpwr} \
 %{mcpu=power: -mpwr} \
 %{mcpu=power2: -mpwrx} \
 %{mcpu=powerpc: -mppc} \
@@ -62,7 +61,6 @@ Boston, MA 02111-1307, USA.  */
   %{mpowerpc*: -D_ARCH_PPC} \
   %{!mpower*: -D_ARCH_COM}} \
 %{mcpu=common: -D_ARCH_COM} \
-%{mcpu=rs6000: -D_ARCH_PWR} \
 %{mcpu=power: -D_ARCH_PWR} \
 %{mcpu=power2: -D_ARCH_PWR2} \
 %{mcpu=powerpc: -D_ARCH_PPC} \

diff --git a/gcc/config/rs6000/eabiaix.h b/gcc/config/rs6000/eabiaix.h
index dcb00c7..6c035b3 100644 (file)
--- a/gcc/config/rs6000/eabiaix.h
+++ b/gcc/config/rs6000/eabiaix.h
@@ -42,7 +42,6 @@ Boston, MA 02111-1307, USA.  */
   %{mno-powerpc: %{!mpower: %{!mpower2: -D_ARCH_COM}}} \
   %{!mno-powerpc: -D_ARCH_PPC}} \
 %{mcpu=common: -D_ARCH_COM} \
-%{mcpu=rs6000: -D_ARCH_PWR} \
 %{mcpu=power: -D_ARCH_PWR} \
 %{mcpu=power2: -D_ARCH_PWR2} \
 %{mcpu=powerpc: -D_ARCH_PPC} \

diff --git a/gcc/config/rs6000/eabile.h b/gcc/config/rs6000/eabile.h
index 06f8b1e..7d6a0ad 100644 (file)
--- a/gcc/config/rs6000/eabile.h
+++ b/gcc/config/rs6000/eabile.h
@@ -43,7 +43,6 @@ Boston, MA 02111-1307, USA.  */
   %{mno-powerpc: %{!mpower: %{!mpower2: -D_ARCH_COM}}} \
   %{!mno-powerpc: -D_ARCH_PPC}} \
 %{mcpu=common: -D_ARCH_COM} \
-%{mcpu=rs6000: -D_ARCH_PWR} \
 %{mcpu=power: -D_ARCH_PWR} \
 %{mcpu=power2: -D_ARCH_PWR2} \
 %{mcpu=powerpc: -D_ARCH_PPC} \

diff --git a/gcc/config/rs6000/lynx.h b/gcc/config/rs6000/lynx.h
index ac16a4c..81bc273 100644 (file)
--- a/gcc/config/rs6000/lynx.h
+++ b/gcc/config/rs6000/lynx.h
@@ -82,7 +82,6 @@ Boston, MA 02111-1307, USA.  */
   %{!mno-powerpc: %{mpower: -m601}} \
   %{!mno-powerpc: %{!mpower: -mppc}}} \
 %{mcpu=common: -mcom} \
-%{mcpu=rs6000: -mpwr} \
 %{mcpu=power: -mpwr} \
 %{mcpu=power2: -mpwrx} \
 %{mcpu=powerpc: -mppc} \

diff --git a/gcc/config/rs6000/netware.h b/gcc/config/rs6000/netware.h
index e4ea1ca..2683a08 100644 (file)
--- a/gcc/config/rs6000/netware.h
+++ b/gcc/config/rs6000/netware.h
@@ -192,7 +192,6 @@ toc_section ()                                                              \
   %{!mno-powerpc: %{mpower: -m601}} \
   %{!mno-powerpc: %{!mpower: -mppc}}} \
 %{mcpu=common: -mcom} \
-%{mcpu=rs6000: -mpwr} \
 %{mcpu=power: -mpwr} \
 %{mcpu=power2: -mpwrx} \
 %{mcpu=powerpc: -mppc} \

diff --git a/gcc/config/rs6000/powerpc.h b/gcc/config/rs6000/powerpc.h
index 0e9f957..afa7740 100644 (file)
--- a/gcc/config/rs6000/powerpc.h
+++ b/gcc/config/rs6000/powerpc.h
@@ -33,7 +33,6 @@ Boston, MA 02111-1307, USA.  */
   %{!mno-powerpc: %{mpower: -m601}} \
   %{!mno-powerpc: %{!mpower: -mppc}}} \
 %{mcpu=common: -mcom} \
-%{mcpu=rs6000: -mpwr} \
 %{mcpu=power: -mpwr} \
 %{mcpu=power2: -mpwrx} \
 %{mcpu=powerpc: -mppc} \
@@ -64,7 +63,6 @@ Boston, MA 02111-1307, USA.  */
   %{mno-powerpc: %{!mpower: %{!mpower2: -D_ARCH_COM}}} \
   %{!mno-powerpc: -D_ARCH_PPC}} \
 %{mcpu=common: -D_ARCH_COM} \
-%{mcpu=rs6000: -D_ARCH_PWR} \
 %{mcpu=power: -D_ARCH_PWR} \
 %{mcpu=power2: -D_ARCH_PWR2} \
 %{mcpu=powerpc: -D_ARCH_PPC} \

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index cc511ee..ade400b 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -211,9 +211,6 @@ rs6000_override_options (default_cpu)
       int target_disable;      /* Target flags to disable.  */
     } processor_target_table[]
       = {{"common", PROCESSOR_COMMON, 0, POWER_MASKS | POWERPC_MASKS},
-        {"rs6000", PROCESSOR_POWER,
-           MASK_POWER | MASK_MULTIPLE | MASK_STRING,
-           MASK_POWER2 | POWERPC_MASKS | MASK_NEW_MNEMONICS},
         {"power", PROCESSOR_POWER,
            MASK_POWER | MASK_MULTIPLE | MASK_STRING,
            MASK_POWER2 | POWERPC_MASKS | MASK_NEW_MNEMONICS},

diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index db669be..3bd9bec 100644 (file)
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -59,7 +59,6 @@ Boston, MA 02111-1307, USA.  */
   %{mno-power: %{!mpowerpc*: -D_ARCH_COM}} \
   %{!mno-power: %{!mpower2: -D_ARCH_PWR}}} \
 %{mcpu=common: -D_ARCH_COM} \
-%{mcpu=rs6000: -D_ARCH_PWR} \
 %{mcpu=power: -D_ARCH_PWR} \
 %{mcpu=power2: -D_ARCH_PWR2} \
 %{mcpu=powerpc: -D_ARCH_PPC} \

diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index d2d13ed..bc73a4c 100644 (file)
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -435,7 +435,6 @@ extern int rs6000_pic_labelno;
   %{!mno-powerpc: %{mpower: -m601}} \
   %{!mno-powerpc: %{!mpower: -mppc}}} \
 %{mcpu=common: -mcom} \
-%{mcpu=rs6000: -mpwr} \
 %{mcpu=power: -mpwr} \
 %{mcpu=power2: -mpwrx} \
 %{mcpu=powerpc: -mppc} \
@@ -624,7 +623,6 @@ do {                                                                        \
   %{mno-powerpc: %{!mpower: %{!mpower2: -D_ARCH_COM}}} \
   %{!mno-powerpc: -D_ARCH_PPC}} \
 %{mcpu=common: -D_ARCH_COM} \
-%{mcpu=rs6000: -D_ARCH_PWR} \
 %{mcpu=power: -D_ARCH_PWR} \
 %{mcpu=power2: -D_ARCH_PWR2} \
 %{mcpu=powerpc: -D_ARCH_PPC} \

diff --git a/gcc/config/rs6000/sysv4le.h b/gcc/config/rs6000/sysv4le.h
index e9cf5bc..4d05d90 100644 (file)
--- a/gcc/config/rs6000/sysv4le.h
+++ b/gcc/config/rs6000/sysv4le.h
@@ -43,7 +43,6 @@ Boston, MA 02111-1307, USA.  */
   %{mno-powerpc: %{!mpower: %{!mpower2: -D_ARCH_COM}}} \
   %{!mno-powerpc: -D_ARCH_PPC}} \
 %{mcpu=common: -D_ARCH_COM} \
-%{mcpu=rs6000: -D_ARCH_PWR} \
 %{mcpu=power: -D_ARCH_PWR} \
 %{mcpu=power2: -D_ARCH_PWR2} \
 %{mcpu=powerpc: -D_ARCH_PPC} \