From d369dd1c0660b9fde723215e82d82019a2d4c296 Mon Sep 17 00:00:00 2001
From: Brad Smith <brad@comstyle.com>
Date: Sat, 2 Apr 2022 02:18:30 -0400
Subject: [PATCH] [clang][Sparc] Enable IAS on the remaining OS's

---
 clang/lib/Driver/ToolChains/Gnu.cpp | 10 +++-------
 clang/test/Driver/sparc-as.c        |  4 ++--
 clang/test/Driver/sparcv9-as.c      |  4 ++--
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Gnu.cpp b/clang/lib/Driver/ToolChains/Gnu.cpp
index bb3cba6..fe4d997 100644
--- a/clang/lib/Driver/ToolChains/Gnu.cpp
+++ b/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -2746,6 +2746,9 @@ bool Generic_GCC::IsIntegratedAssemblerDefault() const {
   case llvm::Triple::ppc64le:
   case llvm::Triple::riscv32:
   case llvm::Triple::riscv64:
+  case llvm::Triple::sparc:
+  case llvm::Triple::sparcel:
+  case llvm::Triple::sparcv9:
   case llvm::Triple::systemz:
   case llvm::Triple::mips:
   case llvm::Triple::mipsel:
@@ -2754,13 +2757,6 @@ bool Generic_GCC::IsIntegratedAssemblerDefault() const {
   case llvm::Triple::msp430:
   case llvm::Triple::m68k:
     return true;
-  case llvm::Triple::sparc:
-  case llvm::Triple::sparcel:
-  case llvm::Triple::sparcv9:
-    if (getTriple().isOSFreeBSD() || getTriple().isOSOpenBSD() ||
-        getTriple().isOSSolaris())
-      return true;
-    return false;
   default:
     return false;
   }
diff --git a/clang/test/Driver/sparc-as.c b/clang/test/Driver/sparc-as.c
index 65eeb4d..8405cfd 100644
--- a/clang/test/Driver/sparc-as.c
+++ b/clang/test/Driver/sparc-as.c
@@ -1,7 +1,7 @@
-// Make sure Sparc does not use the integrated assembler by default.
+// Make sure Sparc does use the integrated assembler by default.
 
 // RUN: %clang -target sparc-linux -### -c %s 2>&1 \
-// RUN: | FileCheck -check-prefix=NO-IAS %s
+// RUN: | FileCheck -check-prefix=IAS %s
 
 // RUN: %clang -target sparc-linux -fintegrated-as -### -c %s 2>&1 \
 // RUN: | FileCheck -check-prefix=IAS %s
diff --git a/clang/test/Driver/sparcv9-as.c b/clang/test/Driver/sparcv9-as.c
index 3b641cc..5ce9abe 100644
--- a/clang/test/Driver/sparcv9-as.c
+++ b/clang/test/Driver/sparcv9-as.c
@@ -1,7 +1,7 @@
-// Make sure SparcV9 does not use the integrated assembler by default.
+// Make sure SparcV9 does use the integrated assembler by default.
 
 // RUN: %clang -target sparcv9-linux -### -c %s 2>&1 \
-// RUN: | FileCheck -check-prefix=NO-IAS %s
+// RUN: | FileCheck -check-prefix=IAS %s
 
 // RUN: %clang -target sparcv9-linux -fintegrated-as -### -c %s 2>&1 \
 // RUN: | FileCheck -check-prefix=IAS %s
-- 
2.7.4