[llvm-branch-commits] [llvm-branch] r226355 - Revert r225957 from the 3.6 branch.

[Rafael Espindola]

Author: rafael
Date: Fri Jan 16 18:43:31 2015
New Revision: 226355

URL: http://llvm.org/viewvc/llvm-project?rev=226355&view=rev
Log:
Revert r225957 from the 3.6 branch.

It should get more testing on trunk before going into a release.

Original message:

Use the integrated assembler by default on SPARC.

Modified:
    llvm/branches/release_36/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp
    llvm/branches/release_36/test/CodeGen/SPARC/2008-10-10-InlineAsmMemoryOperand.ll
    llvm/branches/release_36/test/CodeGen/SPARC/inlineasm.ll
    llvm/branches/release_36/test/CodeGen/SPARC/mult-alt-generic-sparc.ll

Modified: llvm/branches/release_36/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp?rev=226355&r1=226354&r2=226355&view=diff
==============================================================================
--- llvm/branches/release_36/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp (original)
+++ llvm/branches/release_36/lib/Target/Sparc/MCTargetDesc/SparcMCAsmInfo.cpp Fri Jan 16 18:43:31 2015
@@ -42,7 +42,8 @@ SparcELFMCAsmInfo::SparcELFMCAsmInfo(Str
   SunStyleELFSectionSwitchSyntax = true;
   UsesELFSectionDirectiveForBSS = true;
 
-  UseIntegratedAssembler = true;
+  if (TheTriple.isOSSolaris() || TheTriple.isOSOpenBSD())
+    UseIntegratedAssembler = true;
 }
 
 const MCExpr*

Modified: llvm/branches/release_36/test/CodeGen/SPARC/2008-10-10-InlineAsmMemoryOperand.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/test/CodeGen/SPARC/2008-10-10-InlineAsmMemoryOperand.ll?rev=226355&r1=226354&r2=226355&view=diff
==============================================================================
--- llvm/branches/release_36/test/CodeGen/SPARC/2008-10-10-InlineAsmMemoryOperand.ll (original)
+++ llvm/branches/release_36/test/CodeGen/SPARC/2008-10-10-InlineAsmMemoryOperand.ll Fri Jan 16 18:43:31 2015
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=sparc -no-integrated-as
+; RUN: llc < %s -march=sparc
 ; PR 1557
 
 target datalayout = "E-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64-f128:128:128"

Modified: llvm/branches/release_36/test/CodeGen/SPARC/inlineasm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/test/CodeGen/SPARC/inlineasm.ll?rev=226355&r1=226354&r2=226355&view=diff
==============================================================================
--- llvm/branches/release_36/test/CodeGen/SPARC/inlineasm.ll (original)
+++ llvm/branches/release_36/test/CodeGen/SPARC/inlineasm.ll Fri Jan 16 18:43:31 2015
@@ -1,4 +1,4 @@
-; RUN: llc -march=sparc -no-integrated-as <%s | FileCheck %s
+; RUN: llc -march=sparc <%s | FileCheck %s
 
 ; CHECK-LABEL: test_constraint_r
 ; CHECK:       add %o1, %o0, %o0

Modified: llvm/branches/release_36/test/CodeGen/SPARC/mult-alt-generic-sparc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/test/CodeGen/SPARC/mult-alt-generic-sparc.ll?rev=226355&r1=226354&r2=226355&view=diff
==============================================================================
--- llvm/branches/release_36/test/CodeGen/SPARC/mult-alt-generic-sparc.ll (original)
+++ llvm/branches/release_36/test/CodeGen/SPARC/mult-alt-generic-sparc.ll Fri Jan 16 18:43:31 2015
@@ -1,4 +1,4 @@
-; RUN: llc < %s -march=sparc -no-integrated-as
+; RUN: llc < %s -march=sparc
 ; ModuleID = 'mult-alt-generic.c'
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v64:64:64-n32"
 target triple = "sparc"