diff options
| author | dim <dim@FreeBSD.org> | 2015-01-31 21:57:38 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-01-31 21:57:38 +0000 |
| commit | c9d63888fe4bf61cab2ca02db39caf47711f401d (patch) | |
| tree | aeab28fc1964cf0e6ba5c8157bb158c25a660444 /contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp | |
| parent | de7d9ba1a12bd2fffbea1f10e14038dfdbf7e5bb (diff) | |
| download | FreeBSD-src-c9d63888fe4bf61cab2ca02db39caf47711f401d.zip FreeBSD-src-c9d63888fe4bf61cab2ca02db39caf47711f401d.tar.gz | |
Merge llvm 3.6.0rc2 from ^/vendor/llvm/dist, merge clang 3.6.0rc2 from
^/vendor/clang/dist, resolve conflicts, and cleanup patches.
Diffstat (limited to 'contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp')
| -rw-r--r-- | contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp b/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp index f705490..04cc0ff 100644 --- a/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp +++ b/contrib/llvm/lib/MC/MCAsmInfoDarwin.cpp @@ -27,7 +27,22 @@ bool MCAsmInfoDarwin::isSectionAtomizableBySymbols( // contain. // Sections holding 2 byte strings require symbols in order to be atomized. // There is no dedicated section for 4 byte strings. - if (SMO.getType() == MachO::S_CSTRING_LITERALS) + if (SMO.getKind().isMergeable1ByteCString()) + return false; + + if (SMO.getSegmentName() == "__TEXT" && + SMO.getSectionName() == "__objc_classname" && + SMO.getType() == MachO::S_CSTRING_LITERALS) + return false; + + if (SMO.getSegmentName() == "__TEXT" && + SMO.getSectionName() == "__objc_methname" && + SMO.getType() == MachO::S_CSTRING_LITERALS) + return false; + + if (SMO.getSegmentName() == "__TEXT" && + SMO.getSectionName() == "__objc_methtype" && + SMO.getType() == MachO::S_CSTRING_LITERALS) return false; if (SMO.getSegmentName() == "__DATA" && SMO.getSectionName() == "__cfstring") |
