[llvm] r309555 - [llvm-dlltool] Write correct weak externals

[Hans Wennborg via llvm-commits]

Merged to 5.0 in r309837.

On Mon, Jul 31, 2017 at 4:18 AM, Martin Storsjo via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: mstorsjo
> Date: Mon Jul 31 04:18:41 2017
> New Revision: 309555
>
> URL: http://llvm.org/viewvc/llvm-project?rev=309555&view=rev
> Log:
> [llvm-dlltool] Write correct weak externals
>
> Previously, the created object files for the import library were broken.
> Write the symbol table before the string table. Simplify the code by
> using a separate variable Prefix instead of duplicating a few lines.
>
> Also update the coff-weak-exports to actually check that the generated
> weak symbols can be found as intended.
>
> Differential Revision: https://reviews.llvm.org/D36065
>
> Modified:
>     llvm/trunk/lib/Object/COFFImportFile.cpp
>     llvm/trunk/test/DllTool/coff-weak-exports.def
>
> Modified: llvm/trunk/lib/Object/COFFImportFile.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Object/COFFImportFile.cpp?rev=309555&r1=309554&r2=309555&view=diff
> ==============================================================================
> --- llvm/trunk/lib/Object/COFFImportFile.cpp (original)
> +++ llvm/trunk/lib/Object/COFFImportFile.cpp Mon Jul 31 04:18:41 2017
> @@ -545,15 +545,12 @@ NewArchiveMember ObjectFactory::createWe
>    SymbolTable[2].Name.Offset.Offset = sizeof(uint32_t);
>
>    //__imp_ String Table
> -  if (Imp) {
> -    SymbolTable[3].Name.Offset.Offset = sizeof(uint32_t) + Sym.size() + 7;
> -    writeStringTable(Buffer, {std::string("__imp_").append(Sym),
> -                              std::string("__imp_").append(Weak)});
> -  } else {
> -    SymbolTable[3].Name.Offset.Offset = sizeof(uint32_t) + Sym.size() + 1;
> -    writeStringTable(Buffer, {Sym, Weak});
> -  }
> +  StringRef Prefix = Imp ? "__imp_" : "";
> +  SymbolTable[3].Name.Offset.Offset =
> +      sizeof(uint32_t) + Sym.size() + Prefix.size() + 1;
>    append(Buffer, SymbolTable);
> +  writeStringTable(Buffer, {(Prefix + Sym).str(),
> +                            (Prefix + Weak).str()});
>
>    // Copied here so we can still use writeStringTable
>    char *Buf = Alloc.Allocate<char>(Buffer.size());
>
> Modified: llvm/trunk/test/DllTool/coff-weak-exports.def
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DllTool/coff-weak-exports.def?rev=309555&r1=309554&r2=309555&view=diff
> ==============================================================================
> --- llvm/trunk/test/DllTool/coff-weak-exports.def (original)
> +++ llvm/trunk/test/DllTool/coff-weak-exports.def Mon Jul 31 04:18:41 2017
> @@ -1,19 +1,11 @@
>  ; RUN: llvm-dlltool -m i386:x86-64 --input-def %s --output-lib %t.a
> -; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s
> +; RUN: llvm-nm %t.a | FileCheck %s
>
>  LIBRARY test.dll
>  EXPORTS
>  TestFunction==AltTestFunction
>
> -; CHECK: File: test.dll
> -; CHECK: Format: COFF-x86-64
> -; CHECK: Arch: x86_64
> -; CHECK: AddressSize: 64bit
> -; CHECK: File: test.dll
> -; CHECK: Format: COFF-x86-64
> -; CHECK: Arch: x86_64
> -; CHECK: AddressSize: 64bit
> -; CHECK: File: test.dll
> -; CHECK: Format: COFF-x86-64
> -; CHECK: Arch: x86_64
> -; CHECK: AddressSize: 64bit
> +; CHECK:      U AltTestFunction
> +; CHECK-NEXT: w TestFunction
> +; CHECK:      U __imp_AltTestFunction
> +; CHECK-NEXT: w __imp_TestFunction
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits