diff --git a/CMakeLists.txt b/CMakeLists.txt index 185f2c3069..2fdc198b7f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -386,11 +386,11 @@ append("-DLDC_WITH_PGO" LDC_CXXFLAGS) # Enable Runtime compilation if supported for this platform and LLVM version. # LLVM >= 3.9 is required # -set(LDC_RUNTIME_COMPILE False) # must be a valid Python boolean constant (case sensitive) +set(LDC_DYNAMIC_COMPILE False) # must be a valid Python boolean constant (case sensitive) if (NOT (LDC_LLVM_VER LESS 400)) message(STATUS "Building LDC with runtime compilation support") - add_definitions(-DLDC_RUNTIME_COMPILE) - set(LDC_RUNTIME_COMPILE True) + add_definitions(-DLDC_DYNAMIC_COMPILE) + set(LDC_DYNAMIC_COMPILE True) endif() # diff --git a/driver/cl_options.cpp b/driver/cl_options.cpp index 33af00deb3..c10f5ea83a 100644 --- a/driver/cl_options.cpp +++ b/driver/cl_options.cpp @@ -456,7 +456,7 @@ cl::opt cl::value_desc("prefix")); #endif -#if defined(LDC_RUNTIME_COMPILE) +#if defined(LDC_DYNAMIC_COMPILE) cl::opt enableDynamicCompile( "enable-dynamic-compile", cl::desc("Enable dynamic compilation"), diff --git a/driver/cl_options.h b/driver/cl_options.h index 0d18feee28..d72a302b03 100644 --- a/driver/cl_options.h +++ b/driver/cl_options.h @@ -122,7 +122,7 @@ extern cl::list dcomputeTargets; extern cl::opt dcomputeFilePrefix; #endif -#if defined(LDC_RUNTIME_COMPILE) +#if defined(LDC_DYNAMIC_COMPILE) extern cl::opt enableDynamicCompile; extern cl::opt dynamicCompileTlsWorkaround; #else diff --git a/gen/runtimecompile.cpp b/gen/runtimecompile.cpp index b803e94448..a64537102d 100644 --- a/gen/runtimecompile.cpp +++ b/gen/runtimecompile.cpp @@ -9,7 +9,7 @@ #include "gen/runtimecompile.h" -#if defined(LDC_RUNTIME_COMPILE) +#if defined(LDC_DYNAMIC_COMPILE) #include #include @@ -805,7 +805,7 @@ void addRuntimeCompiledVar(IRState *irs, IrGlobal *var) { irs->dynamicCompiledVars.insert(var); } -#else // defined(LDC_RUNTIME_COMPILE) +#else // defined(LDC_DYNAMIC_COMPILE) void generateBitcodeForRuntimeCompile(IRState *) { // nothing diff --git a/runtime/jit-rt/DefineBuildJitRT.cmake b/runtime/jit-rt/DefineBuildJitRT.cmake index c5e82891da..1d506c3c0b 100644 --- a/runtime/jit-rt/DefineBuildJitRT.cmake +++ b/runtime/jit-rt/DefineBuildJitRT.cmake @@ -1,4 +1,4 @@ -if(LDC_RUNTIME_COMPILE) +if(LDC_DYNAMIC_COMPILE) file(GLOB LDC_JITRT_D ${JITRT_DIR}/d/ldc/*.d) # Choose the correct subfolder depending on the LLVM version diff --git a/tests/lit.site.cfg.in b/tests/lit.site.cfg.in index 37e5153a32..494135f687 100644 --- a/tests/lit.site.cfg.in +++ b/tests/lit.site.cfg.in @@ -21,7 +21,7 @@ config.llvm_version = @LDC_LLVM_VER@ config.llvm_targetsstr = "@LLVM_TARGETS_TO_BUILD@" config.default_target_bits = @DEFAULT_TARGET_BITS@ config.with_PGO = @LDC_WITH_PGO@ -config.runtime_compile = @LDC_RUNTIME_COMPILE@ +config.dynamic_compile = @LDC_DYNAMIC_COMPILE@ config.name = 'LDC' @@ -48,7 +48,7 @@ if not config.with_PGO: config.excludes.append('PGO') # Exclude runtime compilation tests when it's disabled -if not config.runtime_compile: +if not config.dynamic_compile: config.excludes.append('dynamiccompile') # Explicit forwarding of environment variables