diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 824860a007cd..a7d7cb93c4a9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-13  Jack Howarth <howarth@bromo.med.uc.edu>
+
+	* gcc/configure.ac: Enable -fomit-frame-pointer on darwin
+	which support dwarf2.
+	* config/i386/i386.c (override_options): Same.
+
 2010-08-13  Jie Zhang  <jie@codesourcery.com>
 
 	* config/arm/arm.md (cstoredf4): Only valid when
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index a87175cf96d1..b925122a32c6 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -3276,9 +3276,8 @@ override_options (bool main_args_p)
     {
       if (flag_zee == 2)
         flag_zee = 1;
-      /* Mach-O doesn't support omitting the frame pointer for now.  */
       if (flag_omit_frame_pointer == 2)
-	flag_omit_frame_pointer = (TARGET_MACHO ? 0 : 1);
+	flag_omit_frame_pointer = 1;
       if (flag_asynchronous_unwind_tables == 2)
 	flag_asynchronous_unwind_tables = 1;
       if (flag_pcc_struct_return == 2)
@@ -3288,10 +3287,8 @@ override_options (bool main_args_p)
     {
       if (flag_zee == 2)
         flag_zee = 0;
-      /* Mach-O doesn't support omitting the frame pointer for now.  */
       if (flag_omit_frame_pointer == 2)
-	flag_omit_frame_pointer =
-	  (TARGET_MACHO ? 0 : !(USE_IX86_FRAME_POINTER || optimize_size));
+	flag_omit_frame_pointer = !(USE_IX86_FRAME_POINTER || optimize_size);
       if (flag_asynchronous_unwind_tables == 2)
 	flag_asynchronous_unwind_tables = !USE_IX86_FRAME_POINTER;
       if (flag_pcc_struct_return == 2)
diff --git a/gcc/configure b/gcc/configure
index ad548fc8c083..c7a457a1b985 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -10716,8 +10716,9 @@ if test "${enable_frame_pointer+set}" = set; then :
 else
 
 case $target_os in
-linux*)
-  # Enable -fomit-frame-pointer by default for Linux.
+linux* | darwin[8912]*)
+  # Enable -fomit-frame-pointer by default for Linux and Darwin with
+  # DWARF2.
   enable_frame_pointer=no
   ;;
 *)
@@ -17129,7 +17130,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17132 "configure"
+#line 17133 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17235,7 +17236,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 17238 "configure"
+#line 17239 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index dd0b1984c9fb..1fcb87a2e2d1 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1584,8 +1584,9 @@ AC_ARG_ENABLE(frame-pointer,
 [  --enable-frame-pointer  enable -fno-omit-frame-pointer by default for 32bit x86], [],
 [
 case $target_os in
-linux*)
-  # Enable -fomit-frame-pointer by default for Linux.
+linux* | darwin[[8912]]*)
+  # Enable -fomit-frame-pointer by default for Linux and Darwin with
+  # DWARF2.
   enable_frame_pointer=no
   ;;
 *)