diff options
| -rw-r--r-- | lld/COFF/Driver.cpp | 10 | ||||
| -rw-r--r-- | lld/test/COFF/export.test | 4 |
2 files changed, 14 insertions, 0 deletions
diff --git a/lld/COFF/Driver.cpp b/lld/COFF/Driver.cpp index c4636c2e262..3defdc7d41f 100644 --- a/lld/COFF/Driver.cpp +++ b/lld/COFF/Driver.cpp @@ -625,6 +625,16 @@ static void parseModuleDefs(StringRef Path) { for (COFFShortExport E1 : M.Exports) { Export E2; + // In simple cases, only Name is set. Renamed exports are parsed + // and set as "ExtName = Name". If Name has the form "OtherDll.Func", + // it shouldn't be a normal exported function but a forward to another + // DLL instead. This is supported by both MS and GNU linkers. + if (E1.ExtName != E1.Name && StringRef(E1.Name).contains('.')) { + E2.Name = E1.ExtName; + E2.ForwardTo = E1.Name; + Config->Exports.push_back(E2); + continue; + } E2.Name = Saver.save(E1.Name); E2.ExtName = Saver.save(E1.ExtName); E2.Ordinal = E1.Ordinal; diff --git a/lld/test/COFF/export.test b/lld/test/COFF/export.test index 174f4ac55d9..a00a29c13d4 100644 --- a/lld/test/COFF/export.test +++ b/lld/test/COFF/export.test @@ -86,6 +86,10 @@ SYMTAB: exportfn3 in export.test.tmp.DLL # RUN: lld-link /out:%t.dll /dll %t.obj /export:foo=kernel32.foobar # RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=FORWARDER %s +# RUN: echo "EXPORTS foo=kernel32.foobar" > %t.def +# RUN: lld-link /out:%t.dll /dll %t.obj /def:%t.def +# RUN: llvm-objdump -p %t.dll | FileCheck -check-prefix=FORWARDER %s + FORWARDER: Export Table: FORWARDER: DLL name: export.test.tmp.dll FORWARDER: Ordinal base: 0 |
