2 files changed, 2 insertions, 22 deletions
diff --git a/lib/Target/X86/X86Subtarget.cpp b/lib/Target/X86/X86Subtarget.cpp
index b05e674ff0..80f12b008c 100644
--- a/lib/Target/X86/X86Subtarget.cpp
+++ b/lib/Target/X86/X86Subtarget.cpp
@@ -16,11 +16,7 @@
 using namespace llvm;
 
 X86Subtarget::X86Subtarget(const Module &M, const std::string &FS)
-  : TargetSubtarget(), stackAlignment(8),
-    indirectExternAndWeakGlobals(false), asmDarwinLinkerStubs(false),
-    asmLeadingUnderscore(false), asmAlignmentIsInBytes(false),
-    asmPrintDotLocalConstants(false), asmPrintDotLCommConstants(false),
-    asmPrintConstantAlignment(false) {
+  : stackAlignment(8), indirectExternAndWeakGlobals(false) {
       
   // Default to ELF unless otherwise specified.
   TargetType = isELF;
@@ -46,17 +42,8 @@ X86Subtarget::X86Subtarget(const Module &M, const std::string &FS)
 #endif
   }
 
-  switch (TargetType) {
-  case isCygwin:
-    asmLeadingUnderscore = true;
-    break;
-  case isDarwin:
+  if (TargetType == isDarwin) {
     stackAlignment = 16;
     indirectExternAndWeakGlobals = true;
-    asmDarwinLinkerStubs = true;
-    asmLeadingUnderscore = true;
-    asmPrintDotLCommConstants = true;
-    break;
-  default: break;
   }
 }
diff --git a/lib/Target/X86/X86Subtarget.h b/lib/Target/X86/X86Subtarget.h
index dba2bc6b76..22b611bfff 100644
--- a/lib/Target/X86/X86Subtarget.h
+++ b/lib/Target/X86/X86Subtarget.h
@@ -30,13 +30,6 @@ protected:
   /// Used by instruction selector
   bool indirectExternAndWeakGlobals;
 
-  /// Used by the asm printer
-  bool asmDarwinLinkerStubs;
-  bool asmLeadingUnderscore;
-  bool asmAlignmentIsInBytes;
-  bool asmPrintDotLocalConstants;
-  bool asmPrintDotLCommConstants;
-  bool asmPrintConstantAlignment;
 public:
   enum {
     isELF, isCygwin, isDarwin, isWindows