diff --git a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
index 9d85f4d80488..5b554ca82a12 100644
--- a/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
+++ b/llvm/lib/Target/X86/AsmParser/X86AsmParser.cpp
@@ -417,4 +417,23 @@ extern "C" void LLVMInitializeX86AsmParser() {
   RegisterAsmParser<X86ATTAsmParser> Y(TheX86_64Target);
 }
 
+// FIXME: Disabled for now, this is causing gcc-4.0 to run out of memory during
+// building.
+#if 0
+
 #include "X86GenAsmMatcher.inc"
+
+#else
+
+bool X86ATTAsmParser::MatchInstruction(SmallVectorImpl<X86Operand> &Operands,
+                                       MCInst &Inst) {
+  return false;
+}
+  
+bool X86ATTAsmParser::MatchRegisterName(const StringRef &Name,
+                                        unsigned &RegNo) {
+  return false;
+}
+
+#endif
+
diff --git a/llvm/test/MC/AsmParser/labels.s b/llvm/test/MC/AsmParser/labels.s
index a5998c4dc347..6eb7c0f8e021 100644
--- a/llvm/test/MC/AsmParser/labels.s
+++ b/llvm/test/MC/AsmParser/labels.s
@@ -1,5 +1,8 @@
 // RUN: llvm-mc -triple i386-unknown-unknown %s | FileCheck %s
 
+// FIXME: Disabled until the generated code stops crashing gcc 4.0.        
+// XFAIL: *
+
         .data
 // CHECK: a:
 a:
diff --git a/llvm/test/MC/AsmParser/x86_instructions.s b/llvm/test/MC/AsmParser/x86_instructions.s
index f648112fc974..3ab8ac17d40e 100644
--- a/llvm/test/MC/AsmParser/x86_instructions.s
+++ b/llvm/test/MC/AsmParser/x86_instructions.s
@@ -1,5 +1,8 @@
 // FIXME: Switch back to FileCheck once we print actual instructions
 
+// FIXME: Disabled until the generated code stops crashing gcc 4.0.        
+// XFAIL: *
+        
 // RUN: llvm-mc -triple i386-unknown-unknown %s > %t
 
 // RUN: grep {MCInst(opcode=.*, operands=.reg:2, reg:0, reg:2.)} %t