azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Linux] Fix linker arguments order

Browse Source
This commit is contained in:
Sergey Bogolepov
2020-12-18 16:21:20 +07:00
committed by Stanislav Erokhin
parent 62e7b67170
commit 5eae55be80
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kotlin-native/shared/src/main/kotlin/org/jetbrains/kotlin/konan/target/Linker.kt
+3 -3
View File
@@ -363,6 +363,9 @@ class GccBasedLinker(targetProperties: GccConfigurables)
if (!debug) +linkerNoDebugFlags if (!debug) +linkerNoDebugFlags
if (dynamic) +linkerDynamicFlags if (dynamic) +linkerDynamicFlags
+objectFiles +objectFiles
+libraries
+linkerArgs
if (mimallocEnabled) +mimallocLinkerDependencies
// See explanation about `-u__llvm_profile_runtime` here: // See explanation about `-u__llvm_profile_runtime` here:
// https://github.com/llvm/llvm-project/blob/21e270a479a24738d641e641115bce6af6ed360a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp#L930 // https://github.com/llvm/llvm-project/blob/21e270a479a24738d641e641115bce6af6ed360a/llvm/lib/Transforms/Instrumentation/InstrProfiling.cpp#L930
if (needsProfileLibrary) +listOf("-u__llvm_profile_runtime", profileLibrary!!) if (needsProfileLibrary) +listOf("-u__llvm_profile_runtime", profileLibrary!!)
@@ -370,9 +373,6 @@ class GccBasedLinker(targetProperties: GccConfigurables)
+linkerGccFlags +linkerGccFlags
+if (dynamic) "$libGcc/crtendS.o" else "$libGcc/crtend.o" +if (dynamic) "$libGcc/crtendS.o" else "$libGcc/crtend.o"
+"$crtPrefix/crtn.o" +"$crtPrefix/crtn.o"
+libraries
+linkerArgs
if (mimallocEnabled) +mimallocLinkerDependencies
}) })
} }
} }