From 75d8aea7ff90034e5d8c038f845104359f8951b0 Mon Sep 17 00:00:00 2001 From: Philip Blundell Date: Sun, 10 Sep 2000 19:37:51 +0000 Subject: [PATCH] Don't define `arm' or `thumb'. For linux-elf don't define `__arm__' From-SVN: r36302 --- gcc/ChangeLog | 5 +++++ gcc/config/arm/arm.h | 2 +- gcc/config/arm/linux-elf.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 553741d..1cbc317 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2000-09-10 Philip Blundell + + * 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 4f2692a..18e6ad9 100644 --- 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 cd1cd46..1be7a6f 100644 --- 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. */ -- 2.7.4