diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 98ebebe50ec0..4e05814b1a1c 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -54,7 +54,7 @@ using namespace llvm;
 static cl::opt<bool>
 EnableValueProp("enable-value-prop", cl::Hidden);
 static cl::opt<bool>
-EnableLegalizeTypes("enable-legalize-types", cl::Hidden);
+DisableLegalizeTypes("disable-legalize-types", cl::Hidden);
 static cl::opt<bool>
 EnableFastISelVerbose("fast-isel-verbose", cl::Hidden,
           cl::desc("Enable verbose messages in the \"fast\" "
@@ -572,7 +572,7 @@ void SelectionDAGISel::CodeGenAndEmitDAG() {
   
   // Second step, hack on the DAG until it only uses operations and types that
   // the target supports.
-  if (EnableLegalizeTypes) {// Enable this some day.
+  if (!DisableLegalizeTypes) {
     if (ViewLegalizeTypesDAGs) CurDAG->viewGraph("legalize-types input for " +
                                                  BlockName);
 
diff --git a/llvm/test/CodeGen/Generic/2007-11-21-UndeadIllegalNode.ll b/llvm/test/CodeGen/Generic/2007-11-21-UndeadIllegalNode.ll
index b0a27640be77..cedee6ffbe0d 100644
--- a/llvm/test/CodeGen/Generic/2007-11-21-UndeadIllegalNode.ll
+++ b/llvm/test/CodeGen/Generic/2007-11-21-UndeadIllegalNode.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -o -
+; RUN: llvm-as < %s | llc -o -
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
 target triple = "i686-pc-linux-gnu"
diff --git a/llvm/test/CodeGen/Generic/APIntLoadStore.ll b/llvm/test/CodeGen/Generic/APIntLoadStore.ll
index bb3b19424028..bee7c6329808 100644
--- a/llvm/test/CodeGen/Generic/APIntLoadStore.ll
+++ b/llvm/test/CodeGen/Generic/APIntLoadStore.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types
+; RUN: llvm-as < %s | llc
 @i1_l = external global i1		; <i1*> [#uses=1]
 @i1_s = external global i1		; <i1*> [#uses=1]
 @i2_l = external global i2		; <i2*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/APIntParam.ll b/llvm/test/CodeGen/Generic/APIntParam.ll
index 8ce45d5ccd53..c1a3a449bcc9 100644
--- a/llvm/test/CodeGen/Generic/APIntParam.ll
+++ b/llvm/test/CodeGen/Generic/APIntParam.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types
+; RUN: llvm-as < %s | llc
 @i1_s = external global i1		; <i1*> [#uses=1]
 @i2_s = external global i2		; <i2*> [#uses=1]
 @i3_s = external global i3		; <i3*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/APIntSextParam.ll b/llvm/test/CodeGen/Generic/APIntSextParam.ll
index fa657bbc95be..c5927fcf732d 100644
--- a/llvm/test/CodeGen/Generic/APIntSextParam.ll
+++ b/llvm/test/CodeGen/Generic/APIntSextParam.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types
+; RUN: llvm-as < %s | llc
 @i1_s = external global i1		; <i1*> [#uses=1]
 @i2_s = external global i2		; <i2*> [#uses=1]
 @i3_s = external global i3		; <i3*> [#uses=1]
diff --git a/llvm/test/CodeGen/Generic/APIntZextParam.ll b/llvm/test/CodeGen/Generic/APIntZextParam.ll
index 926e8287121f..71d327063b06 100644
--- a/llvm/test/CodeGen/Generic/APIntZextParam.ll
+++ b/llvm/test/CodeGen/Generic/APIntZextParam.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types
+; RUN: llvm-as < %s | llc
 @i1_s = external global i1		; <i1*> [#uses=1]
 @i2_s = external global i2		; <i2*> [#uses=1]
 @i3_s = external global i3		; <i3*> [#uses=1]
diff --git a/llvm/test/CodeGen/Mips/2008-06-05-Carry.ll b/llvm/test/CodeGen/Mips/2008-06-05-Carry.ll
index c2c5e5eea071..9cd7c80577a1 100644
--- a/llvm/test/CodeGen/Mips/2008-06-05-Carry.ll
+++ b/llvm/test/CodeGen/Mips/2008-06-05-Carry.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep subu %t | count 2
 ; RUN: grep addu %t | count 4
 
diff --git a/llvm/test/CodeGen/Mips/2008-07-03-SRet.ll b/llvm/test/CodeGen/Mips/2008-07-03-SRet.ll
index b2813f2e6735..53ceaf360653 100644
--- a/llvm/test/CodeGen/Mips/2008-07-03-SRet.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-03-SRet.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips |  \
-; RUN:    grep {sw.*(\$4)} | count 3
+; RUN: llvm-as < %s | llc -march=mips | grep {sw.*(\$4)} | count 3
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
diff --git a/llvm/test/CodeGen/Mips/2008-07-05-ByVal.ll b/llvm/test/CodeGen/Mips/2008-07-05-ByVal.ll
index 6e14b784da8c..2d1101a25302 100644
--- a/llvm/test/CodeGen/Mips/2008-07-05-ByVal.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-05-ByVal.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips |  \
-; RUN:    grep {lw.*(\$4)} | count 2
+; RUN: llvm-as < %s | llc -march=mips | grep {lw.*(\$4)} | count 2
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
diff --git a/llvm/test/CodeGen/Mips/2008-07-06-fadd64.ll b/llvm/test/CodeGen/Mips/2008-07-06-fadd64.ll
index d85e1e01b4a5..95792ff15719 100644
--- a/llvm/test/CodeGen/Mips/2008-07-06-fadd64.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-06-fadd64.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
-; RUN: grep __adddf3
+; RUN: llvm-as < %s | llc -march=mips | grep __adddf3
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
diff --git a/llvm/test/CodeGen/Mips/2008-07-07-FPExtend.ll b/llvm/test/CodeGen/Mips/2008-07-07-FPExtend.ll
index 265da730b27f..e0e7d767b1d8 100644
--- a/llvm/test/CodeGen/Mips/2008-07-07-FPExtend.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-07-FPExtend.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
-; RUN: grep __extendsfdf2
+; RUN: llvm-as < %s | llc -march=mips | grep __extendsfdf2
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
diff --git a/llvm/test/CodeGen/Mips/2008-07-07-Float2Int.ll b/llvm/test/CodeGen/Mips/2008-07-07-Float2Int.ll
index ccaac0edd564..f2f0374c3168 100644
--- a/llvm/test/CodeGen/Mips/2008-07-07-Float2Int.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-07-Float2Int.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
-; RUN: grep trunc.w.s | count 3
+; RUN: llvm-as < %s | llc -march=mips | grep trunc.w.s | count 3
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
diff --git a/llvm/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll b/llvm/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll
index bf2b4d082a55..ab6a9c8edae8 100644
--- a/llvm/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep __floatsidf   %t | count 1
 ; RUN: grep __floatunsidf %t | count 1
 ; RUN: grep __fixdfsi %t | count 1
diff --git a/llvm/test/CodeGen/Mips/2008-07-15-InternalConstant.ll b/llvm/test/CodeGen/Mips/2008-07-15-InternalConstant.ll
index ea0f5fef062e..4d218cf6b4bc 100644
--- a/llvm/test/CodeGen/Mips/2008-07-15-InternalConstant.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-15-InternalConstant.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t 
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep {rodata.str1.4,"aMS",@progbits}  %t | count 1
 ; RUN: grep {r.data,}  %t | count 1
 ; RUN: grep {\%hi} %t | count 2
diff --git a/llvm/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll b/llvm/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll
index 872f65d847f3..fc03bb5fef0d 100644
--- a/llvm/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep seh %t | count 1
 ; RUN: grep seb %t | count 1
 
diff --git a/llvm/test/CodeGen/Mips/2008-07-22-Cstpool.ll b/llvm/test/CodeGen/Mips/2008-07-22-Cstpool.ll
index 770cc69c04f5..99eccf500db5 100644
--- a/llvm/test/CodeGen/Mips/2008-07-22-Cstpool.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-22-Cstpool.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t 
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep {CPI\[01\]_\[01\]:} %t | count 2
 ; RUN: grep {rodata.cst4,"aM",@progbits} %t | count 1
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
diff --git a/llvm/test/CodeGen/Mips/2008-07-23-fpcmp.ll b/llvm/test/CodeGen/Mips/2008-07-23-fpcmp.ll
index 3fcec1629d84..7bc1f42d10a4 100644
--- a/llvm/test/CodeGen/Mips/2008-07-23-fpcmp.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-23-fpcmp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep {c\\..*\\.s} %t | count 3
 ; RUN: grep {bc1\[tf\]} %t | count 3
 
diff --git a/llvm/test/CodeGen/Mips/2008-07-29-icmp.ll b/llvm/test/CodeGen/Mips/2008-07-29-icmp.ll
index ee2b71fa2357..5d03a1986b2d 100644
--- a/llvm/test/CodeGen/Mips/2008-07-29-icmp.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-29-icmp.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
-; RUN: grep {b\[ne\]\[eq\]} | count 1
+; RUN: llvm-as < %s | llc -march=mips | grep {b\[ne\]\[eq\]} | count 1
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
diff --git a/llvm/test/CodeGen/Mips/2008-07-31-fcopysign.ll b/llvm/test/CodeGen/Mips/2008-07-31-fcopysign.ll
index a1f4443d645e..de11ac77c01e 100644
--- a/llvm/test/CodeGen/Mips/2008-07-31-fcopysign.ll
+++ b/llvm/test/CodeGen/Mips/2008-07-31-fcopysign.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep abs.s  %t | count 1
 ; RUN: grep neg.s %t | count 1
 
diff --git a/llvm/test/CodeGen/Mips/2008-08-01-AsmInline.ll b/llvm/test/CodeGen/Mips/2008-08-01-AsmInline.ll
index 1bd645af7389..fea5730f73d1 100644
--- a/llvm/test/CodeGen/Mips/2008-08-01-AsmInline.ll
+++ b/llvm/test/CodeGen/Mips/2008-08-01-AsmInline.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t 
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep mfhi  %t | count 1
 ; RUN: grep mflo  %t | count 1
 ; RUN: grep multu %t | count 1
diff --git a/llvm/test/CodeGen/Mips/2008-08-03-fabs64.ll b/llvm/test/CodeGen/Mips/2008-08-03-fabs64.ll
index 4ce1b1c70703..8495bfe11290 100644
--- a/llvm/test/CodeGen/Mips/2008-08-03-fabs64.ll
+++ b/llvm/test/CodeGen/Mips/2008-08-03-fabs64.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep {lui.*32767} %t | count 1
 ; RUN: grep {ori.*65535} %t | count 1
 
diff --git a/llvm/test/CodeGen/Mips/2008-08-04-Bitconvert.ll b/llvm/test/CodeGen/Mips/2008-08-04-Bitconvert.ll
index fca3c00c69d4..f7a64c32f27b 100644
--- a/llvm/test/CodeGen/Mips/2008-08-04-Bitconvert.ll
+++ b/llvm/test/CodeGen/Mips/2008-08-04-Bitconvert.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: llvm-as < %s | llc -march=mips -f -o %t
 ; RUN: grep mtc1 %t | count 1
 ; RUN: grep mfc1 %t | count 1
 
diff --git a/llvm/test/CodeGen/Mips/2008-08-06-Alloca.ll b/llvm/test/CodeGen/Mips/2008-08-06-Alloca.ll
index aaac67ea62c4..34596ea029a0 100644
--- a/llvm/test/CodeGen/Mips/2008-08-06-Alloca.ll
+++ b/llvm/test/CodeGen/Mips/2008-08-06-Alloca.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
-; RUN: grep {subu.*sp} | count 2
+; RUN: llvm-as < %s | llc -march=mips | grep {subu.*sp} | count 2
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
diff --git a/llvm/test/CodeGen/Mips/2008-08-07-FPRound.ll b/llvm/test/CodeGen/Mips/2008-08-07-FPRound.ll
index 1382f8767510..fd41ff1f8cf2 100644
--- a/llvm/test/CodeGen/Mips/2008-08-07-FPRound.ll
+++ b/llvm/test/CodeGen/Mips/2008-08-07-FPRound.ll
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
-; RUN: grep __truncdfsf2 | count 1
+; RUN: llvm-as < %s | llc -march=mips | grep __truncdfsf2 | count 1
 
 target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
 target triple = "mipsallegrexel-psp-elf"
diff --git a/llvm/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll b/llvm/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll
index 5a7d9a9d22c9..e1dc7b6bb27c 100644
--- a/llvm/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll
+++ b/llvm/test/CodeGen/X86/2008-10-16-VecUnaryOp.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -enable-legalize-types
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2
 ; PR2762
 define void @foo(<4 x i32>* %p, <4 x double>* %q) {
   %n = load <4 x i32>* %p
diff --git a/llvm/test/CodeGen/X86/2008-10-24-FlippedCompare.ll b/llvm/test/CodeGen/X86/2008-10-24-FlippedCompare.ll
index 8a7987db5991..d6ae05e3798e 100644
--- a/llvm/test/CodeGen/X86/2008-10-24-FlippedCompare.ll
+++ b/llvm/test/CodeGen/X86/2008-10-24-FlippedCompare.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -enable-legalize-types -march=x86 -mattr=+sse2 -o - | not grep {ucomiss\[^,\]*esp}
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -o - | not grep {ucomiss\[^,\]*esp}
 
 define void @f(float %wt) {
 entry: