Changeset 63947 in webkit


Ignore:
Timestamp:
Jul 22, 2010 8:28:34 PM (14 years ago)
Author:
barraclough@apple.com
Message:

Bug 42818 - [Qt] REGRESSION(63348): jsc is broken
Speculative fix, need fastcall conventions on Qt/Win.

Reviewed by Oliver Hunt.

  • jit/JITStubs.cpp:
  • jit/JITStubs.h:
Location:
trunk/JavaScriptCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/JavaScriptCore/ChangeLog

    r63946 r63947  
     12010-07-22  Gavin Barraclough  <barraclough@apple.com>
     2
     3        Reviewed by Oliver Hunt.
     4
     5        Bug 42818 - [Qt] REGRESSION(63348): jsc is broken
     6        Speculative fix, need fastcall conventions on Qt/Win.
     7
     8        * jit/JITStubs.cpp:
     9        * jit/JITStubs.h:
     10
    1112010-07-22  Oliver Hunt  <oliver@apple.com>
    212
  • trunk/JavaScriptCore/jit/JITStubs.cpp

    r63404 r63947  
    8080#if OS(LINUX) && CPU(X86_64)
    8181#define SYMBOL_STRING_RELOCATION(name) #name "@plt"
     82#elif OS(DARWIN)
     83#define SYMBOL_STRING_RELOCATION(name) "_" #name
    8284#else
    83 #define SYMBOL_STRING_RELOCATION(name) SYMBOL_STRING(name)
     85#define SYMBOL_STRING_RELOCATION(name) #name
    8486#endif
    8587
  • trunk/JavaScriptCore/jit/JITStubs.h

    r63378 r63947  
    229229#define STUB_ARGS (args)
    230230
    231 #if CPU(X86) && COMPILER(MSVC)
    232 #define JIT_STUB __fastcall
    233 #elif CPU(X86) && COMPILER(GCC) && !OS(WINDOWS)
    234 #define JIT_STUB  __attribute__ ((fastcall))
    235 #else
    236 #define JIT_STUB
     231#if CPU(X86)
     232    #if COMPILER(MSVC)
     233    #define JIT_STUB __fastcall
     234    #elif COMPILER(GCC)
     235    #define JIT_STUB  __attribute__ ((fastcall))
     236    #else
     237    #error "JIT_STUB function calls require fastcall conventions on x86, add appropriate directive/attribute here for your compiler!"
     238    #endif
    237239#endif
    238240
Note: See TracChangeset for help on using the changeset viewer.