diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-15 13:18:49 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-21 10:37:41 +0200 |
| commit | 3c2115cd5956d3e60e1e053a319b528ff0238eae (patch) | |
| tree | 1dbfdb0fc7d258f07a493b3d00645f644e4ca138 | |
| parent | 7778f881ff7dc92fca44dd414b02e7345f8db930 (diff) | |
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 <jocelyn.turcotte@digia.com>
| -rw-r--r-- | Source/JavaScriptCore/jit/JITStubs.h | 6 |
1 files 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<ReturnAddressPtr*>(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 |