Keep changeset 7ee51f8ea940 backed out on the reverted tree
authorEhsan Akhgari <ehsan@mozilla.com>
Fri, 02 Sep 2011 09:06:23 -0400
changeset 76441 2aef89351fe679bd0d95e23c11f4dffaf2dd5055
parent 76440 7b004cd39113878645bc320686eadaf95702e3fa
child 76442 ecd918e48a759fdb7112d5b0ba3ac55c1fa85fc6
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
milestone9.0a1
Keep changeset 7ee51f8ea940 backed out on the reverted tree
toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
@@ -47,17 +47,17 @@ ifdef MOZ_THUMB2 #{
 # complains if we store to r7, not unreasonably, but complains
 # inconsistently.  The generic syscall template pushes/stores to/pops
 # r7 with no complaint from gcc, but the sys_clone() function marks r7
 # as a clobbered register yet gcc error's.  The generated assembly for
 # sys_clone() looks OK, so we chalk this up to a gcc/gas quirk and
 # work around it by telling gcc that the THUMB frame pointer is a
 # vanilla callee-save register.
 OS_CXXFLAGS += -fomit-frame-pointer
-MOZ_FRAMEPTR_FLAGS := -fomit-frame-pointer
+MOZ_OPTIMIZE_FLAGS := $(filter-out -fno-omit-frame-pointer,$(MOZ_OPTIMIZE_FLAGS))
 endif #}
 
 MODULE		= handler
 LIBRARY_NAME	= exception_handler_s
 XPI_NAME 	= crashreporter
 
 LOCAL_INCLUDES 	= -I$(srcdir)/../../..