[lld] r206648 - [PECOFF] Win64 DLL entry function name is _DllMainCRTStartup.

[Rui Ueyama]

Author: ruiu
Date: Fri Apr 18 16:05:59 2014
New Revision: 206648

URL: http://llvm.org/viewvc/llvm-project?rev=206648&view=rev
Log:
[PECOFF] Win64 DLL entry function name is _DllMainCRTStartup.

Unlike Win32/x86, it has no "@12" suffix.

Modified:
    lld/trunk/lib/Driver/WinLinkDriver.cpp
    lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp

Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=206648&r1=206647&r2=206648&view=diff
==============================================================================
--- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)
+++ lld/trunk/lib/Driver/WinLinkDriver.cpp Fri Apr 18 16:05:59 2014
@@ -599,10 +599,13 @@ static void processLibEnv(PECOFFLinkingC
 
 // Returns a default entry point symbol name depending on context image type and
 // subsystem. These default names are MS CRT compliant.
-static StringRef getDefaultEntrySymbolName(PECOFFLinkingContext &context) {
-  if (context.isDll())
-    return "_DllMainCRTStartup at 12";
-  llvm::COFF::WindowsSubsystem subsystem = context.getSubsystem();
+static StringRef getDefaultEntrySymbolName(PECOFFLinkingContext &ctx) {
+  if (ctx.isDll()) {
+    if (ctx.getMachineType() == llvm::COFF::IMAGE_FILE_MACHINE_I386)
+      return "_DllMainCRTStartup at 12";
+    return "_DllMainCRTStartup";
+  }
+  llvm::COFF::WindowsSubsystem subsystem = ctx.getSubsystem();
   if (subsystem == llvm::COFF::WindowsSubsystem::IMAGE_SUBSYSTEM_WINDOWS_GUI)
     return "WinMainCRTStartup";
   if (subsystem == llvm::COFF::WindowsSubsystem::IMAGE_SUBSYSTEM_WINDOWS_CUI)

Modified: lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp?rev=206648&r1=206647&r2=206648&view=diff
==============================================================================
--- lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp (original)
+++ lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp Fri Apr 18 16:05:59 2014
@@ -688,3 +688,13 @@ TEST_F(WinLinkParserTest, DefEntryNameWi
   EXPECT_TRUE(parse("link.exe", "/subsystem:windows", "a.obj", nullptr));
   EXPECT_EQ("_WinMainCRTStartup", _context.entrySymbolName());
 }
+
+TEST_F(WinLinkParserTest, DefEntryNameDll32) {
+  EXPECT_TRUE(parse("link.exe", "/dll", "/machine:x86", "a.obj", nullptr));
+  EXPECT_EQ("__DllMainCRTStartup at 12", _context.entrySymbolName());
+}
+
+TEST_F(WinLinkParserTest, DefEntryNameDll64) {
+  EXPECT_TRUE(parse("link.exe", "/dll", "/machine:x64", "a.obj", nullptr));
+  EXPECT_EQ("_DllMainCRTStartup", _context.entrySymbolName());
+}