From be8158f64cd817bf53b5a8a80f5caea36c88b91a Mon Sep 17 00:00:00 2001
From: Xidorn Quan <quanxunzhen@gmail.com>
Date: Tue, 22 Dec 2015 20:24:33 +1100
Subject: [PATCH] Bug 1233666 - Remove hacks for getting frame pointer for
 x86/x64 gcc. r=glandium

--HG--
extra : rebase_source : 9cc0a57f1e4ea1adcfff042d66989b211f350474
extra : source : 2043802666545a9b15c1139ec4b06bddc4432117
---
 mozglue/misc/StackWalk.cpp | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/mozglue/misc/StackWalk.cpp b/mozglue/misc/StackWalk.cpp
index bdca7d3882a7..2f6073454229 100644
--- a/mozglue/misc/StackWalk.cpp
+++ b/mozglue/misc/StackWalk.cpp
@@ -896,15 +896,7 @@ MozStackWalk(MozWalkStackCallback aCallback, uint32_t aSkipFrames,
   StackWalkInitCriticalAddress();
 
   // Get the frame pointer
-  void** bp;
-#if defined(__i386)
-  __asm__("movl %%ebp, %0" : "=g"(bp));
-#else
-  // It would be nice if this worked uniformly, but at least on i386 and
-  // x86_64, it stopped working with gcc 4.1, because it points to the
-  // end of the saved registers instead of the start.
-  bp = (void**)__builtin_frame_address(0);
-#endif
+  void** bp = (void**)__builtin_frame_address(0);
 
   void* stackEnd;
 #if HAVE___LIBC_STACK_END