Merge pull request #31244 from drexin/wip-backport-static-linking

[5.2] Fix linker flags for -static-executable

Author: drexin

lib/Driver/UnixToolChains.cpp

@@ -189,8 +189,10 @@ toolchains::GenericUnix::constructInvocation(const DynamicLinkJobAction &job,
     Arguments.push_back(context.Args.MakeArgString(A->getValue()));
   }
 
-  if (getTriple().getOS() == llvm::Triple::Linux &&
-      job.getKind() == LinkKind::Executable) {
+  if (getTriple().getObjectFormat() == llvm::Triple::ELF &&
+      job.getKind() == LinkKind::Executable &&
+      !context.Args.hasFlag(options::OPT_static_executable,
+                            options::OPT_no_static_executable, false)) {
     Arguments.push_back("-pie");
   }
 

test/Driver/static-executable.swift

@@ -0,0 +1,10 @@
+// Create a self contained binary
+// REQUIRES: OS=linux-gnu
+// REQUIRES: static_stdlib
+print("hello world!")
+// RUN: %empty-directory(%t)
+// RUN: %target-swiftc_driver -static-executable -o %t/static-executable %s
+// RUN: %t/static-executable | %FileCheck %s
+// RUN: %llvm-readelf -program-headers %t/static-executable | %FileCheck %s --check-prefix=ELF
+// CHECK: hello world!
+// ELF-NOT: INTERP

test/lit.cfg

@@ -283,6 +283,7 @@ config.llvm_cov = inferSwiftBinary('llvm-cov')
 config.llvm_strings = inferSwiftBinary('llvm-strings')
 config.filecheck = inferSwiftBinary('FileCheck')
 config.llvm_dwarfdump = inferSwiftBinary('llvm-dwarfdump')
+config.llvm_readelf = inferSwiftBinary('llvm-readelf')
 config.llvm_dis = inferSwiftBinary('llvm-dis')
 config.sourcekitd_test = inferSwiftBinary('sourcekitd-test')
 config.complete_test = inferSwiftBinary('complete-test')
@@ -419,6 +420,7 @@ config.substitutions.append( ('%swift-indent', config.swift_indent) )
 config.substitutions.append( ('%llvm-link', config.llvm_link) )
 config.substitutions.append( ('%swift-llvm-opt', config.swift_llvm_opt) )
 config.substitutions.append( ('%llvm-dwarfdump', config.llvm_dwarfdump) )
+config.substitutions.append( ('%llvm-readelf', config.llvm_readelf) )
 config.substitutions.append( ('%llvm-dis', config.llvm_dis) )
 config.substitutions.append( ('%swift-demangle-yamldump', config.swift_demangle_yamldump) )
 config.substitutions.append( ('%Benchmark_O', config.benchmark_o) )

utils/static-executable-args.lnk

@@ -8,9 +8,9 @@
 -Xlinker
 --defsym=__import_pthread_key_create=pthread_key_create
 -lpthread
--licui18n
--licuuc
--licudata
+-licui18nswift
+-licuucswift
+-licudataswift
 -ldl
 -lstdc++
 -lm