Index: test/wasm/shared-needed.ll =================================================================== --- test/wasm/shared-needed.ll +++ test/wasm/shared-needed.ll @@ -0,0 +1,38 @@ +; RUN: llc -filetype=obj %s -o %t.o +; RUN: llc -filetype=obj %p/Inputs/ret32.ll -o %t.ret32.o + +; RUN: wasm-ld -shared -o %t1.so %t.o +; RUN: obj2yaml %t1.so | FileCheck %s -check-prefix=SO1 + +; RUN: wasm-ld -shared -o %t2.so %t1.so %t.ret32.o +; RUN: obj2yaml %t2.so | FileCheck %s -check-prefix=SO2 + +target triple = "wasm32-unknown-unknown" + +@data = global i32 2, align 4 + +define default void @foo() { +entry: + ret void +} + +; SO1: Sections: +; SO1-NEXT: - Type: CUSTOM +; SO1-NEXT: Name: dylink +; SO1-NEXT: MemorySize: 4 +; SO1-NEXT: MemoryAlignment: 2 +; SO1-NEXT: TableSize: 0 +; SO1-NEXT: TableAlignment: 0 +; SO1-NEXT: Needed: [] +; SO1-NEXT: - Type: TYPE + +; SO2: Sections: +; SO2-NEXT: - Type: CUSTOM +; SO2-NEXT: Name: dylink +; SO2-NEXT: MemorySize: 0 +; SO2-NEXT: MemoryAlignment: 0 +; SO2-NEXT: TableSize: 0 +; SO2-NEXT: TableAlignment: 0 +; SO2-NEXT: Needed: +; SO2-NEXT: - shared-needed.ll.tmp1.so +; SO2-NEXT: - Type: TYPE Index: test/wasm/shared.ll =================================================================== --- test/wasm/shared.ll +++ test/wasm/shared.ll @@ -33,6 +33,8 @@ ; CHECK-NEXT: MemoryAlignment: 2 ; CHECK-NEXT: TableSize: 2 ; CHECK-NEXT: TableAlignment: 0 +; CHECK-NEXT: Needed: [] +; CHECK-NEXT: - Type: TYPE ; check for import of __table_base and __memory_base globals Index: wasm/InputFiles.h =================================================================== --- wasm/InputFiles.h +++ wasm/InputFiles.h @@ -33,6 +33,7 @@ public: enum Kind { ObjectKind, + SharedKind, ArchiveKind, BitcodeKind, }; @@ -129,6 +130,16 @@ std::unique_ptr WasmObj; }; +// .so file. +class SharedFile : public InputFile { +public: + explicit SharedFile(MemoryBufferRef M) : InputFile(SharedKind, M) {} + static bool classof(const InputFile *F) { return F->kind() == SharedKind; } + + void parse() override {} +}; + +// .bc file class BitcodeFile : public InputFile { public: explicit BitcodeFile(MemoryBufferRef M) : InputFile(BitcodeKind, M) {} Index: wasm/InputFiles.cpp =================================================================== --- wasm/InputFiles.cpp +++ wasm/InputFiles.cpp @@ -44,8 +44,13 @@ InputFile *lld::wasm::createObjectFile(MemoryBufferRef MB) { file_magic Magic = identify_magic(MB.getBuffer()); - if (Magic == file_magic::wasm_object) + if (Magic == file_magic::wasm_object) { + std::unique_ptr Bin = check(createBinary(MB)); + auto *Obj = cast(Bin.get()); + if (Obj->isSharedObject()) + return make(MB); return make(MB); + } if (Magic == file_magic::bitcode) return make(MB); Index: wasm/SymbolTable.h =================================================================== --- wasm/SymbolTable.h +++ wasm/SymbolTable.h @@ -39,6 +39,7 @@ void addCombinedLTOObject(); std::vector ObjectFiles; + std::vector SharedFiles; std::vector BitcodeFiles; std::vector SyntheticFunctions; std::vector SyntheticGlobals; Index: wasm/SymbolTable.cpp =================================================================== --- wasm/SymbolTable.cpp +++ wasm/SymbolTable.cpp @@ -37,6 +37,8 @@ BitcodeFiles.push_back(F); else if (auto *F = dyn_cast(File)) ObjectFiles.push_back(F); + else if (auto *F = dyn_cast(File)) + SharedFiles.push_back(F); } // This function is where all the optimizations of link-time Index: wasm/Writer.cpp =================================================================== --- wasm/Writer.cpp +++ wasm/Writer.cpp @@ -28,6 +28,7 @@ #include "llvm/Support/Format.h" #include "llvm/Support/FormatVariadic.h" #include "llvm/Support/LEB128.h" +#include "llvm/Support/Path.h" #include #include @@ -502,7 +503,9 @@ writeUleb128(OS, MemAlign, "MemAlign"); writeUleb128(OS, IndirectFunctions.size(), "TableSize"); writeUleb128(OS, 0, "TableAlign"); - writeUleb128(OS, 0, "Needed"); // TODO: Support "needed" shared libraries + writeUleb128(OS, Symtab->SharedFiles.size(), "Needed"); + for (auto *SO : Symtab->SharedFiles) + writeStr(OS, llvm::sys::path::filename(SO->getName()), "so name"); } // Create the custom "linking" section containing linker metadata.