From cfb41b674f7cb94b367b2303ef1e0a7d55cab3e0 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Fri, 27 Aug 2010 09:00:54 -0700
Subject: [PATCH] Backed out changeset a6c18a123fbb due to
 everything-on-mac-bustage. a=backout

---
 configure.in                                  | 2 +-
 js/src/configure.in                           | 2 +-
 xpcom/reflect/xptcall/src/md/unix/Makefile.in | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/configure.in b/configure.in
index 98e7c2ffc59b..87c1e9cb558b 100644
--- a/configure.in
+++ b/configure.in
@@ -2034,7 +2034,7 @@ case "$target" in
 *-darwin*) 
     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-    MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
+    MOZ_OPTIMIZE_FLAGS="-O3"
     _PEDANTIC=
     CFLAGS="$CFLAGS -fpascal-strings -fno-common"
     CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
diff --git a/js/src/configure.in b/js/src/configure.in
index 417a20b3eda4..43f66c0d3186 100644
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -1727,7 +1727,7 @@ case "$target" in
 *-darwin*) 
     MKSHLIB='$(CXX) $(CXXFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
     MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
-    MOZ_OPTIMIZE_FLAGS="-O3 -fomit-frame-pointer"
+    MOZ_OPTIMIZE_FLAGS="-O3"
     _PEDANTIC=
     CFLAGS="$CFLAGS -fpascal-strings -fno-common"
     CXXFLAGS="$CXXFLAGS -fpascal-strings -fno-common"
diff --git a/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
index 66d9b7d78dfb..d024a154e372 100644
--- a/xpcom/reflect/xptcall/src/md/unix/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/unix/Makefile.in
@@ -80,9 +80,6 @@ CPPSRCS		:= xptcinvoke_x86_64_unix.cpp xptcstubs_x86_64_darwin.cpp
 else
 DEFINES		+= -DKEEP_STACK_16_BYTE_ALIGNED
 CPPSRCS		:= xptcinvoke_unixish_x86.cpp xptcstubs_unixish_x86.cpp
-# If we compile xptcinvoke_unixish_x86.cpp with -fomit-frame-pointer
-# we end up crashing on startup, presumably because of the %esp munging we do when KEEP_STACK_16_BYTE_ALIGNED.  So let's not use that flag here.
-MODULE_OPTIMIZE_FLAGS=-03
 endif
 endif
 endif