diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9306c7e6dbb..7e6d81bf047 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,4 +1,13 @@
-2001-06-19      Joel Sherrill <joel@OARcorp.com>
+2001-07-24  Joel Sherrill <joel@OARcorp.com>
+
+        * config/sparc/rtems.h (CPP_PREDEFINES): Remove redundant
+	-Acpu and -Amachine.h.
+        * config/sparc/rtemself.h (CPP_PREDEFINES): Likewise.
+        Corrected header to say ELF not a.out. 
+        * config/sparc/sparc.h (CPP_CPU_SPEC): Define _SOFT_FLOAT 
+	when given -msoft-float.
+
+2001-07-24  Joel Sherrill <joel@OARcorp.com>
 
 	* config.gcc (arm*-*-rtems*): Include crtinit.o and crtfini.o as
 	extra multilib parts like arm-elf.
diff --git a/gcc/config/sparc/rtems.h b/gcc/config/sparc/rtems.h
index 36fcf33f578..eeb773042bb 100644
--- a/gcc/config/sparc/rtems.h
+++ b/gcc/config/sparc/rtems.h
@@ -25,7 +25,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dsparc -D__GCC_NEW_VARARGS__ -Drtems -D__rtems__ \
-  -Asystem=rtems -Acpu=sparc -Amachine=sparc"
+  -Asystem=rtems"
 
 /* Generate calls to memcpy, memcmp and memset.  */
 #ifndef TARGET_MEM_FUNCTIONS
diff --git a/gcc/config/sparc/rtemself.h b/gcc/config/sparc/rtemself.h
index 62277abe79d..cfc95f28b8c 100644
--- a/gcc/config/sparc/rtemself.h
+++ b/gcc/config/sparc/rtemself.h
@@ -1,4 +1,4 @@
-/* Definitions for rtems targeting a SPARC using a.out.
+/* Definitions for rtems targeting a SPARC using ELF.
    Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (joel@OARcorp.com).
 
@@ -23,7 +23,7 @@ Boston, MA 02111-1307, USA.  */
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "-Dsparc -D__GCC_NEW_VARARGS__ -Drtems -D__rtems__ \
-  -Asystem=rtems -Acpu=sparc -Amachine=sparc"
+  -Asystem=rtems"
 
 /* Generate calls to memcpy, memcmp and memset.  */
 #ifndef TARGET_MEM_FUNCTIONS
diff --git a/gcc/config/sparc/sparc.h b/gcc/config/sparc/sparc.h
index b107236706b..6aa72d1d958 100644
--- a/gcc/config/sparc/sparc.h
+++ b/gcc/config/sparc/sparc.h
@@ -223,6 +223,7 @@ Unrecognized value in TARGET_CPU_DEFAULT.
 /* Common CPP definitions used by CPP_SPEC amongst the various targets
    for handling -mcpu=xxx switches.  */
 #define CPP_CPU_SPEC "\
+%{msoft-float:-D_SOFT_FLOAT} \
 %{mcypress:} \
 %{msparclite:-D__sparclite__} \
 %{mf930:-D__sparclite__} %{mf934:-D__sparclite__} \