From: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Date: Mon, 15 Apr 2013 14:42:49 +0000 (+0200)
Subject: iOS: Don't generate exception tables
X-Git-Tag: upstream/5.2.1~669^2~646
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09df0ebc03fc613110c25f21ff984c206d532299;p=platform%2Fupstream%2Fqtdeclarative.git

iOS: Don't generate exception tables

The platform uses setjmp/longjmp.

Change-Id: I1a272ee35d02506e6e2ccde7c6b779061ba06e5b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
---

diff --git a/src/qml/qml/v4vm/qv4isel_masm.cpp b/src/qml/qml/v4vm/qv4isel_masm.cpp
index 027e2c5..fd14b72 100644
--- a/src/qml/qml/v4vm/qv4isel_masm.cpp
+++ b/src/qml/qml/v4vm/qv4isel_masm.cpp
@@ -426,7 +426,7 @@ static void printDisassembledOutputWithCalls(const char* output, const QHash<voi
 void Assembler::link(VM::Function *vmFunc)
 {
     Label endOfCode = label();
-#ifdef Q_PROCESSOR_ARM
+#if defined(Q_PROCESSOR_ARM) && !defined(Q_OS_IOS)
     // Let the ARM exception table follow right after that
     for (int i = 0, nops = UnwindHelper::unwindInfoSize() / 2; i < nops; ++i)
         nop();
@@ -469,7 +469,7 @@ void Assembler::link(VM::Function *vmFunc)
         }
     }
 
-#ifdef Q_PROCESSOR_ARM
+#if defined(Q_PROCESSOR_ARM) && !defined(Q_OS_IOS)
     UnwindHelper::writeARMUnwindInfo(linkBuffer.debugAddress(), linkBuffer.offsetOf(endOfCode));
 #endif