Namespace fixes for arm/linux

From-SVN: r38541

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0f6b231c73ec3afa21ed5fe1639907fbac78fbb0..b3b390d3687decbd540d7295b735ecb41a235632 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -19,6 +19,10 @@
        the insn lengths in the templates for sign extention and zero
        extention.
 
+       2000-12-23  Philip Blundell  <philb@gnu.org>
+       * config/arm/linux-elf.h (CPP_PREDEFINES): Don't define `arm' or
+       `arm_elf'; do define `__arm__'.
+
 2000-12-22  Bernd Schmidt  <bernds@redhat.co.uk>
 
        * calls.c (emit_call_1): Fall back to call_pop/call_value_pop if no

diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
index 705c963c6477f64300306ab61a723cf588c33eef..41bafef33269bfef424c33981d06c7361cf3ccc7 100644 (file)
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -103,8 +103,8 @@ Boston, MA 02111-1307, USA.  */
 
 #undef  CPP_PREDEFINES
 #define CPP_PREDEFINES \
-"-Dunix -Darm -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(arm) \
--Amachine(arm) -D__ELF__ -Darm_elf"
+"-Dunix -D__arm__ -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(arm) \
+-Amachine(arm) -D__ELF__"
 
 #ifndef SUBTARGET_DEFAULT_APCS26
 #define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"