[lld] r278381 - Fix off-by-one error in default currentVersion.

[Pete Cooper via llvm-commits]

Author: pete
Date: Thu Aug 11 13:41:14 2016
New Revision: 278381

URL: http://llvm.org/viewvc/llvm-project?rev=278381&view=rev
Log:
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.

Modified:
    lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
    lld/trunk/test/mach-o/dylib-install-names.yaml

Modified: lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp?rev=278381&r1=278380&r2=278381&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp (original)
+++ lld/trunk/lib/ReaderWriter/MachO/MachOLinkingContext.cpp Thu Aug 11 13:41:14 2016
@@ -734,7 +734,7 @@ uint32_t MachOLinkingContext::dylibCurre
   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::dylibCompa
   if (pos != _pathToDylibMap.end())
     return pos->second->compatVersion();
   else
-    return 0x1000; // 1.0
+    return 0x10000; // 1.0
 }
 
 void MachOLinkingContext::createImplicitFiles(

Modified: lld/trunk/test/mach-o/dylib-install-names.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/dylib-install-names.yaml?rev=278381&r1=278380&r2=278381&view=diff
==============================================================================
--- lld/trunk/test/mach-o/dylib-install-names.yaml (original)
+++ lld/trunk/test/mach-o/dylib-install-names.yaml Thu Aug 11 13:41:14 2016
@@ -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