Merge "Remove a spurious FIXME and unnecessary type cast."
This commit is contained in:
@@ -101,10 +101,7 @@ static _Unwind_Reason_Code trace_function(__unwind_context* context, void* arg)
|
|||||||
if (ip != 0) {
|
if (ip != 0) {
|
||||||
short* ptr = reinterpret_cast<short*>(ip);
|
short* ptr = reinterpret_cast<short*>(ip);
|
||||||
// Thumb BLX(2)
|
// Thumb BLX(2)
|
||||||
|
if ((*(ptr-1) & 0xff80) == 0x4780) {
|
||||||
// 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) {
|
|
||||||
ip -= 2;
|
ip -= 2;
|
||||||
} else {
|
} else {
|
||||||
ip -= 4;
|
ip -= 4;
|
||||||
|
Reference in New Issue
Block a user