diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ec0ac5f0120495f0172171b875fd48da40bf8288..f744eec247a9dc9370e820861c53b4f550599ec0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-12  Alan Modra  <amodra@bigpond.net.au>
+
+	* config/rs6000/rs6000.c (function_arg_padding): Revert 2004-07-28
+	and 2004-07-14 changes.
+
 2004-08-12  Paul Brook  <paul@codesourcery.com>
 
 	* doc/invoke.texi: Fix typo.
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 7381a464a12483b8b74c722e5b5c8158b25f6998..ad09e078f97e7fec6de0f73ad8bc46b8e6bb4315 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -4600,10 +4600,6 @@ function_arg_padding (enum machine_mode mode, tree type)
 	return upward;
     }
 
-  /* SFmode parameters are padded upwards.  */
-  if (mode == SFmode)
-    return upward;
-
   /* Fall back to the default.  */
   return DEFAULT_FUNCTION_ARG_PADDING (mode, type);
 }