[SystemZ][z/OS] Remove temporary gnu as output on z/OSusers/redstar/removegnuasoutput

On z/OS, there is only HLASM as system assembler available. Since
all LIT tests are migrated, the temporary option ca now be removed.

1 files changed, 2 insertions, 8 deletions

diff --git a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
index 4356f7a..fa6a6a0 100644
--- a/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
+++ b/llvm/lib/Target/SystemZ/MCTargetDesc/SystemZMCTargetDesc.cpp
@@ -37,12 +37,6 @@ using namespace llvm;
 #define GET_REGINFO_MC_DESC
 #include "SystemZGenRegisterInfo.inc"
 
-// Temporary option to assist with the migration to a new HLASMAsmStreamer on
-// z/OS
-static cl::opt<bool> GNUAsOnzOSCL("emit-gnuas-syntax-on-zos",
-                                  cl::desc("Emit GNU Assembly Syntax on z/OS."),
-                                  cl::init(false));
-
 const unsigned SystemZMC::GR32Regs[16] = {
     SystemZ::R0L,  SystemZ::R1L,  SystemZ::R2L,  SystemZ::R3L,
     SystemZ::R4L,  SystemZ::R5L,  SystemZ::R6L,  SystemZ::R7L,
@@ -203,7 +197,7 @@ static MCInstPrinter *createSystemZMCInstPrinter(const Triple &T,
 static MCTargetStreamer *createAsmTargetStreamer(MCStreamer &S,
                                                  formatted_raw_ostream &OS,
                                                  MCInstPrinter *InstPrint) {
-  if (S.getContext().getTargetTriple().isOSzOS() && !GNUAsOnzOSCL)
+  if (S.getContext().getTargetTriple().isOSzOS())
     return new SystemZTargetHLASMStreamer(S, OS);
   else
     return new SystemZTargetGNUStreamer(S, OS);
@@ -215,7 +209,7 @@ static MCStreamer *createSystemZAsmStreamer(
     std::unique_ptr<MCAsmBackend> TAB) {
 
   auto TT = Ctx.getTargetTriple();
-  if (TT.isOSzOS() && !GNUAsOnzOSCL)
+  if (TT.isOSzOS())
     return new SystemZHLASMAsmStreamer(Ctx, std::move(OS), std::move(IP),
                                        std::move(CE), std::move(TAB));