summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRui Ueyama <ruiu@google.com>2013-11-12 17:46:55 +0000
committerRui Ueyama <ruiu@google.com>2013-11-12 17:46:55 +0000
commit3f902b27880014413596402f9d9b927054684be1 (patch)
tree41cc561ef36d285701e07a09a2431d2c52bd4a68
parent3abbb8a4336822c406312ef1cf5b7d8ba433a49d (diff)
downloadbcm5719-llvm-3f902b27880014413596402f9d9b927054684be1.tar.gz
bcm5719-llvm-3f902b27880014413596402f9d9b927054684be1.zip
[MachO] Simplify conditionals. No functionality change.
llvm-svn: 194492
-rw-r--r--lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
index 4f5a9bed86b..f5dc5c7451f 100644
--- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
@@ -221,14 +221,12 @@ bool MachOLinkingContext::validateImpl(raw_ostream &diagnostics) {
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";
}
}
OpenPOWER on IntegriCloud