From 3c2115cd5956d3e60e1e053a319b528ff0238eae Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 15 Oct 2014 13:18:49 +0200 Subject: Pop pack pragma on x86 QNX A recent patch fixing QNX on x86 forgot to also pop the pragma it set. Change-Id: I9834c0b57a4409e8e80c29899e6f3989607fe22f Reviewed-by: Jocelyn Turcotte --- Source/JavaScriptCore/jit/JITStubs.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/JavaScriptCore/jit/JITStubs.h b/Source/JavaScriptCore/jit/JITStubs.h index 2659d6899..ad7ecc851 100644 --- a/Source/JavaScriptCore/jit/JITStubs.h +++ b/Source/JavaScriptCore/jit/JITStubs.h @@ -143,7 +143,7 @@ struct JITStackFrame { #if COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) #pragma pack(push) #pragma pack(4) -#endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) +#endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) struct JITStackFrame { void* reserved; // Unused JITStubArg args[6]; @@ -167,9 +167,9 @@ struct JITStackFrame { // When JIT code makes a call, it pushes its return address just below the rest of the stack. ReturnAddressPtr* returnAddressSlot() { return reinterpret_cast(this) - 1; } }; -#if COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) +#if COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) #pragma pack(pop) -#endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) +#endif // COMPILER(MSVC) || (OS(WINDOWS) && COMPILER(GCC)) || OS(QNX) #elif CPU(ARM_THUMB2) struct JITStackFrame { JITStubArg reserved; // Unused -- cgit v1.2.3