Eliminated mangled name resolution for Kotlin_start.
Made Kotlin_start private in order to not pollute the namespace of the default package.
This commit is contained in:
committed by
alexander-gorshenev
parent
0e7b13027e
commit
80e39cb7c9
@@ -15,18 +15,14 @@ ArrayHeader* setupArgs(int argc, char** argv) {
|
|||||||
return args;
|
return args;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef __linux__
|
extern "C" void Kotlin_start(ArrayHeader* );
|
||||||
extern "C" void konanStart(void*) asm("kfun:start(Array<String>)");
|
|
||||||
#else
|
|
||||||
extern "C" void konanStart(void*) asm("_kfun:start(Array<String>)");
|
|
||||||
#endif
|
|
||||||
|
|
||||||
int main(int argc, char** argv) {
|
int main(int argc, char** argv) {
|
||||||
|
|
||||||
InitMemory();
|
InitMemory();
|
||||||
|
|
||||||
ArrayHeader* args = setupArgs(argc, argv);
|
ArrayHeader* args = setupArgs(argc, argv);
|
||||||
konanStart(args);
|
Kotlin_start(args);
|
||||||
|
|
||||||
// Yes, we have to follow Java convention and return zero.
|
// Yes, we have to follow Java convention and return zero.
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
|
import konan.internal.ExportForCppRuntime
|
||||||
|
|
||||||
external fun main(args: Array<String>)
|
external fun main(args: Array<String>)
|
||||||
|
|
||||||
fun start(args: Array<String>) {
|
@ExportForCppRuntime
|
||||||
|
private fun Kotlin_start(args: Array<String>) {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
// This is kotlin program main entry point
|
// This is kotlin program main entry point
|
||||||
|
|||||||
Reference in New Issue
Block a user