[lld] r317367 - [COFF] Autoexport symbols as data if they don't point to an executable section

[Martin Storsjo via llvm-commits]

Author: mstorsjo
Date: Fri Nov  3 13:58:20 2017
New Revision: 317367

URL: http://llvm.org/viewvc/llvm-project?rev=317367&view=rev
Log:
[COFF] Autoexport symbols as data if they don't point to an executable section

This was already taken care of for the output def file.

Differential Revision: https://reviews.llvm.org/D39573

Modified:
    lld/trunk/COFF/Driver.cpp
    lld/trunk/test/COFF/export-all.s

Modified: lld/trunk/COFF/Driver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/COFF/Driver.cpp?rev=317367&r1=317366&r2=317367&view=diff
==============================================================================
--- lld/trunk/COFF/Driver.cpp (original)
+++ lld/trunk/COFF/Driver.cpp Fri Nov  3 13:58:20 2017
@@ -1244,6 +1244,9 @@ void LinkerDriver::link(ArrayRef<const c
       Export E;
       E.Name = Def->getName();
       E.Sym = Def;
+      if (Def->getChunk() &&
+          !(Def->getChunk()->getPermissions() & IMAGE_SCN_MEM_EXECUTE))
+        E.Data = true;
       Config->Exports.push_back(E);
     });
   }

Modified: lld/trunk/test/COFF/export-all.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/COFF/export-all.s?rev=317367&r1=317366&r2=317367&view=diff
==============================================================================
--- lld/trunk/test/COFF/export-all.s (original)
+++ lld/trunk/test/COFF/export-all.s Fri Nov  3 13:58:20 2017
@@ -4,17 +4,28 @@
 
 # RUN: lld-link -lldmingw -dll -out:%t.dll -entry:DllMainCRTStartup at 12 %t.obj -implib:%t.lib
 # RUN: llvm-readobj -coff-exports %t.dll | FileCheck %s
+# RUN: llvm-readobj %t.lib | FileCheck -check-prefix=IMPLIB %s
 
 # CHECK-NOT: Name: DllMainCRTStartup
+# CHECK: Name: dataSym
 # CHECK: Name: foobar
 
+# IMPLIB: Symbol: __imp__dataSym
+# IMPLIB-NOT: Symbol: _dataSym
+# IMPLIB: Symbol: __imp__foobar
+# IMPLIB: Symbol: _foobar
+
 .global _foobar
 .global _DllMainCRTStartup at 12
+.global _dataSym
 .text
 _DllMainCRTStartup at 12:
   ret
 _foobar:
   ret
+.data
+_dataSym:
+  .int 4
 
 # Test specifying -export-all-symbols, on an object file that contains
 # dllexport directive for some of the symbols.