Remove llvm-upgrade and update tests.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@48137 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 36 insertions, 42 deletions

diff --git a/test/Linker/testlink1.ll b/test/Linker/testlink1.ll
index df89d84c17..4a9402576e 100644
--- a/test/Linker/testlink1.ll
+++ b/test/Linker/testlink1.ll
@@ -1,48 +1,42 @@
-; RUN: llvm-upgrade < %s | llvm-as > %t.bc
-; RUN: llvm-upgrade < %p/testlink2.ll | llvm-as > %t2.bc
+; RUN: llvm-as < %s > %t.bc
+; RUN: llvm-as < %p/testlink2.ll > %t2.bc
 ; RUN: llvm-link %t.bc %t2.bc
 
-%MyVar     = external global int
-%MyIntList = global { \2 *, int } { { \2, int }* null, int 17 }
-             external global int      ; int*:0
-
-%Inte = global int 1
-
-%AConst    = linkonce constant int 123
-
-%Intern1   = internal constant int 42
-%Intern2   = internal constant int 792
-
-; Initialized to point to external %MyVar
-%MyVarPtr  = linkonce global { int * }  { int * %MyVar }
-
-declare int "foo"(int %blah)      ;; Declared in testlink2.ll
-
-declare void "print"(int %Value)
-
-implementation
-
-void "main"()
-begin
-	%v1 = load int* %MyVar
-	call void %print(int %v1)    ;; Should start out 4
-
-	%idx = getelementptr { \2 *, int }* %MyIntList, long 0, uint 1
-	%v2 = load int* %idx
-	call void %print(int %v2)    ;; Should start out 17
-
-	call int %foo(int 5)         ;; Modify global variablesx
-
-	%v3 = load int* %MyVar
-	call void %print(int %v3)    ;; Should now be 5
-
-	%v4 = load int* %idx
-	call void %print(int %v4)    ;; Should start out 12
+@MyVar = external global i32		; <i32*> [#uses=3]
+@MyIntList = global { \2*, i32 } { { \2*, i32 }* null, i32 17 }		; <{ \2*, i32 }*> [#uses=1]
+external global i32		; <i32*>:0 [#uses=0]
+@Inte = global i32 1		; <i32*> [#uses=0]
+@AConst = linkonce constant i32 123		; <i32*> [#uses=0]
+@Intern1 = internal constant i32 42		; <i32*> [#uses=0]
+@Intern2 = internal constant i32 792		; <i32*> [#uses=0]
+@MyVarPtr = linkonce global { i32* } { i32* @MyVar }		; <{ i32* }*> [#uses=0]
+
+declare i32 @foo(i32)
+
+declare void @print(i32)
+
+define void @main() {
+	%v1 = load i32* @MyVar		; <i32> [#uses=1]
+	call void @print( i32 %v1 )
+	%idx = getelementptr { \2*, i32 }* @MyIntList, i64 0, i32 1		; <i32*> [#uses=2]
+	%v2 = load i32* %idx		; <i32> [#uses=1]
+	call void @print( i32 %v2 )
+	call i32 @foo( i32 5 )		; <i32>:1 [#uses=0]
+	%v3 = load i32* @MyVar		; <i32> [#uses=1]
+	call void @print( i32 %v3 )
+	%v4 = load i32* %idx		; <i32> [#uses=1]
+	call void @print( i32 %v4 )
+	ret void
+}
 
+define internal void @testintern() {
 	ret void
-end
+}
 
-internal void "testintern"() begin ret void end
-internal void "Testintern"() begin ret void end
-         void "testIntern"() begin ret void end
+define internal void @Testintern() {
+	ret void
+}
 
+define void @testIntern() {
+	ret void
+}