[lld] be770ed - [lld][WebAssembly] Reject shared libraries when `-static`/`-Bstatic` is used (#108263)

via llvm-commits llvm-commits at lists.llvm.org
Wed Sep 11 11:22:53 PDT 2024


Author: Sam Clegg
Date: 2024-09-11T11:22:46-07:00
New Revision: be770edee59310b158bf3a30ddc2645007ab8da3

URL: https://github.com/llvm/llvm-project/commit/be770edee59310b158bf3a30ddc2645007ab8da3
DIFF: https://github.com/llvm/llvm-project/commit/be770edee59310b158bf3a30ddc2645007ab8da3.diff

LOG: [lld][WebAssembly] Reject shared libraries when `-static`/`-Bstatic` is used (#108263)

This matches the behaviour of GNU ld and the ELF version of lld.

Added: 
    lld/test/wasm/static-error.s

Modified: 
    lld/wasm/Driver.cpp

Removed: 
    


################################################################################
diff  --git a/lld/test/wasm/static-error.s b/lld/test/wasm/static-error.s
new file mode 100644
index 00000000000000..3557506a5f07a2
--- /dev/null
+++ b/lld/test/wasm/static-error.s
@@ -0,0 +1,12 @@
+// RUN: llvm-mc -filetype=obj -triple=wasm32-unknown-unknown %s -o %t.o
+// RUN: wasm-ld --experimental-pic -shared -o %t.so %t.o
+
+// RUN: wasm-ld --experimental-pic -pie -o /dev/null %t.o %t.so
+// RUN: not wasm-ld -o /dev/null -static %t.o %t.so 2>&1 | FileCheck %s
+
+// CHECK: attempted static link of dynamic object
+
+.global _start
+_start:
+  .functype _start () -> ()
+  end_function

diff  --git a/lld/wasm/Driver.cpp b/lld/wasm/Driver.cpp
index cb8fe2534f5fe7..2de7dcaeb43d47 100644
--- a/lld/wasm/Driver.cpp
+++ b/lld/wasm/Driver.cpp
@@ -333,9 +333,15 @@ void LinkerDriver::addFile(StringRef path) {
     return;
   }
   case file_magic::bitcode:
-  case file_magic::wasm_object:
-    files.push_back(createObjectFile(mbref, "", 0, inLib));
+  case file_magic::wasm_object: {
+    auto obj = createObjectFile(mbref, "", 0, inLib);
+    if (config->isStatic && isa<SharedFile>(obj)) {
+      error("attempted static link of dynamic object " + path);
+      break;
+    }
+    files.push_back(obj);
     break;
+  }
   case file_magic::unknown:
     if (mbref.getBuffer().starts_with("#STUB")) {
       files.push_back(make<StubFile>(mbref));


        


More information about the llvm-commits mailing list