Ignore:
Timestamp:
Nov 11, 2017, 2:56:39 PM (20 months ago)
Author:
cameron
Message:

LLVM_VERSION_INTEGER allows ordered comparisons, initial preparation for LLVM 3.9.0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • icGREP/icgrep-devel/icgrep/toolchain/toolchain.cpp

    r5721 r5731  
    2727                        clEnumVal(ShowIR, "Print optimized LLVM IR."),
    2828                        clEnumVal(VerifyIR, "Run the IR verification pass."),
    29 #ifndef USE_LLVM_3_6
     29#if LLVM_VERSION_INTEGER >= LLVM_3_7_0
    3030                        clEnumVal(ShowASM, "Print assembly code."),
    3131#endif
     
    4040                                                       cl::desc("output IR filename"), cl::cat(CodeGenOptions));
    4141
    42 #ifndef USE_LLVM_3_6
     42#if LLVM_VERSION_INTEGER >= LLVM_3_7_0
    4343static cl::opt<std::string> ASMOutputFilenameOption("asm-output", cl::init(""),
    4444                                                    cl::desc("output ASM filename"), cl::cat(CodeGenOptions));
     
    125125const std::string MArch = ::MArch;
    126126
    127 const std::string RunPass = ::RunPass;
    128 
    129127const llvm::TargetMachine::CodeGenFileType FileType = ::FileType;
    130 
    131 const std::string StopAfter = ::StopAfter;
    132 
    133 const std::string StartAfter = ::StartAfter;
    134128
    135129TargetOptions Options;
     
    161155    AddParabixVersionPrinter();
    162156    codegen::ProgramName = argv[0];
    163     #ifndef USE_LLVM_3_6
     157#if LLVM_VERSION_INTEGER >= LLVM_3_7_0
    164158    if (hiding.size() != 0) {
    165159        cl::HideUnrelatedOptions(ArrayRef<const cl::OptionCategory *>(hiding));
    166160    }
    167     #endif
     161#endif
    168162    cl::ParseCommandLineOptions(argc, argv);
    169163    if (DebugOptions.getBits()) {
     
    174168    ASMOutputFilename = ASMOutputFilenameOption.empty() ? nullptr : ASMOutputFilenameOption.data();
    175169    Options = InitTargetOptionsFromCodeGenFlags();
    176     #ifndef USE_LLVM_3_6
     170#if LLVM_VERSION_INTEGER >= LLVM_3_7_0
    177171    Options.MCOptions.AsmVerbose = AsmVerbose;
    178     #endif
     172#endif
    179173    switch (OptLevelOption) {
    180174        case '0': OptLevel = CodeGenOpt::None; break;
Note: See TracChangeset for help on using the changeset viewer.