rs6000.c (function_arg_boundary): Revert accidental change on September 18.

        * rs6000.c (function_arg_boundary): Revert accidental change on
        September 18.

From-SVN: r22595

gcc/ChangeLog

+Fri Sep 25 22:09:47 1998  David Edelsohn  <edelsohn@mhpcc.edu>
+
+	* rs6000.c (function_arg_boundary): Revert accidental change on
+	September 18.
+
 Fri Sep 25 20:30:00 1998  Michael Meissner  <meissner@cygnus.com>
 
 	* rs6000.h (ASM_OUTPUT_MI_THUNK): Declare, call output_mi_thunk.

gcc/config/rs6000/rs6000.c

@@ -228,7 +228,7 @@ rs6000_override_options (default_cpu)
 	 {"604", PROCESSOR_PPC604,
 	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
 	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
-	 {"604e", PROCESSOR_PPC604,
+	 {"604e", PROCESSOR_PPC604e,
 	    MASK_POWERPC | MASK_PPC_GFXOPT | MASK_NEW_MNEMONICS,
 	    POWER_MASKS | MASK_PPC_GPOPT | MASK_POWERPC64},
 	 {"620", PROCESSOR_PPC620,
@@ -353,13 +353,11 @@ optimization_options (level, size)
      int level;
      int size ATTRIBUTE_UNUSED;
 {
-#if 0
 #ifdef HAIFA
   /* When optimizing, enable use of BCT instruction.  */
   if (level >= 1)
       flag_branch_on_count_reg = 1;
 #endif
-#endif
 }
 
 /* Do anything needed at the start of the asm file.  */
@@ -1319,18 +1317,14 @@ function_arg_padding (mode, type)
    
    Windows NT wants anything >= 8 bytes to be double word aligned.
 
-   V.4 wants long longs to be double word aligned.
-
-   FP emulation: double precision passed, returned, and same alignment
-   as long long.  */
+   V.4 wants long longs to be double word aligned.  */
 
 int
 function_arg_boundary (mode, type)
      enum machine_mode mode;
      tree type;
 {
-  if ((DEFAULT_ABI == ABI_V4 || DEFAULT_ABI == ABI_SOLARIS)
-      && ((mode == DImode) || (TARGET_SOFT_FLOAT && mode == DFmode)))
+  if ((DEFAULT_ABI == ABI_V4 || DEFAULT_ABI == ABI_SOLARIS) && mode == DImode)
     return 64;
 
   if (DEFAULT_ABI != ABI_NT || TARGET_64BIT)