* config/arm/arm-wince-pe.h (ASM_SPEC): Pass -mcpu and -march

    switches straight on to the assembler, do not abbreviate them.
    * config/arm/elf.h (ASM_SPEC): As above.
    * config/arm/semi.h (ASM_SPEC): As above.
    * config/arm/unknown-elf-oabi.h (ASM_SPEC): As above.
    * config/arm/xscale-coff.h (SUBTARGET_ASM_SPEC): Pass
    -mcpu=xscale on to the assembler by default.
    * config/arm/xscale-elf.h (SUBTARGET_ASM_SPEC): As above.


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

7 files changed, 20 insertions, 9 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 70e76fce638..2a2afdf70c8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2002-05-20  Nick Clifton  <nickc@cambridge.redhat.com>
+
+	* config/arm/arm-wince-pe.h (ASM_SPEC): Pass -mcpu and -march
+	switches straight on to the assembler, do not abbreviate them.
+	* config/arm/elf.h (ASM_SPEC): As above.
+	* config/arm/semi.h (ASM_SPEC): As above.
+	* config/arm/unknown-elf-oabi.h (ASM_SPEC): As above.
+	* config/arm/xscale-coff.h (SUBTARGET_ASM_SPEC): Pass
+	-mcpu=xscale on to the assembler by default.
+	* config/arm/xscale-elf.h (SUBTARGET_ASM_SPEC): As above.
+
 2002-05-20  Richard Henderson  <rth@redhat.com>
 
 	* cse.c (canon_hash): Reorder do_not_record test.  Always
diff --git a/gcc/config/arm/arm-wince-pe.h b/gcc/config/arm/arm-wince-pe.h
index e43ea996319..511a40d5ace 100644
--- a/gcc/config/arm/arm-wince-pe.h
+++ b/gcc/config/arm/arm-wince-pe.h
@@ -51,8 +51,8 @@ Boston, MA 02111-1307, USA.  */
 #undef  ASM_SPEC
 #define ASM_SPEC "			\
 %{mbig-endian:-EB}			\
-%{mcpu=*:-m%*}				\
-%{march=*:-m%*}				\
+%{mcpu=*:-mcpu=%*}			\
+%{march=*:-march=%*}			\
 %{mapcs-*:-mapcs-%*}			\
 %{mthumb-interwork:-mthumb-interwork}	\
 %{!mapcs-32:%{!mapcs-26:-mapcs-32}}	\
diff --git a/gcc/config/arm/elf.h b/gcc/config/arm/elf.h
index 1cab2c4e144..003ab2c8a4f 100644
--- a/gcc/config/arm/elf.h
+++ b/gcc/config/arm/elf.h
@@ -46,8 +46,8 @@ Boston, MA 02111-1307, USA.  */
 #ifndef ASM_SPEC
 #define ASM_SPEC "\
 %{mbig-endian:-EB} \
-%{mcpu=*:-m%*} \
-%{march=*:-m%*} \
+%{mcpu=*:-mcpu=%*} \
+%{march=*:-march=%*} \
 %{mapcs-*:-mapcs-%*} \
 %{mapcs-float:-mfloat} \
 %{msoft-float:-mno-fpu} \
diff --git a/gcc/config/arm/semi.h b/gcc/config/arm/semi.h
index 54ea0e8b037..2e1abd40d24 100644
--- a/gcc/config/arm/semi.h
+++ b/gcc/config/arm/semi.h
@@ -61,8 +61,8 @@ Boston, MA 02111-1307, USA.  */
 #define ASM_SPEC "\
 %{fpic: -k} %{fPIC: -k} \
 %{mbig-endian:-EB} \
-%{mcpu=*:-m%*} \
-%{march=*:-m%*} \
+%{mcpu=*:-mcpu=%*} \
+%{march=*:-march=%*} \
 %{mapcs-float:-mfloat} \
 %{msoft-float:-mno-fpu} \
 %{mthumb-interwork:-mthumb-interwork} \
diff --git a/gcc/config/arm/unknown-elf-oabi.h b/gcc/config/arm/unknown-elf-oabi.h
index 8322508a232..91f18c0b802 100644
--- a/gcc/config/arm/unknown-elf-oabi.h
+++ b/gcc/config/arm/unknown-elf-oabi.h
@@ -24,6 +24,6 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_VERSION	fputs (" (ARM/ELF non-Linux old abi)", stderr);
 
 #undef  ASM_SPEC
-#define ASM_SPEC "-moabi %{mbig-endian:-EB} %{mcpu=*:-m%*} %{march=*:-m%*} \
+#define ASM_SPEC "-moabi %{mbig-endian:-EB} %{mcpu=*:-mcpu=%*} %{march=*:-march=%*} \
  %{mapcs-*:-mapcs-%*} %{mthumb-interwork:-mthumb-interwork}"
 
diff --git a/gcc/config/arm/xscale-coff.h b/gcc/config/arm/xscale-coff.h
index 51fe6932e6d..d8fee7de3d8 100644
--- a/gcc/config/arm/xscale-coff.h
+++ b/gcc/config/arm/xscale-coff.h
@@ -24,7 +24,7 @@
 #define SUBTARGET_CPU_DEFAULT 		TARGET_CPU_xscale
 
 #undef  SUBTARGET_EXTRA_ASM_SPEC
-#define SUBTARGET_EXTRA_ASM_SPEC "%{!mcpu=*:-mxscale}"
+#define SUBTARGET_EXTRA_ASM_SPEC "%{!mcpu=*:-mcpu=xscale}"
 
 #undef  MULTILIB_DEFAULTS
 #define MULTILIB_DEFAULTS \
diff --git a/gcc/config/arm/xscale-elf.h b/gcc/config/arm/xscale-elf.h
index b1ce04e103e..8ea35885b6d 100644
--- a/gcc/config/arm/xscale-elf.h
+++ b/gcc/config/arm/xscale-elf.h
@@ -28,7 +28,7 @@ Boston, MA 02111-1307, USA.  */
 #define SUBTARGET_CPU_DEFAULT 		TARGET_CPU_xscale
 #endif
 
-#define SUBTARGET_EXTRA_ASM_SPEC "%{!mcpu=*:-mxscale} %{!mhard-float:-mno-fpu}"
+#define SUBTARGET_EXTRA_ASM_SPEC "%{!mcpu=*:-mcpu=xscale} %{!mhard-float:-mno-fpu}"
 
 #ifndef MULTILIB_DEFAULTS
 #define MULTILIB_DEFAULTS \