Undo effects of previous delta.

Undo effects of previous delta.  Do not define ASM_SPEC and SUBTARGET_EXTRA_ASM_SPEC
oin arm.h as it conflicts with builds for non GAS using targets

From-SVN: r32816

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 8e7b857..002f8e9 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -249,23 +249,6 @@ Unrecognized value in TARGET_CPU_DEFAULT.
 #ifndef SUBTARGET_CPP_SPEC
 #define SUBTARGET_CPP_SPEC      ""
 #endif
-
-#ifndef SUBTARGET_EXTRA_ASM_SPEC
-#define SUBTARGET_EXTRA_ASM_SPEC
-#endif
-
-#ifndef ASM_SPEC
-#define ASM_SPEC "\
-%{mbig-endian:-EB} \
-%{mcpu=*:-m%*} \
-%{march=*:-m%*} \
-%{mapcs-*:-mapcs-%*} \
-%{matpcs:-matpcs} \
-%{mapcs-float:-mfloat} \
-%{msoft-float:-mno-fpu} \
-%{mthumb-interwork:-mthumb-interwork} \
-" SUBTARGET_EXTRA_ASM_SPEC
-#endif
 \f
 /* Run-time Target Specification.  */
 #ifndef TARGET_VERSION

diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
index 48754bb..d1993f8 100644 (file)
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -36,7 +36,7 @@ Boston, MA 02111-1307, USA.  */
        " %{mapcs-26:-m armelf_linux26} %{!mapcs-26:-m armelf_linux} -p"
 # endif
 # define SUBTARGET_EXTRA_ASM_SPEC      \
-       " %{mapcs-26:-mapcs-26} %(!mapcs-26:-mapcs-32}"
+       " %{mapcs-26:-mapcs-26} %{!mapcs-26:-mapcs-32}"
 # define MULTILIB_DEFAULTS \
        { "mlittle-endian", "mhard-float", "mapcs-32", "mno-thumb-interwork" }
 # define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"
@@ -50,7 +50,7 @@ Boston, MA 02111-1307, USA.  */
        " %{mapcs-32:-m armelf_linux} %{!mapcs-32:-m armelf_linux26} -p"
 # endif
 # define SUBTARGET_EXTRA_ASM_SPEC      \
-       " %{mapcs-32:-mapcs-32} %(!mapcs-32:-mapcs-26}"
+       " %{mapcs-32:-mapcs-32} %{!mapcs-32:-mapcs-26}"
 # define MULTILIB_DEFAULTS \
        { "mlittle-endian", "mhard-float", "mapcs-26", "mno-thumb-interwork" }
 #endif