re PR target/18759 ([x86] using both -fomit-frame-pointer and -momit-leaf-frame-point...

	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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2bbcd99110052d88028bb24fe949934280b94833..99b43d371b5767170c08c711ff6ab3dee2d3ab9b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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 `;'.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index a3d2f2806d2aa7ba3d68c70c588c286c76787034..1a63fe08873dbc012798ccd4c194fa33eece8578 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/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