diff --git a/test/CodeGen/PowerPC/compare-fcmp-ord.ll b/test/CodeGen/PowerPC/compare-fcmp-ord.ll
index fc770f9..76732d0 100644
--- a/test/CodeGen/PowerPC/compare-fcmp-ord.ll
+++ b/test/CodeGen/PowerPC/compare-fcmp-ord.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | grep or | count 3
+; RUN: llvm-as < %s | llc -march=ppc32 -unwind-tables-optional | grep or | count 3
 ; This should produce one 'or' or 'cror' instruction per function.
 
 define i32 @test(double %x, double %y) nounwind  {
diff --git a/test/CodeGen/PowerPC/fold-li.ll b/test/CodeGen/PowerPC/fold-li.ll
index c59305f..89d5d64 100644
--- a/test/CodeGen/PowerPC/fold-li.ll
+++ b/test/CodeGen/PowerPC/fold-li.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | \
+; RUN: llvm-as < %s | llc -march=ppc32 -unwind-tables-optional | \
 ; RUN:   grep -v align | not grep li
 
 ;; Test that immediates are folded into these instructions correctly.
diff --git a/test/CodeGen/PowerPC/reg-coalesce-simple.ll b/test/CodeGen/PowerPC/reg-coalesce-simple.ll
index e346413..618ed99 100644
--- a/test/CodeGen/PowerPC/reg-coalesce-simple.ll
+++ b/test/CodeGen/PowerPC/reg-coalesce-simple.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | not grep or
+; RUN: llvm-as < %s | llc -march=ppc32 -unwind-tables-optional | not grep or
 
 %struct.foo = type { i32, i32, [0 x i8] }
 
diff --git a/test/CodeGen/PowerPC/rotl-2.ll b/test/CodeGen/PowerPC/rotl-2.ll
index 8336421..a39aa89 100644
--- a/test/CodeGen/PowerPC/rotl-2.ll
+++ b/test/CodeGen/PowerPC/rotl-2.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | grep rlwinm | count 4
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | grep rlwnm | count 2
-; RUN: llvm-as < %s | llc -march=ppc32 -disable-required-unwind-tables | not grep or
+; RUN: llvm-as < %s | llc -march=ppc32 -unwind-tables-optional | grep rlwinm | count 4
+; RUN: llvm-as < %s | llc -march=ppc32 -unwind-tables-optional | grep rlwnm | count 2
+; RUN: llvm-as < %s | llc -march=ppc32 -unwind-tables-optional | not grep or
 
 define i32 @rotl32(i32 %A, i8 %Amt) nounwind {
 	%shift.upgrd.1 = zext i8 %Amt to i32		; <i32> [#uses=1]
diff --git a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
index f3382c7..b98b070 100644
--- a/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
+++ b/test/CodeGen/X86/2006-03-02-InstrSchedBug.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -disable-required-unwind-tables -stats |& \
+; RUN: llvm-as < %s | llc -march=x86 -unwind-tables-optional -stats |& \
 ; RUN:   grep asm-printer | grep 7
 
 define i32 @g(i32 %a, i32 %b) nounwind {
diff --git a/test/CodeGen/X86/2006-05-02-InstrSched1.ll b/test/CodeGen/X86/2006-05-02-InstrSched1.ll
index 075b32e..913c2d4 100644
--- a/test/CodeGen/X86/2006-05-02-InstrSched1.ll
+++ b/test/CodeGen/X86/2006-05-02-InstrSched1.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | \
-; RUN:   llc -march=x86 -relocation-model=static -disable-required-unwind-tables -stats |& \
+; RUN:   llc -march=x86 -relocation-model=static -unwind-tables-optional -stats |& \
 ; RUN:   grep asm-printer | grep 14
 ;
 @size20 = external global i32		; <i32*> [#uses=1]
diff --git a/test/CodeGen/X86/2006-05-02-InstrSched2.ll b/test/CodeGen/X86/2006-05-02-InstrSched2.ll
index 6ba30bf..4d61463 100644
--- a/test/CodeGen/X86/2006-05-02-InstrSched2.ll
+++ b/test/CodeGen/X86/2006-05-02-InstrSched2.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -stats -disable-required-unwind-tables |& \
+; RUN: llvm-as < %s | llc -march=x86 -stats -unwind-tables-optional |& \
 ; RUN:   grep asm-printer | grep 13
 
 define void @_ZN9__gnu_cxx9hashtableISt4pairIKPKciES3_NS_4hashIS3_EESt10_Select1stIS5_E5eqstrSaIiEE14find_or_insertERKS5__cond_true456.i(i8* %tmp435.i, i32* %tmp449.i.out) nounwind {
diff --git a/test/CodeGen/X86/2006-05-11-InstrSched.ll b/test/CodeGen/X86/2006-05-11-InstrSched.ll
index 9d1c67a..27529be 100644
--- a/test/CodeGen/X86/2006-05-11-InstrSched.ll
+++ b/test/CodeGen/X86/2006-05-11-InstrSched.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats -disable-required-unwind-tables |&\
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats -unwind-tables-optional |&\
 ; RUN:     grep {asm-printer} | grep 32
 
 target datalayout = "e-p:32:32"
diff --git a/test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll b/test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll
index 9935f4c..6ba5c6f 100644
--- a/test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll
+++ b/test/CodeGen/X86/2007-09-17-ObjcFrameEH.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin -enable-eh -disable-required-unwind-tables | grep {isNullOrNil].eh"} | count 2
+; RUN: llvm-as < %s | llc -march=x86 -mtriple=i686-apple-darwin -enable-eh -unwind-tables-optional | grep {isNullOrNil].eh"} | count 2
 
 	%struct.NSString = type {  }
 	%struct._objc__method_prototype_list = type opaque
diff --git a/test/CodeGen/X86/constant-pool-remat-0.ll b/test/CodeGen/X86/constant-pool-remat-0.ll
index 9967bf8..ef7b171 100644
--- a/test/CodeGen/X86/constant-pool-remat-0.ll
+++ b/test/CodeGen/X86/constant-pool-remat-0.ll
@@ -1,7 +1,7 @@
 ; RUN: llvm-as < %s | llc -march=x86-64 | grep LCPI | count 3
-; RUN: llvm-as < %s | llc -march=x86-64 -stats -disable-required-unwind-tables -info-output-file - | grep asm-printer | grep 6
+; RUN: llvm-as < %s | llc -march=x86-64 -stats -unwind-tables-optional -info-output-file - | grep asm-printer | grep 6
 ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 | grep LCPI | count 3
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats -disable-required-unwind-tables -info-output-file - | grep asm-printer | grep 8
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -stats -unwind-tables-optional -info-output-file - | grep asm-printer | grep 8
 
 declare fastcc float @qux(float %y)
 
diff --git a/test/CodeGen/X86/dagcombine-cse.ll b/test/CodeGen/X86/dagcombine-cse.ll
index d5d11f3..b210bec 100644
--- a/test/CodeGen/X86/dagcombine-cse.ll
+++ b/test/CodeGen/X86/dagcombine-cse.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -disable-required-unwind-tables -stats |& grep asm-printer | grep 14
+; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -unwind-tables-optional -stats |& grep asm-printer | grep 14
 
 define i32 @t(i8* %ref_frame_ptr, i32 %ref_frame_stride, i32 %idxX, i32 %idxY) nounwind  {
 entry:
diff --git a/test/CodeGen/X86/iabs.ll b/test/CodeGen/X86/iabs.ll
index dd39039..e4078f1 100644
--- a/test/CodeGen/X86/iabs.ll
+++ b/test/CodeGen/X86/iabs.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86-64 -stats -disable-required-unwind-tables |& \
+; RUN: llvm-as < %s | llc -march=x86-64 -stats -unwind-tables-optional |& \
 ; RUN:   grep {6 .*Number of machine instrs printed}
 
 ;; Integer absolute value, should produce something at least as good as:
diff --git a/test/CodeGen/X86/or-branch.ll b/test/CodeGen/X86/or-branch.ll
index 820c995..6f6002f 100644
--- a/test/CodeGen/X86/or-branch.ll
+++ b/test/CodeGen/X86/or-branch.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -disable-required-unwind-tables | not grep set
+; RUN: llvm-as < %s | llc -march=x86 -unwind-tables-optional | not grep set
 
 define void @foo(i32 %X, i32 %Y, i32 %Z) nounwind {
 entry:
diff --git a/test/CodeGen/X86/select.ll b/test/CodeGen/X86/select.ll
index aeb0f7d..3acaa17 100644
--- a/test/CodeGen/X86/select.ll
+++ b/test/CodeGen/X86/select.ll
@@ -1,6 +1,6 @@
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=pentium -disable-required-unwind-tables
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -disable-required-unwind-tables
-; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -disable-required-unwind-tables | not grep set
+; RUN: llvm-as < %s | llc -march=x86 -mcpu=pentium -unwind-tables-optional
+; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -unwind-tables-optional
+; RUN: llvm-as < %s | llc -march=x86 -mcpu=yonah -unwind-tables-optional | not grep set
 
 define i1 @boolSel(i1 %A, i1 %B, i1 %C) nounwind {
 	%X = select i1 %A, i1 %B, i1 %C		; <i1> [#uses=1]
diff --git a/test/CodeGen/X86/setuge.ll b/test/CodeGen/X86/setuge.ll
index 37dff15..11dc753 100644
--- a/test/CodeGen/X86/setuge.ll
+++ b/test/CodeGen/X86/setuge.ll
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | llc -march=x86 -disable-required-unwind-tables | not grep set
+; RUN: llvm-as < %s | llc -march=x86 -unwind-tables-optional | not grep set
 
 declare i1 @llvm.isunordered.f32(float, float)
 
diff --git a/test/CodeGen/X86/zero-remat.ll b/test/CodeGen/X86/zero-remat.ll
index dc03226..d486563 100644
--- a/test/CodeGen/X86/zero-remat.ll
+++ b/test/CodeGen/X86/zero-remat.ll
@@ -1,5 +1,5 @@
 ; RUN: llvm-as < %s | llc -march=x86-64 | grep xor | count 4
-; RUN: llvm-as < %s | llc -march=x86-64 -stats -disable-required-unwind-tables -info-output-file - | grep asm-printer  | grep 12
+; RUN: llvm-as < %s | llc -march=x86-64 -stats -unwind-tables-optional -info-output-file - | grep asm-printer  | grep 12
 ; RUN: llvm-as < %s | llc -march=x86 | grep fldz
 ; RUN: llvm-as < %s | llc -march=x86 | not grep fldl