Don't define `arm' or `thumb'.

For linux-elf don't define `__arm__'

From-SVN: r36302

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 553741de353fe97fe36b7e7fbd0d811d0144596a..1cbc3173e61a8f25fe0acb08bb9802fde27b5f3e 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-09-10  Philip Blundell  <philb@gnu.org>
+
+       * config/arm/arm.h (CPP_ISA_SPEC): Don't define `arm' or `thumb'.
+       * config/arm/linux-elf.h (CPP_PREDEFINES): Don't define `__arm__'.
+
 Sun Sep 10 14:30:28 EDT 2000  John Wehle  (john@feith.com)
 
        * alias.c (find_base_term): Handle ADDRESSOF.

diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
index 4f2692a7ccfcb991ff981f134b53e346c785f1df..18e6ad9268ee06c8a6422e56a4a4dfb0dafb4640 100644 (file)
--- a/gcc/config/arm/arm.h
+++ b/gcc/config/arm/arm.h
@@ -129,7 +129,7 @@ Unrecognized value in TARGET_CPU_DEFAULT.
 %(cpp_cpu_arch) %(cpp_apcs_pc) %(cpp_float) \
 %(cpp_endian) %(subtarget_cpp_spec) %(cpp_isa) %(cpp_interwork)"
 
-#define CPP_ISA_SPEC "%{mthumb:-Dthumb -D__thumb__} %{!mthumb:-Darm -D__arm__}"
+#define CPP_ISA_SPEC "%{mthumb:-D__thumb__} %{!mthumb:-D__arm__}"
 
 /* Set the architecture define -- if -march= is set, then it overrides
    the -mcpu= setting.  */

diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
index cd1cd46c1a96013495e61ca11d8538b41d0a9816..1be7a6fffeda0654c71fb6f7838a638bf87e0e02 100644 (file)
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -105,7 +105,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef  CPP_PREDEFINES
 #define CPP_PREDEFINES \
-"-Dunix -D__arm__ -Dlinux -D__ELF__ \
+"-Dunix -Dlinux -D__ELF__ \
 -Asystem(unix) -Asystem(posix) -Acpu(arm) -Amachine(arm)"
 
 /* Allow #sccs in preprocessor.  */