diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:49:06 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-27 12:49:06 +0100 |
| commit | d75f99832922079640818fae49a92bb0cf45dfb8 (patch) | |
| tree | 7368ae8bbb9b597f4d68250ed123a07eca5eaa5b /Source/JavaScriptCore/jit/JITStubs.h | |
| parent | 39226f9b4a387fcc74c55eeea9cd99ffa11247e3 (diff) | |
| parent | 400872d024cee95d1cfc1253d009c0c6777ea5a3 (diff) | |
| download | qtwebkit-d75f99832922079640818fae49a92bb0cf45dfb8.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: Ia01d6aa4899b183f41084ffcb245ef0184c0d826
Diffstat (limited to 'Source/JavaScriptCore/jit/JITStubs.h')
| -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 |