diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 2f6973b7a82..a9f771c82ec 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,5 +1,12 @@
+2011-09-28  Nick Clifton  <nickc@redhat.com>
+
+	* config/rx/rx-lib.h: Always restrict doubles to the SF type when
+	64-bit doubles are not enabled.
+	* config/rx/rx-abi.h: Fix extraneous renaming of the floatsisf
+	and floatunsisf functions.
+
 2011-09-13  Paul Brook  <paul@codesourcery.com>
- 
+
 	* config.host (tic6x-*-*): Add c6x/t-c6x-elf.  Set unwind_header.
 	* unwind-c.c (PERSONALITY_FUNCTION): Use UNWIND_POINTER_REG.
 	* unwind-arm-common.inc: New file.
diff --git a/libgcc/config/rx/rx-abi.h b/libgcc/config/rx/rx-abi.h
index 8a0bbdcd82c..6882efc31cb 100644
--- a/libgcc/config/rx/rx-abi.h
+++ b/libgcc/config/rx/rx-abi.h
@@ -80,15 +80,6 @@
 #endif
 
 
-#ifdef L_si_to_sf
-#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatsisf, CONV32sf)
-#endif
-
-#ifdef L_usi_to_sf
-#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatunsisf, CONV32uf)
-#endif
-
-
 
 #ifdef __RX_64BIT_DOUBLES__
 
@@ -176,6 +167,14 @@
 #define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (negdf2, NEGd)
 #endif
 
+#ifdef L_si_to_sf
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatsisf, CONV32sf)
+#endif
+
+#ifdef L_usi_to_sf
+#define DECLARE_LIBRARY_RENAMES RENAME_LIBRARY (floatunsisf, CONV32uf)
+#endif
+
 /* The 64-bit comparison functions do not have aliases because libgcc2
    does not provide them.  Instead they have to be supplied in
    rx-abi-functions.c.  */
diff --git a/libgcc/config/rx/rx-lib.h b/libgcc/config/rx/rx-lib.h
index fb1d14632a6..c83516fd64b 100644
--- a/libgcc/config/rx/rx-lib.h
+++ b/libgcc/config/rx/rx-lib.h
@@ -1,6 +1,5 @@
-#ifdef FLOAT
 #ifndef __RX_64BIT_DOUBLES__
 #define DF SF
 #define FLOAT_ONLY
 #endif
-#endif
+