(CPP_SPEC): Remove CPU name synonyms.

(ASM_SPEC): Set assembler target according to compiler target.

From-SVN: r10080

gcc/config/rs6000/aix3newas.h

@@ -26,7 +26,26 @@ Boston, MA 02111-1307, USA.  */
 /* Tell the assembler to assume that all undefined names are external.  */
 
 #undef ASM_SPEC
-#define ASM_SPEC "-u"
+#define ASM_SPEC "-u \
+%{!mcpu*: \
+  %{mpower: %{!mpowerpc*: %{!mpower2: -mpwr}}} \
+  %{mpower2: -mpwrx} \
+  %{mno-power: %{mpowerpc*: -mppc}} \
+  %{mno-power: %{!mpowerpc*: -mcom}} \
+  %{!mno-power: %{mpowerpc*: -m601}} \
+  %{!mno-power: %{!mpowerpc*: %{!mpower2: -mpwr}}}} \
+%{mcpu=common: -mcom} \
+%{mcpu=power: -mpwr} \
+%{mcpu=powerpc: -mppc} \
+%{mcpu=rios: -mpwr} \
+%{mcpu=rios1: -mpwr} \
+%{mcpu=rios2: -mpwrx} \
+%{mcpu=rsc: -mpwr} \
+%{mcpu=rsc1: -mpwr} \
+%{mcpu=403: -mppc} \
+%{mcpu=601: -m601} \
+%{mcpu=603: -mppc} \
+%{mcpu=604: -mppc}"
 
 /* These are not necessary when we pass -u to the assembler, and undefining
    them saves a great deal of space in object files.  */

gcc/config/rs6000/aix41.h

 /* Definitions of target machine for GNU compiler,
    for IBM RS/6000 POWER running AIX version 4.1.
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
    Contributed by David Edelsohn (edelsohn@npac.syr.edu).
 
 This file is part of GNU CC.
@@ -24,7 +24,26 @@ Boston, MA 02111-1307, USA.  */
 #include "rs6000/rs6000.h"
 
 #undef ASM_SPEC
-#define ASM_SPEC "-u -mpwr"
+#define ASM_SPEC "-u \
+%{!mcpu*: \
+  %{mpower: %{!mpowerpc*: %{!mpower2: -mpwr}}} \
+  %{mpower2: -mpwrx} \
+  %{mno-power: %{mpowerpc*: -mppc}} \
+  %{mno-power: %{!mpowerpc*: -mcom}} \
+  %{!mno-power: %{mpowerpc*: -m601}} \
+  %{!mno-power: %{!mpowerpc*: %{!mpower2: -mpwr}}}} \
+%{mcpu=common: -mcom} \
+%{mcpu=power: -mpwr} \
+%{mcpu=powerpc: -mppc} \
+%{mcpu=rios: -mpwr} \
+%{mcpu=rios1: -mpwr} \
+%{mcpu=rios2: -mpwrx} \
+%{mcpu=rsc: -mpwr} \
+%{mcpu=rsc1: -mpwr} \
+%{mcpu=403: -mppc} \
+%{mcpu=601: -m601} \
+%{mcpu=603: -mppc} \
+%{mcpu=604: -mppc}"
 
 /* These are not necessary when we pass -u to the assembler, and undefining
    them saves a great deal of space in object files.  */