re PR target/18759 ([x86] using both -fomit-frame-pointer and…

re PR target/18759 ([x86] using both -fomit-frame-pointer and -momit-leaf-frame-pointer enables frame pointers for non-leaf functions)


	PR target/18759
	* config/i386/i386.c (override_options): If -fomit-frame-pointer has
	already been specified, ignore the -momit-leaf-frame-pointer option.

From-SVN: r91662

gcc/ChangeLog

+2004-12-02  Roger Sayle  <roger@eyesopen.com>
+
+	PR target/18759
+	* config/i386/i386.c (override_options): If -fomit-frame-pointer has
+	already been specified, ignore the -momit-leaf-frame-pointer option.
+
 2004-12-02  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* varasm.c (make_decl_rtl): Add the missing `;'.

gcc/config/i386/i386.c

@@ -1466,7 +1466,9 @@ override_options (void)
     }
 
   /* Keep nonleaf frame pointers.  */
-  if (TARGET_OMIT_LEAF_FRAME_POINTER)
+  if (flag_omit_frame_pointer)
+    target_flags &= ~MASK_OMIT_LEAF_FRAME_POINTER;
+  else if (TARGET_OMIT_LEAF_FRAME_POINTER)
     flag_omit_frame_pointer = 1;
 
   /* If we're doing fast math, we don't care about comparison order