diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 427533d8a18f..1a85acabe65d 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,7 +1,13 @@
+2012-01-25  Alan Modra  <amodra@gmail.com>
+
+	* config/rs6000/t-linux64: Delete.  Move..
+	* config/rs6000/t-ppc64-fp: ..softfp_wrap defines to here..
+	* config/rs6000/t-linux: ..and libgcc flags to here.
+
 2012-01-22  Douglas B Rupp  <rupp@gnat.com>
 
 	* config.host (i[34567]86-*-interix3*):
-         Change triplet to i[34567]86-*-interix[3-9]*.
+	Change triplet to i[34567]86-*-interix[3-9]*.
 	* configure: Regenerate.
 
 2012-01-15  Chung-Lin Tang  <cltang@codesourcery.com>
diff --git a/libgcc/config/rs6000/t-linux b/libgcc/config/rs6000/t-linux
index dcf7ffc255ec..4f6d4c4a4d23 100644
--- a/libgcc/config/rs6000/t-linux
+++ b/libgcc/config/rs6000/t-linux
@@ -1,3 +1,3 @@
 SHLIB_MAPFILES += $(srcdir)/config/rs6000/libgcc-glibc.ver
 
-HOST_LIBGCC2_CFLAGS += -mlong-double-128
+HOST_LIBGCC2_CFLAGS += -mlong-double-128 -mno-minimal-toc
diff --git a/libgcc/config/rs6000/t-linux64 b/libgcc/config/rs6000/t-linux64
deleted file mode 100644
index 2b60f1a1f43a..000000000000
--- a/libgcc/config/rs6000/t-linux64
+++ /dev/null
@@ -1,4 +0,0 @@
-HOST_LIBGCC2_CFLAGS += -mno-minimal-toc
-
-softfp_wrap_start := '\#ifndef __powerpc64__'
-softfp_wrap_end := '\#endif'
diff --git a/libgcc/config/rs6000/t-ppc64-fp b/libgcc/config/rs6000/t-ppc64-fp
index 26d1730bcdb6..1fac701fc441 100644
--- a/libgcc/config/rs6000/t-ppc64-fp
+++ b/libgcc/config/rs6000/t-ppc64-fp
@@ -1,2 +1,5 @@
 # Can be used unconditionally, wrapped in __powerpc64__ || __64BIT__ __ppc64__.
 LIB2ADD += $(srcdir)/config/rs6000/ppc64-fp.c
+
+softfp_wrap_start := '\#ifndef __powerpc64__'
+softfp_wrap_end := '\#endif'