Remove -shims. Warning for -linkerOpts for native flavor (#2730)

Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/CommandLine.kt

@@ -63,7 +63,6 @@ fun getCInteropArguments(): List<OptionDescriptor> {
                     "additional compiler options", isMultiple = true, delimiter = " "),
             OptionDescriptor(ArgType.String(), "linkerOpts", "lopt",
                     "additional linker options", isMultiple = true, delimiter = " "),
-            OptionDescriptor(ArgType.Boolean(), "shims", description = "wrap bindings by a tracing layer", defaultValue = "false"),
             OptionDescriptor(ArgType.String(), "linker", description = "use specified linker")
     )
     return (options + getCommonInteropArguments())

Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/StubGenerator.kt

@@ -30,7 +30,6 @@ class StubGenerator(
         val nativeIndex: NativeIndex,
         val configuration: InteropConfiguration,
         val libName: String,
-        val dumpShims: Boolean,
         val verbose: Boolean = false,
         val platform: KotlinPlatform = KotlinPlatform.JVM,
         val imports: Imports

Interop/StubGenerator/src/main/kotlin/org/jetbrains/kotlin/native/interop/gen/jvm/main.kt

@@ -177,8 +177,11 @@ private fun processCLib(args: Array<String>, additionalArgs: Map<String, Any> =
 
     val def = DefFile(defFile, tool.substitutions)
 
+    if (flavorName == "native" && argParser.getOrigin("linkerOpts") == ArgParser.ValueOrigin.SET_BY_USER) {
+        warn("-linkerOpts/-lopt option is not supported by cinterop. Please add linker options to .def file or binary compilation instead.")
+    }
+
     val additionalLinkerOpts = argParser.getValuesAsArray("linkerOpts")
-    val generateShims = argParser.get<Boolean>("shims")!!
     val verbose = argParser.get<Boolean>("verbose")!!
 
     val language = selectNativeLanguage(def.config)
@@ -228,7 +231,7 @@ private fun processCLib(args: Array<String>, additionalArgs: Map<String, Any> =
 
     val nativeIndex = buildNativeIndex(library, verbose)
 
-    val gen = StubGenerator(nativeIndex, configuration, libName, generateShims, verbose, flavor, imports)
+    val gen = StubGenerator(nativeIndex, configuration, libName, verbose, flavor, imports)
 
     outKtFile.parentFile.mkdirs()