[lld] r190586 - Remove hard-coded leading underscore from entry symbol.
Rui Ueyama
ruiu at google.com
Wed Sep 11 22:09:01 PDT 2013
Author: ruiu
Date: Thu Sep 12 00:09:01 2013
New Revision: 190586
URL: http://llvm.org/viewvc/llvm-project?rev=190586&view=rev
Log:
Remove hard-coded leading underscore from entry symbol.
Modified:
lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
lld/trunk/lib/Driver/WinLinkDriver.cpp
lld/trunk/test/pecoff/drectve.test
lld/trunk/test/pecoff/imagebase.test
lld/trunk/test/pecoff/importlib.test
lld/trunk/test/pecoff/lib.test
lld/trunk/test/pecoff/multi.test
lld/trunk/test/pecoff/trivial.test
lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
Modified: lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h (original)
+++ lld/trunk/include/lld/ReaderWriter/PECOFFLinkingContext.h Thu Sep 12 00:09:01 2013
@@ -80,6 +80,11 @@ public:
return allocateString(str);
}
+ void setEntrySymbolName(StringRef name) {
+ if (!name.empty())
+ LinkingContext::setEntrySymbolName(decorateSymbol(name));
+ }
+
void setBaseAddress(uint64_t addr) { _baseAddress = addr; }
uint64_t getBaseAddress() const { return _baseAddress; }
Modified: lld/trunk/lib/Driver/WinLinkDriver.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/WinLinkDriver.cpp?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/lib/Driver/WinLinkDriver.cpp (original)
+++ lld/trunk/lib/Driver/WinLinkDriver.cpp Thu Sep 12 00:09:01 2013
@@ -172,12 +172,12 @@ void processLibEnv(PECOFFLinkingContext
// subsystem. These default names are MS CRT compliant.
StringRef getDefaultEntrySymbolName(PECOFFLinkingContext &context) {
if (context.getImageType() == PECOFFLinkingContext::ImageType::IMAGE_DLL)
- return "__DllMainCRTStartup";
+ return "_DllMainCRTStartup";
llvm::COFF::WindowsSubsystem subsystem = context.getSubsystem();
if (subsystem == llvm::COFF::WindowsSubsystem::IMAGE_SUBSYSTEM_WINDOWS_GUI)
- return "_WinMainCRTStartup";
+ return "WinMainCRTStartup";
if (subsystem == llvm::COFF::WindowsSubsystem::IMAGE_SUBSYSTEM_WINDOWS_CUI)
- return "_mainCRTStartup";
+ return "mainCRTStartup";
return "";
}
Modified: lld/trunk/test/pecoff/drectve.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/drectve.test?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/test/pecoff/drectve.test (original)
+++ lld/trunk/test/pecoff/drectve.test Thu Sep 12 00:09:01 2013
@@ -4,7 +4,7 @@
# RUN: yaml2obj %p/Inputs/drectve.obj.yaml > %t.obj
#
-# RUN: lld -flavor link /out:%t.exe /entry:_start -- %t.obj >& %t.log
+# RUN: lld -flavor link /out:%t.exe /entry:start -- %t.obj >& %t.log
# RUN: llvm-readobj -file-headers %t.exe | FileCheck -check-prefix=HEADER %s
# RUN: echo >> %t.log
# RUN: FileCheck -check-prefix=ERROR %s < %t.log
Modified: lld/trunk/test/pecoff/imagebase.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/imagebase.test?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/test/pecoff/imagebase.test (original)
+++ lld/trunk/test/pecoff/imagebase.test Thu Sep 12 00:09:01 2013
@@ -1,10 +1,10 @@
# RUN: yaml2obj %p/Inputs/imagebase.obj.yaml > %t.obj
#
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:__start /opt:noref \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_start /opt:noref \
# RUN: -- %t.obj \
# RUN: && llvm-objdump -disassemble %t1 | FileCheck -check-prefix=CHECK1 %s
#
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:__start /base:65536 \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_start /base:65536 \
# RUN: /opt:noref -- %t.obj \
# RUN: && llvm-objdump -disassemble %t1 | FileCheck -check-prefix=CHECK2 %s
Modified: lld/trunk/test/pecoff/importlib.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/importlib.test?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/test/pecoff/importlib.test (original)
+++ lld/trunk/test/pecoff/importlib.test Thu Sep 12 00:09:01 2013
@@ -3,22 +3,22 @@
#
# RUN: yaml2obj %p/Inputs/vars-main.obj.yaml > %t.obj
#
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:main /opt:noref \
# RUN: -- %t.obj %p/Inputs/vars.lib && llvm-objdump -d %t1 | FileCheck %s
#
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:main /opt:noref \
# RUN: /libpath:%p/Inputs -- %t.obj vars.lib && llvm-objdump -d %t1 \
# RUN: | FileCheck %s
#
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:main /opt:noref \
# RUN: /libpath:%p/Inputs /defaultlib:vars.lib -- %t.obj \
# RUN: && llvm-objdump -d %t1 | FileCheck %s
#
# RUN: env LIB=%p/Inputs lld -flavor link /out:%t1 /subsystem:console \
-# RUN: /opt:noref /entry:_main -- %t.obj vars.lib \
+# RUN: /opt:noref /entry:main -- %t.obj vars.lib \
# RUN: && llvm-objdump -d %t1 | FileCheck %s
#
-# RUN: env LINK="/out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN: env LINK="/out:%t1 /subsystem:console /entry:main /opt:noref \
# RUN: -- %t.obj" lld -flavor link %p/Inputs/vars.lib \
# RUN: && llvm-objdump -d %t1 | FileCheck %s
Modified: lld/trunk/test/pecoff/lib.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/lib.test?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/test/pecoff/lib.test (original)
+++ lld/trunk/test/pecoff/lib.test Thu Sep 12 00:09:01 2013
@@ -2,7 +2,7 @@
#
# RUN: yaml2obj %p/Inputs/main.obj.yaml > %t.obj
#
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:main /opt:noref \
# RUN: -- %t.obj %p/Inputs/static.lib && llvm-objdump -d %t1 | FileCheck %s
CHECK: Disassembly of section .text:
Modified: lld/trunk/test/pecoff/multi.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/multi.test?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/test/pecoff/multi.test (original)
+++ lld/trunk/test/pecoff/multi.test Thu Sep 12 00:09:01 2013
@@ -4,7 +4,7 @@
# RUN: yaml2obj %p/Inputs/static-data1.obj.yaml > %t2.obj
# RUN: yaml2obj %p/Inputs/static-data2.obj.yaml > %t3.obj
#
-# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:_main /opt:noref \
+# RUN: lld -flavor link /out:%t1 /subsystem:console /entry:main /opt:noref \
# RUN: -- %t1.obj %t2.obj %t3.obj && llvm-objdump -d %t1 | FileCheck %s
CHECK: Disassembly of section .text:
Modified: lld/trunk/test/pecoff/trivial.test
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/pecoff/trivial.test?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/test/pecoff/trivial.test (original)
+++ lld/trunk/test/pecoff/trivial.test Thu Sep 12 00:09:01 2013
@@ -4,11 +4,11 @@
#
# RUN: yaml2obj %p/Inputs/nop.obj.yaml > %t.obj
#
-# RUN: lld -flavor link /out:%t1 /subsystem:console,3.11 /entry:_start \
+# RUN: lld -flavor link /out:%t1 /subsystem:console,3.11 /entry:start \
# RUN: /opt:noref -- %t.obj && llvm-readobj -file-headers %t1 \
# RUN: | FileCheck -check-prefix=FILE %s
#
-# RUN: lld -flavor link /out:%t1 /entry:_start /opt:noref -- %t.obj \
+# RUN: lld -flavor link /out:%t1 /entry:start /opt:noref -- %t.obj \
# RUN: && llvm-readobj -sections %t1 | FileCheck -check-prefix=SECTIONS %s
FILE: Format: COFF-i386
Modified: lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp?rev=190586&r1=190585&r2=190586&view=diff
==============================================================================
--- lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp (original)
+++ lld/trunk/unittests/DriverTests/WinLinkDriverTest.cpp Thu Sep 12 00:09:01 2013
@@ -32,7 +32,7 @@ protected:
TEST_F(WinLinkParserTest, Basic) {
EXPECT_FALSE(parse("link.exe", "/subsystem:console", "/out:a.exe",
- "-entry:_start", "a.obj", "b.obj", "c.obj", nullptr));
+ "-entry:start", "a.obj", "b.obj", "c.obj", nullptr));
EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_CUI, _context.getSubsystem());
EXPECT_EQ("a.exe", _context.outputPath());
EXPECT_EQ("_start", _context.entrySymbolName());
More information about the llvm-commits
mailing list