[lld] r194492 - [MachO] Simplify conditionals. No functionality change.
Rui Ueyama
ruiu at google.com
Tue Nov 12 09:46:55 PST 2013
Author: ruiu
Date: Tue Nov 12 11:46:55 2013
New Revision: 194492
URL: http://llvm.org/viewvc/llvm-project?rev=194492&view=rev
Log:
[MachO] Simplify conditionals. No functionality change.
Modified:
lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
Modified: lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp?rev=194492&r1=194491&r2=194492&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp Tue Nov 12 11:46:55 2013
@@ -221,14 +221,12 @@ bool MachOLinkingContext::validateImpl(r
if ((_outputFileType == MH_EXECUTE) && _entrySymbolName.empty()){
if (_outputFileTypeStatic) {
_entrySymbolName = "start";
- } else {
- // If targeting newer OS, use _main
- if (addEntryPointLoadCommand())
- _entrySymbolName = "_main";
-
+ } else if (addUnixThreadLoadCommand()) {
// If targeting older OS, use start (in crt1.o)
- if (addUnixThreadLoadCommand())
- _entrySymbolName = "start";
+ _entrySymbolName = "start";
+ } else if (addEntryPointLoadCommand()) {
+ // If targeting newer OS, use _main
+ _entrySymbolName = "_main";
}
}
More information about the llvm-commits
mailing list