commit ff220f70036178aa0d7dcf1cbc4825085a84441e
author Ben Cheng <bccheng@google.com> Tue May 07 23:56:11 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 07 23:56:11 2013 +0000
tree a70b494e2204cefbd419b4e24f8946f54ee07201
parent b9256adab3aa7e7628d7bbd015132a511de7a43d
parent 63dd03ccedc316724c40e140067e612932e4420e

Merge "Remove a spurious FIXME and unnecessary type cast."

libc/bionic/debug_stacktrace.cpp

diff --git a/libc/bionic/debug_stacktrace.cpp b/libc/bionic/debug_stacktrace.cpp
index 5e8a401..fb933e6 100644
--- a/libc/bionic/debug_stacktrace.cpp
+++ b/libc/bionic/debug_stacktrace.cpp
@@ -101,10 +101,7 @@
   if (ip != 0) {
     short* ptr = reinterpret_cast<short*>(ip);
     // Thumb BLX(2)
-
-    // FIXME - GCC 4.7 seems to have a bug as without the unnecessary cast to
-    // short the test will never pass.
-    if ((*(ptr-1) & 0xff80) == (short) 0x4780) {
+    if ((*(ptr-1) & 0xff80) == 0x4780) {
       ip -= 2;
     } else {
       ip -= 4;