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/Target/Sparc | |
| 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/Target/Sparc')
| -rw-r--r-- | contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp b/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp index 6767e4b..4269020 100644 --- a/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp +++ b/contrib/llvm/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp @@ -42,7 +42,8 @@ SparcELFMCAsmInfo::SparcELFMCAsmInfo(StringRef TT) { SunStyleELFSectionSwitchSyntax = true; UsesELFSectionDirectiveForBSS = true; - UseIntegratedAssembler = true; + if (TheTriple.isOSSolaris() || TheTriple.isOSOpenBSD()) + UseIntegratedAssembler = true; } const MCExpr* |
