Commit 2d075bf6 authored by Tor Arne Vestbø's avatar Tor Arne Vestbø Committed by Oswald Buddenhagen
Browse files

iOS: Update integrated event dispatcher to support 64-bit x86


Needed so that we can build simulator builds for x86_64 as well as
i386. The function call alignment is the same, but we need to use
the 64-bit versions of the instruction and operands.

Change-Id: I62cc78e23b5e0923382d19570ce18f558894e6a0
Reviewed-by: default avatarSimon Hausmann <simon.hausmann@digia.com>
Showing with 7 additions and 2 deletions
......@@ -317,11 +317,16 @@ static bool rootLevelRunLoopIntegration()
}
#if defined(Q_PROCESSOR_X86)
# define SET_STACK_POINTER "mov %0, %%esp"
# define FUNCTION_CALL_ALIGNMENT 16
# if defined(Q_PROCESSOR_X86_32)
# define SET_STACK_POINTER "mov %0, %%esp"
# elif defined(Q_PROCESSOR_X86_64)
# define SET_STACK_POINTER "movq %0, %%rsp"
# endif
#elif defined(Q_PROCESSOR_ARM)
# define SET_STACK_POINTER "mov sp, %0"
# // Valid for both 32 and 64-bit ARM
# define FUNCTION_CALL_ALIGNMENT 4
# define SET_STACK_POINTER "mov sp, %0"
#else
# error "Unknown processor family"
#endif
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment