From 863ebdad199295368ad0f811eba4e72c168e53fb Mon Sep 17 00:00:00 2001
From: Philip Blundell <pb@nexus.co.uk>
Date: Wed, 31 Mar 1999 10:25:40 +0000
Subject: [PATCH] Apply patch from Philip Blundel to fix a few ARM/Linux nits.

From-SVN: r26083
---
 gcc/ChangeLog              |  9 +++++++++
 gcc/config/arm/aout.h      |  2 ++
 gcc/config/arm/linux-elf.h | 13 ++++++++-----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0baed386ac0..4c6544be310 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+Tue Mar 30 10:43:49 1999  Philip Blundell  <pb@nexus.co.uk>
+
+	* config/arm/aout.h (DBX_DEBUGGING_INFO): Avoid redefinition if
+	dbxelf.h was previously included.
+	(CPP_APCS_PC_DEFAULT_SPEC): No need to undefine.
+	
+	* config/arm/linux-elf.h (FP_DEFAULT): Correctly override the
+	definition from arm.h.
+
 Wed Mar 31 10:33:37 1999  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
         * Makefile.in (c-gperf.h): Generate using gperf language 'C', not
diff --git a/gcc/config/arm/aout.h b/gcc/config/arm/aout.h
index faf395aadb2..692d54fa2df 100644
--- a/gcc/config/arm/aout.h
+++ b/gcc/config/arm/aout.h
@@ -107,7 +107,9 @@ Boston, MA 02111-1307, USA.  */
 
 /* Generate DBX debugging information.  riscix.h will undefine this because
    the native assembler does not support stabs. */
+#ifndef DBX_DEBUGGING_INFO
 #define DBX_DEBUGGING_INFO  1
+#endif
 
 /* Acorn dbx moans about continuation chars, so don't use any.  */
 #ifndef DBX_CONTIN_LENGTH
diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h
index 254b6fd506c..de45e1c4b53 100644
--- a/gcc/config/arm/linux-elf.h
+++ b/gcc/config/arm/linux-elf.h
@@ -87,12 +87,7 @@ Boston, MA 02111-1307, USA.  */
 -Amachine(arm) -D__ELF__ -Darm_elf"
 
 #ifndef SUBTARGET_DEFAULT_APCS26
-#undef  CPP_APCS_PC_DEFAULT_SPEC
 #define CPP_APCS_PC_DEFAULT_SPEC "-D__APCS_32__"
-/* On 32-bit machine it is always safe to assume we have the "new"
-   floating point system.  */
-#undef  FP_DEFAULT
-#define FP_DEFAULT FP_SOFT3
 #endif
 
 /* Allow #sccs in preprocessor.  */
@@ -240,3 +235,11 @@ const_section ()							\
 
 #include "arm/elf.h"
 #include "arm/linux-gas.h"
+
+#ifndef SUBTARGET_DEFAULT_APCS26
+/* On 32-bit machine it is always safe to assume we have the "new"
+   floating point system.  
+   ?? Make this happen for all targets when NWFPE is better established.  */
+#undef  FP_DEFAULT
+#define FP_DEFAULT FP_SOFT3
+#endif
-- 
2.30.2