Remove workaround for call+bundle_lock under gas in LowerTlsAddr

lib/Target/X86/X86MCInstLower.cpp

 //===-- X86MCInstLower.cpp - Convert X86 MachineInstr to an MCInst --------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
 // This file contains code to lower X86 MachineInstrs to their corresponding
@@ skipping 598 matching lines @@
 
   bool is64Bits = MI.getOpcode() == X86::TLS_addr64 ||
                   MI.getOpcode() == X86::TLS_base_addr64;
 
   bool needsPadding = MI.getOpcode() == X86::TLS_addr64;
 
   MCContext &context = OutStreamer.getContext();
 
   Triple TT(STI.getTargetTriple());
   // @LOCALMOD-START
-  // There are 2 issues with this code. First, instead of testing the target OS
-  // we should add (upstream) a method to one of the MC classes to test whether
-  // bundle alignment is enabled (currently only the AsmBackend has this, which
-  // can't be used when emitting asm files). That facility should be used here
-  // and in MCAsmStreamer.cpp (this should be done once we are unblocked from
-  // switching to gas by default, so we know exactly where we need it).
-  // Secondly, a bug in gas prevents us from using .bundle_lock with the call
-  // here (https://code.google.com/p/nativeclient/issues/detail?id=4008).
-  // This is actually ok for nacl-clang for now because the old x86 ld linker
-  // has a hack that allows it to rewrite TLS GD sequences even in the presence
-  // of nop padding. For PNaCl (with gold) we do need the sequence to be bundle
-  // locked, so we use !hasRawTextSupport as a proxy for that. Once bug 4008
-  // is fixed we will use the bundle-locks unconditionally with NaCl.
-  bool needsBundleLock = (TT.getOS() == Triple::NaCl &&
-                          !OutStreamer.hasRawTextSupport());
+  // TODO(dschuff): Instead of testing the target OS we should add (upstream) a
+  // method to one of the MC classes to test whether bundle alignment is enabled
+  // (currently only the AsmBackend has this, which can't be used when emitting
+  // asm files). That facility should be used here and in MCAsmStreamer.cpp
+  // (this should be done once we are unblocked from switching to gas by
+  // default, so we know exactly where we need it).
+  const bool needsBundleLock = TT.getOS() == Triple::NaCl;
   if (needsBundleLock)
     OutStreamer.EmitBundleLock(false);
   // @LOCALMOD-END
   if (needsPadding)
     OutStreamer.EmitInstruction(MCInstBuilder(X86::DATA16_PREFIX), STI);
 
   MCSymbolRefExpr::VariantKind SRVK;
   switch (MI.getOpcode()) {
     case X86::TLS_addr32:
     case X86::TLS_addr64:
@@ skipping 320 matching lines @@
 
   case X86::SEH_EndPrologue:
     OutStreamer.EmitWinCFIEndProlog();
     return;
   }
 
   MCInst TmpInst;
   MCInstLowering.Lower(MI, TmpInst);
   EmitToStreamer(OutStreamer, TmpInst);
 }