For PR761:
Remove "target endian/pointersize" or add "target datalayout" to make
the test parse properly or set the datalayout because defaults changes.

For PR645:
Make global names use the @ prefix.

For llvm-upgrade changes:
Fix test cases or completely remove use of llvm-upgrade for test cases
that cannot survive the new renaming or upgrade capabilities.

llvm-svn: 33533
diff --git a/llvm/test/Transforms/SimplifyLibCalls/StrLen.ll b/llvm/test/Transforms/SimplifyLibCalls/StrLen.ll
index 20aa7a8..d50b7c5 100644
--- a/llvm/test/Transforms/SimplifyLibCalls/StrLen.ll
+++ b/llvm/test/Transforms/SimplifyLibCalls/StrLen.ll
@@ -1,5 +1,8 @@
 ; Test that the StrCatOptimizer works correctly
-; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | not grep 'call.*strlen'
+; RUN: llvm-upgrade < %s | llvm-as | opt -simplify-libcalls | llvm-dis | \
+; RUN:    not grep 'call.*strlen'
+
+target datalayout = "e-p:32:32"
 
 declare uint %strlen(sbyte*)
 %hello      = constant [6 x sbyte] c"hello\00"