From: Pete Cooper <peter_cooper@apple.com>
Date: Thu, 11 Aug 2016 18:41:14 +0000 (+0000)
Subject: Fix off-by-one error in default currentVersion.
X-Git-Tag: llvmorg-4.0.0-rc1~12716
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=932bce6ade232aebfa91ac03be2b47563e8c4a8a;p=platform%2Fupstream%2Fllvm.git

Fix off-by-one error in default currentVersion.

A version of 0x1000 is 0.16.0, not 1.0.0 as the comment said.  Fix the
value to match the comment, and also the one test case which had this
wrong.

llvm-svn: 278381
---

diff --git a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
index 05375f1..ebd4bf3 100644
--- a/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
+++ b/lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
@@ -734,7 +734,7 @@ uint32_t MachOLinkingContext::dylibCurrentVersion(StringRef installName) const {
   if (pos != _pathToDylibMap.end())
     return pos->second->currentVersion();
   else
-    return 0x1000; // 1.0
+    return 0x10000; // 1.0
 }
 
 uint32_t MachOLinkingContext::dylibCompatVersion(StringRef installName) const {
@@ -742,7 +742,7 @@ uint32_t MachOLinkingContext::dylibCompatVersion(StringRef installName) const {
   if (pos != _pathToDylibMap.end())
     return pos->second->compatVersion();
   else
-    return 0x1000; // 1.0
+    return 0x10000; // 1.0
 }
 
 void MachOLinkingContext::createImplicitFiles(
diff --git a/lld/test/mach-o/dylib-install-names.yaml b/lld/test/mach-o/dylib-install-names.yaml
index a5a801c..af00adf 100644
--- a/lld/test/mach-o/dylib-install-names.yaml
+++ b/lld/test/mach-o/dylib-install-names.yaml
@@ -63,8 +63,8 @@ global-symbols:
 # CHECK-BINARY-READ-NEXT: cmdsize 56
 # CHECK-BINARY-READ-NEXT:  name /usr/lib/libSystem.B.dylib (offset 24)
 # CHECK-BINARY-READ-NEXT:  time stamp 2
-# CHECK-BINARY-READ-NEXT:  current version 0.16.0
-# CHECK-BINARY-READ-NEXT:  compatibility version 0.16.0
+# CHECK-BINARY-READ-NEXT:  current version 1.0.0
+# CHECK-BINARY-READ-NEXT:  compatibility version 1.0.0
 
 # CHECK-BINARY-READ: cmd LC_LOAD_DYLIB
 # CHECK-BINARY-READ-NEXT: cmdsize 40