Changeset 178248 in webkit


Ignore:
Timestamp:
Jan 11, 2015, 2:39:49 PM (11 years ago)
Author:
mark.lam@apple.com
Message:

Update WebKit branch to build with newer LLVM.
<https://webkit.org/b/140341>

Reviewed by Filip Pizlo.

  • Configurations/LLVMForJSC.xcconfig:
  • Add the ability to pick up LLVM_LIBS_iphoneos from AspenLLVM.xcconfig.
  • llvm/LLVMAPIFunctions.h:
  • Removed some erroneous and unused APIs.
  • llvm/library/LLVMExports.cpp:

(initializeAndGetJSCLLVMAPI):

  • Removed an unneeded option that is also not supported by the new LLVM.
Location:
branches/safari-600.1.4.15-branch/Source/JavaScriptCore
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/safari-600.1.4.15-branch/Source/JavaScriptCore/ChangeLog

    r177072 r178248  
     12015-01-11  Mark Lam  <mark.lam@apple.com>
     2
     3        Update WebKit branch to build with newer LLVM.
     4        <https://webkit.org/b/140341>
     5
     6        Reviewed by Filip Pizlo.
     7
     8        * Configurations/LLVMForJSC.xcconfig:
     9        - Add the ability to pick up LLVM_LIBS_iphoneos from AspenLLVM.xcconfig.
     10        * llvm/LLVMAPIFunctions.h:
     11        - Removed some erroneous and unused APIs.
     12        * llvm/library/LLVMExports.cpp:
     13        (initializeAndGetJSCLLVMAPI):
     14        - Removed an unneeded option that is also not supported by the new LLVM.
     15
    1162014-12-10  Babak Shafiei  <bshafiei@apple.com>
    217
  • branches/safari-600.1.4.15-branch/Source/JavaScriptCore/Configurations/LLVMForJSC.xcconfig

    r169605 r178248  
    2828OTHER_LDFLAGS_HIDE_SYMBOLS = -Wl,-exported_symbol -Wl,_initializeAndGetJSCLLVMAPI -Wl,-all_load;
    2929
    30 LLVM_LIBS_iphoneos = -lLLVMLinker -lLLVMipo -lLLVMVectorize -lLLVMBitWriter -lLLVMTableGen -lLLVMInstrumentation -lLLVMIRReader -lLLVMBitReader -lLLVMAsmParser -lLLVMARM64Disassembler -lLLVMARM64CodeGen -lLLVMARM64AsmParser -lLLVMARM64Desc -lLLVMARM64Info -lLLVMARM64AsmPrinter -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMDebugInfo -lLLVMOption -lLLVMInterpreter -lLLVMJIT -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMMCDisassembler -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport -lprotobuf;
     30LLVM_LIBS_ios = -lLLVMLinker -lLLVMipo -lLLVMVectorize -lLLVMBitWriter -lLLVMTableGen -lLLVMInstrumentation -lLLVMIRReader -lLLVMBitReader -lLLVMAsmParser -lLLVMARM64Disassembler -lLLVMARM64CodeGen -lLLVMARM64AsmParser -lLLVMARM64Desc -lLLVMARM64Info -lLLVMARM64AsmPrinter -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMMCParser -lLLVMDebugInfo -lLLVMOption -lLLVMInterpreter -lLLVMJIT -lLLVMCodeGen -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMMCDisassembler -lLLVMMCJIT -lLLVMTarget -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport -lprotobuf
     31
     32#include "<DEVELOPER_DIR>/AppleInternal/XcodeConfig/AspenLLVM.xcconfig"
     33
     34// In general, we prefer to not append libraries this way because it may interfere with the required
     35// ordering of library linkage (as determined by their dependencies on other libraries).  In this
     36// case, we'll make this a one time exception to work around the fact that there are pre-existing
     37// versions of AspenLLVM.xcconfig that overrides LLVM_LIBS_ios but is missing -lLLVMMCDisassembler.
     38LLVM_LIBS_iphoneos = $(LLVM_LIBS_ios) -lLLVMMCDisassembler
     39
    3140LLVM_LIBS_macosx = -lLLVMTableGen -lLLVMDebugInfo -lLLVMOption -lLLVMX86Disassembler -lLLVMX86AsmParser -lLLVMX86CodeGen -lLLVMSelectionDAG -lLLVMAsmPrinter -lLLVMX86Desc -lLLVMX86Info -lLLVMX86AsmPrinter -lLLVMX86Utils -lLLVMIRReader -lLLVMAsmParser -lLLVMMCDisassembler -lLLVMMCParser -lLLVMInstrumentation -lLLVMBitReader -lLLVMInterpreter -lLLVMipo -lLLVMVectorize -lLLVMLinker -lLLVMBitWriter -lLLVMMCJIT -lLLVMJIT -lLLVMCodeGen -lLLVMObjCARCOpts -lLLVMScalarOpts -lLLVMInstCombine -lLLVMTransformUtils -lLLVMipa -lLLVMAnalysis -lLLVMRuntimeDyld -lLLVMExecutionEngine -lLLVMTarget -lLLVMMC -lLLVMObject -lLLVMCore -lLLVMSupport;
    3241
  • branches/safari-600.1.4.15-branch/Source/JavaScriptCore/llvm/LLVMAPIFunctions.h

    r159545 r178248  
    544544    macro(LLVMTargetDataRef, GetTargetMachineData, (LLVMTargetMachineRef T)) \
    545545    macro(LLVMBool, TargetMachineEmitToFile, (LLVMTargetMachineRef T, LLVMModuleRef M, char *Filename, LLVMCodeGenFileType codegen, char **ErrorMessage)) \
    546     macro(void, LinkInJIT, (void)) \
    547546    macro(void, LinkInMCJIT, (void)) \
    548     macro(void, LinkInInterpreter, (void)) \
    549547    macro(LLVMGenericValueRef, CreateGenericValueOfInt, (LLVMTypeRef Ty, unsigned long long N, LLVMBool IsSigned)) \
    550548    macro(LLVMGenericValueRef, CreateGenericValueOfPointer, (void *P)) \
  • branches/safari-600.1.4.15-branch/Source/JavaScriptCore/llvm/library/LLVMExports.cpp

    r170020 r178248  
    9393    const char* args[] = {
    9494        "llvmForJSC.dylib",
    95         "-enable-stackmap-liveness=true",
    9695        "-enable-patchpoint-liveness=true"
    9796    };
Note: See TracChangeset for help on using the changeset viewer.