From 7dc48b383712cc29949d4a837632b0ef1b970d17 Mon Sep 17 00:00:00 2001 From: Sergey Bogolepov Date: Thu, 24 Mar 2022 18:18:59 +0300 Subject: [PATCH] [K/N] Rename llvmCoverageMappingC to libllvmext This subproject covers much wider scope now than code coverage, so it makes sense to rename it to reflex that. --- kotlin-native/.gitignore | 2 +- kotlin-native/backend.native/build.gradle | 6 +++--- kotlin-native/backend.native/llvm.def | 2 +- kotlin-native/build.gradle | 2 +- .../{llvmCoverageMappingC => libllvmext}/build.gradle.kts | 2 +- .../src/main/cpp/CoverageMappingC.cpp | 0 .../src/main/include/CoverageMappingC.h | 0 settings.gradle | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) rename kotlin-native/{llvmCoverageMappingC => libllvmext}/build.gradle.kts (97%) rename kotlin-native/{llvmCoverageMappingC => libllvmext}/src/main/cpp/CoverageMappingC.cpp (100%) rename kotlin-native/{llvmCoverageMappingC => libllvmext}/src/main/include/CoverageMappingC.h (100%) diff --git a/kotlin-native/.gitignore b/kotlin-native/.gitignore index 6674b7d8e42..6bbb7fae7a4 100644 --- a/kotlin-native/.gitignore +++ b/kotlin-native/.gitignore @@ -57,7 +57,7 @@ backend.native/tests/teamcity-test.property samples/**/*.kt.bc-build # CMake -llvmCoverageMappingC/CMakeLists.txt +libllvmext/CMakeLists.txt tools/performance-server/node_modules tools/performance-server/server tools/performance-server/ui/js diff --git a/kotlin-native/backend.native/build.gradle b/kotlin-native/backend.native/build.gradle index 07fe73bedd2..4c782590277 100644 --- a/kotlin-native/backend.native/build.gradle +++ b/kotlin-native/backend.native/build.gradle @@ -47,9 +47,9 @@ kotlinNativeInterop { llvm { dependsOn ":kotlin-native:llvmDebugInfoC:${NativePluginKt.lib("debugInfo")}" - dependsOn ":kotlin-native:llvmCoverageMappingC:${NativePluginKt.lib("coverageMapping")}" + dependsOn ":kotlin-native:libllvmext:${NativePluginKt.lib("llvmext")}" defFile 'llvm.def' - compilerOpts "-I$llvmDir/include", "-I${rootProject.project(':kotlin-native:llvmDebugInfoC').projectDir}/src/main/include", "-I${rootProject.project(':kotlin-native:llvmCoverageMappingC').projectDir}/src/main/include" + compilerOpts "-I$llvmDir/include", "-I${rootProject.project(':kotlin-native:llvmDebugInfoC').projectDir}/src/main/include", "-I${rootProject.project(':kotlin-native:libllvmext').projectDir}/src/main/include" if (isMac()) { // $llvmDir/lib contains libc++.1.dylib too, and it seems to be preferred by the linker // over the sysroot-provided one. @@ -61,7 +61,7 @@ kotlinNativeInterop { // To enforce linking with proper libc++, pass the default path explicitly: linkerOpts "-L${platformManager.hostPlatform.absoluteTargetSysRoot}/usr/lib" } - linkerOpts "-L$llvmDir/lib", "-L${rootProject.project(':kotlin-native:llvmDebugInfoC').buildDir}", "-L${rootProject.project(':kotlin-native:llvmCoverageMappingC').buildDir}" + linkerOpts "-L$llvmDir/lib", "-L${rootProject.project(':kotlin-native:llvmDebugInfoC').buildDir}", "-L${rootProject.project(':kotlin-native:libllvmext').buildDir}" } files { diff --git a/kotlin-native/backend.native/llvm.def b/kotlin-native/backend.native/llvm.def index b167d4c64be..fa04203ec42 100644 --- a/kotlin-native/backend.native/llvm.def +++ b/kotlin-native/backend.native/llvm.def @@ -18,7 +18,7 @@ linkerOpts = -fvisibility-inlines-hidden \ -pedantic -Wno-long-long -Wcovered-switch-default -Wnon-virtual-dtor -Wdelete-non-virtual-dtor \ -std=c++17 \ -DNDEBUG -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS \ - -ldebugInfo -lcoverageMapping + -ldebugInfo -lllvmext # ./llvm-config --libs analysis bitreader bitwriter core linker target coverage analysis ipo instrumentation lto objcarcopts arm aarch64 webassembly x86 mips linkerOpts.osx = \ diff --git a/kotlin-native/build.gradle b/kotlin-native/build.gradle index 5ffd314ff8d..cc5ca5b0fed 100644 --- a/kotlin-native/build.gradle +++ b/kotlin-native/build.gradle @@ -282,7 +282,7 @@ task distCompiler(type: Copy) { into('konan/nativelib') } - from(project(':kotlin-native:llvmCoverageMappingC').file('build/libs/coverageMapping/shared')) { + from(project(':kotlin-native:libllvmext').file('build/libs/llvmext/shared')) { into('konan/nativelib') } diff --git a/kotlin-native/llvmCoverageMappingC/build.gradle.kts b/kotlin-native/libllvmext/build.gradle.kts similarity index 97% rename from kotlin-native/llvmCoverageMappingC/build.gradle.kts rename to kotlin-native/libllvmext/build.gradle.kts index e89760c8546..5edf4042e4e 100644 --- a/kotlin-native/llvmCoverageMappingC/build.gradle.kts +++ b/kotlin-native/libllvmext/build.gradle.kts @@ -57,7 +57,7 @@ native { } val objSet = sourceSets["main"]!!.transform(".cpp" to ".$obj") - target(lib("coverageMapping"), objSet) { + target(lib("llvmext"), objSet) { tool(*platformManager.hostPlatform.clangForJni.llvmAr("").toTypedArray()) flags("-qv", ruleOut(), *ruleInAll()) } diff --git a/kotlin-native/llvmCoverageMappingC/src/main/cpp/CoverageMappingC.cpp b/kotlin-native/libllvmext/src/main/cpp/CoverageMappingC.cpp similarity index 100% rename from kotlin-native/llvmCoverageMappingC/src/main/cpp/CoverageMappingC.cpp rename to kotlin-native/libllvmext/src/main/cpp/CoverageMappingC.cpp diff --git a/kotlin-native/llvmCoverageMappingC/src/main/include/CoverageMappingC.h b/kotlin-native/libllvmext/src/main/include/CoverageMappingC.h similarity index 100% rename from kotlin-native/llvmCoverageMappingC/src/main/include/CoverageMappingC.h rename to kotlin-native/libllvmext/src/main/include/CoverageMappingC.h diff --git a/settings.gradle b/settings.gradle index 94bdd469ef1..0b1b0be3363 100644 --- a/settings.gradle +++ b/settings.gradle @@ -768,7 +768,7 @@ if (buildProperties.isKotlinNativeEnabled) { include ':kotlin-native:klib' include ':kotlin-native:common' include ':kotlin-native:runtime' - include ':kotlin-native:llvmCoverageMappingC' + include ':kotlin-native:libllvmext' include ':kotlin-native:llvmDebugInfoC' include ':kotlin-native:utilities' include ':kotlin-native:platformLibs'