From 1c94383bfa25c3248f7fc91b7d309a8b3fd69b86 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <erich@gnu.org>
Date: Wed, 6 Dec 1995 11:53:39 +0000
Subject: [PATCH] Include arm/aout.h, not arm/arm.h.

From-SVN: r10683
---
 gcc/config/arm/riscix.h    |  2 +-
 gcc/config/arm/riscix1-1.h |  2 +-
 gcc/config/arm/semi.h      | 20 ++++++++++++++------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gcc/config/arm/riscix.h b/gcc/config/arm/riscix.h
index a3b9c3d07029..9c1af465b034 100644
--- a/gcc/config/arm/riscix.h
+++ b/gcc/config/arm/riscix.h
@@ -123,7 +123,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Maths operation domain error number, EDOM */
 #define TARGET_EDOM 33
-#include "arm/arm.h"
+#include "arm/aout.h"
 
 /* The native RISCiX assembler does not support stabs of any kind; because
    the native assembler is not used by the compiler, Acorn didn't feel it was
diff --git a/gcc/config/arm/riscix1-1.h b/gcc/config/arm/riscix1-1.h
index 8be8539b892b..748638137cb7 100644
--- a/gcc/config/arm/riscix1-1.h
+++ b/gcc/config/arm/riscix1-1.h
@@ -81,7 +81,7 @@ Boston, MA 02111-1307, USA.  */
 #define SYMBOL__MAIN __gccmain
 #endif
 
-#include "arm/arm.h"
+#include "arm/aout.h"
 
 /* The native RISCiX assembler does not support stabs of any kind; because
    the native assembler is not used by the compiler, Acorn didn't feel it was
diff --git a/gcc/config/arm/semi.h b/gcc/config/arm/semi.h
index d282ac319e60..c2e7031bbfb4 100644
--- a/gcc/config/arm/semi.h
+++ b/gcc/config/arm/semi.h
@@ -1,5 +1,5 @@
 /* Definitions of target machine for GNU compiler.  ARM on semi-hosted platform
-   Copyright (C) 1994 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (richard.earnshaw@armltd.co.uk)
 
 This file is part of GNU CC.
@@ -28,11 +28,19 @@ Boston, MA 02111-1307, USA.  */
 #define CPP_PREDEFINES \
     "-Darm -Dsemi -Acpu(arm) -Amachine(arm)"
 
-#define TARGET_VERSION fputs (" (ARM/semi-hosted)", stderr);
+#define CPP_SPEC "%{m6:-D__arm6__} \
+%{mcpu-*:-D__%*} \
+%{mcpu=*:-D__%*} \
+%{mapcs-32:-D__APCS_32__ -U__APCS_26__} \
+%{mapcs-26:-D__APCS_26__ -U__APCS_32__} \
+%{!mapcs-32: %{!mapcs-26:-D__APCS_32__}} \
+%{msoft-float:-D__SOFTFP__} \
+%{mhard-float:-U__SOFTFP__} \
+%{!mhard-float: %{!msoft-float:-U__SOFTFP__}} \
+"
 
-#define TARGET_DEFAULT 8	/* APCS-32 (ARM 6) */
+#define TARGET_VERSION fputs (" (ARM/semi-hosted)", stderr);
 
-/* Currently we have no support for atexit.  */
-#define EXIT_BODY {}
+#define TARGET_DEFAULT ARM_FLAG_APCS_32
 
-#include "arm/arm.h"
+#include "arm/aout.h"
-- 
2.43.5