maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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
This commit is contained in:
Pete Cooper 2016-08-11 18:41:14 +00:00
parent 35fef211a0
commit 932bce6ade
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lld/lib/ReaderWriter/MachO/MachOLinkingContext.cpp
View File

@ -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(

4
lld/test/mach-o/dylib-install-names.yaml
View File

@ -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