3 files changed, 13 insertions, 16 deletions
diff --git a/test/CodeGen/IA64/2005-08-22-LegalizerCrash.ll b/test/CodeGen/IA64/2005-08-22-LegalizerCrash.ll
index c160e7f..0551290 100644
--- a/test/CodeGen/IA64/2005-08-22-LegalizerCrash.ll
+++ b/test/CodeGen/IA64/2005-08-22-LegalizerCrash.ll
@@ -1,11 +1,10 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64
+; RUN: llvm-as < %s | llc -march=ia64
 
-%_ZN9__gnu_cxx16__stl_prime_listE = external global [28 x uint]		; <[28 x uint]*> [#uses=3]
+@_ZN9__gnu_cxx16__stl_prime_listE = external global [28 x i32]          ; <[28 x i32]*> [#uses=3]
 
-implementation   ; Functions:
-
-fastcc uint* %_ZSt11lower_boundIPKmmET_S2_S2_RKT0_(uint %__val.val) {
+define fastcc i32* @_ZSt11lower_boundIPKmmET_S2_S2_RKT0_(i32 %__val.val) {
 entry:
-	%retval = select bool setgt (int shr (int sub (int cast (uint* getelementptr ([28 x uint]* %_ZN9__gnu_cxx16__stl_prime_listE, int 0, int 28) to int), int cast ([28 x uint]* %_ZN9__gnu_cxx16__stl_prime_listE to int)), ubyte 2), int 0), uint* null, uint* getelementptr ([28 x uint]* %_ZN9__gnu_cxx16__stl_prime_listE, int 0, int 0)		; <uint*> [#uses=1]
-	ret uint* %retval
+        %retval = select i1 icmp slt (i32 ashr (i32 sub (i32 ptrtoint (i32* getelementptr ([28 x i32]* @_ZN9__gnu_cxx16__stl_prime_listE, i32 0, i32 28) to i32), i32 ptrtoint ([28 x i32]* @_ZN9__gnu_cxx16__stl_prime_listE to i32)), i32 2), i32 0), i32* null, i32* getelementptr ([28 x i32]* @_ZN9__gnu_cxx16__stl_prime_listE, i32 0, i32 0)         ; <i32*> [#uses=1]
+        ret i32* %retval
 }
+
diff --git a/test/CodeGen/IA64/2005-10-29-shladd.ll b/test/CodeGen/IA64/2005-10-29-shladd.ll
index 186e5e8..01ef68c 100644
--- a/test/CodeGen/IA64/2005-10-29-shladd.ll
+++ b/test/CodeGen/IA64/2005-10-29-shladd.ll
@@ -1,11 +1,9 @@
 ; this should turn into shladd 
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64 | grep shladd
+; RUN: llvm-as < %s | llc -march=ia64 | grep shladd
 
-implementation   ; Functions:
-
-long %bogglesmoggle(long %X, long %Y) {
-	%A = shl long %X, ubyte 3
-	%B = add long %A, %Y 
-        ret long %B
+define i64 @bogglesmoggle(i64 %X, i64 %Y) {
+        %A = shl i64 %X, 3              ; <i64> [#uses=1]
+        %B = add i64 %A, %Y             ; <i64> [#uses=1]
+        ret i64 %B
 }
 
diff --git a/test/CodeGen/IA64/ret-0.ll b/test/CodeGen/IA64/ret-0.ll
index 0f5cf89..fa2aac3 100644
--- a/test/CodeGen/IA64/ret-0.ll
+++ b/test/CodeGen/IA64/ret-0.ll
@@ -1,5 +1,5 @@
-; RUN: llvm-upgrade < %s | llvm-as | llc -march=ia64
+; RUN: llvm-as < %s | llc -march=ia64
 
-double %test() {
+define double @test() {
   ret double 0.0
 }