From 67889cb31c5c4b160c57cebf52199842ee481a73 Mon Sep 17 00:00:00 2001
From: Alexander Gorshenev <alexander.gorshenev@jetbrains.com>
Date: Tue, 8 Nov 2016 13:22:24 +0300
Subject: [PATCH] Further relocation from 'native' to 'kotlin' Moved the left
 behind files and renamed the package.

---
 backend.native/build.gradle                               | 2 +-
 .../cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt    | 2 +-
 .../org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt | 4 ++--
 .../src/org/jetbrains/kotlin/backend/konan/ModuleIndex.kt | 4 ++--
 .../jetbrains/kotlin/backend/konan/NativeBackendFacade.kt | 2 +-
 .../kotlin/backend/konan/NativeIrCodegenFactory.kt        | 2 +-
 .../jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt  | 2 +-
 .../org/jetbrains/kotlin/backend/konan/llvm/Context.kt    | 6 +++---
 .../jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt   | 6 +++---
 .../org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt | 4 ++--
 .../org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt  | 6 +++---
 .../jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt    | 4 ++--
 .../org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt  | 4 ++--
 .../src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt | 6 +++---
 .../kotlin/backend/konan/llvm/MetadataGenerator.kt        | 2 +-
 .../org/jetbrains/kotlin/backend/konan/llvm/NameUtils.kt  | 4 ++--
 .../jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt  | 8 ++++----
 .../org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt    | 2 +-
 .../kotlin/backend/{native => konan}/llvm/StaticData.kt   | 4 ++--
 .../backend/{native => konan}/llvm/StaticDataUtils.kt     | 4 ++--
 .../backend/{native => konan}/llvm/StaticObjects.kt       | 4 ++--
 21 files changed, 41 insertions(+), 41 deletions(-)
 rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/StaticData.kt (98%)
 rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/StaticDataUtils.kt (94%)
 rename backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/{native => konan}/llvm/StaticObjects.kt (97%)

diff --git a/backend.native/build.gradle b/backend.native/build.gradle
index 53da5b416c9..fd23c8cc14a 100644
--- a/backend.native/build.gradle
+++ b/backend.native/build.gradle
@@ -126,7 +126,7 @@ kotlinNativeInterop {
        include '**/*.hpp'
      }
 
-     pkg 'org.jetbrains.kotlin.backend.native.hash'
+     pkg 'org.jetbrains.kotlin.backend.konan.hash'
    }
 }
 
diff --git a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
index 7fc0b1a8df6..249b9897e1a 100644
--- a/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
+++ b/backend.native/cli.bc/src/org/jetbrains/kotlin/cli/bc/K2Native.kt
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.cli.bc
 
 import com.intellij.openapi.Disposable
 import org.jetbrains.kotlin.analyzer.AnalysisResult
-import org.jetbrains.kotlin.backend.native.llvm.emitLLVM
+import org.jetbrains.kotlin.backend.konan.llvm.emitLLVM
 import org.jetbrains.kotlin.cli.common.CLICompiler
 import org.jetbrains.kotlin.cli.common.CLIConfigurationKeys
 import org.jetbrains.kotlin.cli.common.ExitCode
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt
index 21579da3470..6fd84d6cc9b 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/DescriptorUtils.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native
+package org.jetbrains.kotlin.backend.konan
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind
@@ -46,4 +46,4 @@ internal val ClassDescriptor.isIntrinsic: Boolean
     get() = this.fqNameSafe.asString() in intrinsicTypes
 
 internal val ClassDescriptor.isInterface: Boolean
-    get() = (this.kind == ClassKind.INTERFACE)
\ No newline at end of file
+    get() = (this.kind == ClassKind.INTERFACE)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ModuleIndex.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ModuleIndex.kt
index 687986d76a4..b03dd36da08 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ModuleIndex.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/ModuleIndex.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native
+package org.jetbrains.kotlin.backend.konan
 
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.declarations.IrClass
@@ -37,4 +37,4 @@ class ModuleIndex(val module: IrModuleFragment) {
 
         classes = map
     }
-}
\ No newline at end of file
+}
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeBackendFacade.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeBackendFacade.kt
index 85c5bfe2fcf..af4e63a57fb 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeBackendFacade.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeBackendFacade.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native
+package org.jetbrains.kotlin.backend.konan
 
 import org.jetbrains.kotlin.codegen.CompilationErrorHandler
 import org.jetbrains.kotlin.codegen.state.GenerationState
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt
index fa74199f1c3..6dd58675e55 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/NativeIrCodegenFactory.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native
+package org.jetbrains.kotlin.backend.konan
 
 import org.jetbrains.kotlin.codegen.*
 import org.jetbrains.kotlin.codegen.context.PackageContext
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
index 8adcef9f743..87974258359 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/CodeGenerator.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 
 import kotlin_native.interop.*
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt
index 160daba0070..77c11a760d8 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Context.kt
@@ -1,7 +1,7 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import llvm.*
-import org.jetbrains.kotlin.backend.native.ModuleIndex
+import org.jetbrains.kotlin.backend.konan.ModuleIndex
 import org.jetbrains.kotlin.ir.declarations.IrModuleFragment
 
 internal class Context(val irModule: IrModuleFragment, val runtime: Runtime, val llvmModule: LLVMOpaqueModule) {
@@ -29,4 +29,4 @@ internal class Context(val irModule: IrModuleFragment, val runtime: Runtime, val
     fun dispose() {
         LLVMDisposeBuilder(llvmBuilder)
     }
-}
\ No newline at end of file
+}
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt
index 9ad3c3c7d98..a06582f1ddb 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/ContextUtils.kt
@@ -1,8 +1,8 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import kotlin_native.interop.*
 import llvm.*
-import org.jetbrains.kotlin.backend.native.hash.GlobalHash
+import org.jetbrains.kotlin.backend.konan.hash.GlobalHash
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.FunctionDescriptor
 import org.jetbrains.kotlin.descriptors.PropertyDescriptor
@@ -153,4 +153,4 @@ internal interface ContextUtils {
 
     val pointerSize: Int
         get() = LLVMPointerSize(llvmTargetData)
-}
\ No newline at end of file
+}
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt
index 3b6ee74d7d0..57fd099fbb6 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/DataLayout.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import llvm.*
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
@@ -17,4 +17,4 @@ internal fun getLLVMType(type: KotlinType): LLVMOpaqueType {
         !KotlinBuiltIns.isPrimitiveType(type) -> LLVMPointerType(LLVMInt8Type(), 0)
         else -> throw NotImplementedError(type.toString() + " is not supported")
     }!!
-}
\ No newline at end of file
+}
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt
index fe8ef689589..f446edf9284 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/HashUtils.kt
@@ -1,7 +1,7 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import kotlin_native.interop.*
-import org.jetbrains.kotlin.backend.native.hash.*
+import org.jetbrains.kotlin.backend.konan.hash.*
 
 internal fun localHash(data: ByteArray): Long {
     memScoped {
@@ -21,4 +21,4 @@ internal fun globalHash(data: ByteArray, retValPlacement: Placement): GlobalHash
     return res
 }
 
-internal class LocalHash(val value: Long) : ConstValue by Int64(value)
\ No newline at end of file
+internal class LocalHash(val value: Long) : ConstValue by Int64(value)
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
index bfdc4e808d2..be9720c2a3b 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/IrToBitcode.kt
@@ -1,8 +1,8 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import kotlin_native.interop.*
 import llvm.*
-import org.jetbrains.kotlin.backend.native.isIntrinsic
+import org.jetbrains.kotlin.backend.konan.isIntrinsic
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.descriptors.impl.LazyClassReceiverParameterDescriptor
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt
index 67315391e2a..f754974c101 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/LlvmUtils.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import kotlin_native.interop.*
 import llvm.*
@@ -129,4 +129,4 @@ internal fun NativeArray<Int8Box>.getBytes(size: Int) =
 internal fun getFunctionType(ptrToFunction: LLVMOpaqueValue?): LLVMOpaqueType {
     val typeOfPtrToFunction = LLVMTypeOf(ptrToFunction)
     return LLVMGetElementType(typeOfPtrToFunction)!!
-}
\ No newline at end of file
+}
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt
index 7cd8c664aaa..ec8bdfe5770 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Logger.kt
@@ -1,11 +1,11 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import kotlin_native.interop.asCString
 import llvm.LLVMPrintModuleToString
 import llvm.LLVMPrintValueToString
 import llvm.LLVMOpaqueValue
-import org.jetbrains.kotlin.backend.native.llvm.Context
-import org.jetbrains.kotlin.backend.native.llvm.ContextUtils
+import org.jetbrains.kotlin.backend.konan.llvm.Context
+import org.jetbrains.kotlin.backend.konan.llvm.ContextUtils
 import org.jetbrains.kotlin.ir.IrElement
 import org.jetbrains.kotlin.ir.util.DumpIrTreeVisitor
 import java.io.StringWriter
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt
index bd3c306f2af..1b13f624467 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/MetadataGenerator.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 
 import kotlin_native.interop.*
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/NameUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/NameUtils.kt
index 2ea425d69c7..739a660e639 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/NameUtils.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/NameUtils.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.ClassKind.*
@@ -31,4 +31,4 @@ internal val ClassDescriptor.symbolName: String
     } + fqNameSafe
 
 internal val ClassDescriptor.typeInfoSymbolName: String
-    get() = "ktype:" + this.fqNameSafe.toString()
\ No newline at end of file
+    get() = "ktype:" + this.fqNameSafe.toString()
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt
index 132768ffe30..664bd5bae99 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/RTTIGenerator.kt
@@ -1,12 +1,12 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 
 import kotlin_native.interop.allocNativeArrayOf
 import kotlin_native.interop.memScoped
 import llvm.*
-import org.jetbrains.kotlin.backend.native.implementation
-import org.jetbrains.kotlin.backend.native.implementedInterfaces
-import org.jetbrains.kotlin.backend.native.isInterface
+import org.jetbrains.kotlin.backend.konan.implementation
+import org.jetbrains.kotlin.backend.konan.implementedInterfaces
+import org.jetbrains.kotlin.backend.konan.isInterface
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
 import org.jetbrains.kotlin.descriptors.*
 import org.jetbrains.kotlin.name.FqName
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt
index 6dca4a9abcf..ff6916fdbb6 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/Runtime.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import kotlin_native.interop.*
 import llvm.*
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticData.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticData.kt
similarity index 98%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticData.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticData.kt
index 78e54b8e3f8..811b10ff189 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticData.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticData.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import llvm.*
 
@@ -108,4 +108,4 @@ internal class StaticData(override val context: Context): ContextUtils {
 
         return global
     }
-}
\ No newline at end of file
+}
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticDataUtils.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticDataUtils.kt
similarity index 94%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticDataUtils.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticDataUtils.kt
index 96d97f0d1f2..bdf581f12ac 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticDataUtils.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticDataUtils.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import llvm.*
 
@@ -24,4 +24,4 @@ internal fun StaticData.placeGlobalConstArray(name: String,
 internal fun StaticData.createAlias(name: String, aliasee: ConstPointer): ConstPointer {
     val alias = LLVMAddAlias(context.llvmModule, aliasee.getLlvmType(), aliasee.getLlvmValue(), name)!!
     return constPointer(alias)
-}
\ No newline at end of file
+}
diff --git a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticObjects.kt b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticObjects.kt
similarity index 97%
rename from backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticObjects.kt
rename to backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticObjects.kt
index b98fcf311f1..504f581e752 100644
--- a/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/native/llvm/StaticObjects.kt
+++ b/backend.native/compiler/ir/backend.native/src/org/jetbrains/kotlin/backend/konan/llvm/StaticObjects.kt
@@ -1,4 +1,4 @@
-package org.jetbrains.kotlin.backend.native.llvm
+package org.jetbrains.kotlin.backend.konan.llvm
 
 import llvm.*
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
@@ -53,4 +53,4 @@ internal fun StaticData.createStringLiteral(value: IrConst<String>): ConstPointe
     LLVMSetLinkage(res.getLlvmValue(), LLVMLinkage.LLVMWeakAnyLinkage)
 
     return res
-}
\ No newline at end of file
+}