diff --git a/llvm/test/CodeGen/XCore/threads.ll b/llvm/test/CodeGen/XCore/threads.ll
index 175182f340bf9..c24c6568ab27d 100644
--- a/llvm/test/CodeGen/XCore/threads.ll
+++ b/llvm/test/CodeGen/XCore/threads.ll
@@ -1,21 +1,21 @@
-; RUN: llc -opaque-pointers=0 -mtriple=xcore-unknown-unknown < %s | FileCheck %s
-; RUN: llc -opaque-pointers=0 -mtriple=xcore-unknown-unknown -O=0 < %s | FileCheck %s -check-prefix=PHINODE
+; RUN: llc -mtriple=xcore-unknown-unknown < %s | FileCheck %s
+; RUN: llc -mtriple=xcore-unknown-unknown -O=0 < %s | FileCheck %s -check-prefix=PHINODE
 
-declare i8 addrspace(1)* @llvm.xcore.getst.p1i8.p1i8(i8 addrspace(1)* %r)
-declare void @llvm.xcore.msync.p1i8(i8 addrspace(1)* %r)
+declare ptr addrspace(1) @llvm.xcore.getst.p1i8.p1i8(ptr addrspace(1) %r)
+declare void @llvm.xcore.msync.p1i8(ptr addrspace(1) %r)
 declare void @llvm.xcore.ssync()
-declare void @llvm.xcore.mjoin.p1i8(i8 addrspace(1)* %r)
-declare void @llvm.xcore.initsp.p1i8(i8 addrspace(1)* %r, i8* %value)
-declare void @llvm.xcore.initpc.p1i8(i8 addrspace(1)* %r, i8* %value)
-declare void @llvm.xcore.initlr.p1i8(i8 addrspace(1)* %r, i8* %value)
-declare void @llvm.xcore.initcp.p1i8(i8 addrspace(1)* %r, i8* %value)
-declare void @llvm.xcore.initdp.p1i8(i8 addrspace(1)* %r, i8* %value)
-
-define i8 addrspace(1)* @test_getst(i8 addrspace(1)* %r) {
+declare void @llvm.xcore.mjoin.p1i8(ptr addrspace(1) %r)
+declare void @llvm.xcore.initsp.p1i8(ptr addrspace(1) %r, ptr %value)
+declare void @llvm.xcore.initpc.p1i8(ptr addrspace(1) %r, ptr %value)
+declare void @llvm.xcore.initlr.p1i8(ptr addrspace(1) %r, ptr %value)
+declare void @llvm.xcore.initcp.p1i8(ptr addrspace(1) %r, ptr %value)
+declare void @llvm.xcore.initdp.p1i8(ptr addrspace(1) %r, ptr %value)
+
+define ptr addrspace(1) @test_getst(ptr addrspace(1) %r) {
 ; CHECK-LABEL: test_getst:
 ; CHECK: getst r0, res[r0]
-  %result = call i8 addrspace(1)* @llvm.xcore.getst.p1i8.p1i8(i8 addrspace(1)* %r)
-  ret i8 addrspace(1)* %result
+  %result = call ptr addrspace(1) @llvm.xcore.getst.p1i8.p1i8(ptr addrspace(1) %r)
+  ret ptr addrspace(1) %result
 }
 
 define void @test_ssync() {
@@ -25,52 +25,52 @@ define void @test_ssync() {
   ret void
 }
 
-define void @test_mjoin(i8 addrspace(1)* %r) {
+define void @test_mjoin(ptr addrspace(1) %r) {
 ; CHECK-LABEL: test_mjoin:
 ; CHECK: mjoin res[r0]
-  call void @llvm.xcore.mjoin.p1i8(i8 addrspace(1)* %r)
+  call void @llvm.xcore.mjoin.p1i8(ptr addrspace(1) %r)
   ret void
 }
 
-define void @test_initsp(i8 addrspace(1)* %t, i8* %src) {
+define void @test_initsp(ptr addrspace(1) %t, ptr %src) {
 ; CHECK-LABEL: test_initsp:
 ; CHECK: init t[r0]:sp, r1
-  call void @llvm.xcore.initsp.p1i8(i8 addrspace(1)* %t, i8* %src)
+  call void @llvm.xcore.initsp.p1i8(ptr addrspace(1) %t, ptr %src)
   ret void
 }
 
-define void @test_initpc(i8 addrspace(1)* %t, i8* %src) {
+define void @test_initpc(ptr addrspace(1) %t, ptr %src) {
 ; CHECK-LABEL: test_initpc:
 ; CHECK: init t[r0]:pc, r1
-  call void @llvm.xcore.initpc.p1i8(i8 addrspace(1)* %t, i8* %src)
+  call void @llvm.xcore.initpc.p1i8(ptr addrspace(1) %t, ptr %src)
   ret void
 }
 
-define void @test_initlr(i8 addrspace(1)* %t, i8* %src) {
+define void @test_initlr(ptr addrspace(1) %t, ptr %src) {
 ; CHECK-LABEL: test_initlr:
 ; CHECK: init t[r0]:lr, r1
-  call void @llvm.xcore.initlr.p1i8(i8 addrspace(1)* %t, i8* %src)
+  call void @llvm.xcore.initlr.p1i8(ptr addrspace(1) %t, ptr %src)
   ret void
 }
 
-define void @test_initcp(i8 addrspace(1)* %t, i8* %src) {
+define void @test_initcp(ptr addrspace(1) %t, ptr %src) {
 ; CHECK-LABEL: test_initcp:
 ; CHECK: init t[r0]:cp, r1
-  call void @llvm.xcore.initcp.p1i8(i8 addrspace(1)* %t, i8* %src)
+  call void @llvm.xcore.initcp.p1i8(ptr addrspace(1) %t, ptr %src)
   ret void
 }
 
-define void @test_initdp(i8 addrspace(1)* %t, i8* %src) {
+define void @test_initdp(ptr addrspace(1) %t, ptr %src) {
 ; CHECK-LABEL: test_initdp:
 ; CHECK: init t[r0]:dp, r1
-  call void @llvm.xcore.initdp.p1i8(i8 addrspace(1)* %t, i8* %src)
+  call void @llvm.xcore.initdp.p1i8(ptr addrspace(1) %t, ptr %src)
   ret void
 }
 
 @tl = thread_local global [3 x i32] zeroinitializer
 @tle = external thread_local global [2 x i32]
 
-define i32* @f_tl() {
+define ptr @f_tl() {
 ; CHECK-LABEL: f_tl:
 ; CHECK: get r11, id
 ; CHECK: ldaw [[R0:r[0-9]]], dp[tl]
@@ -78,17 +78,17 @@ define i32* @f_tl() {
 ; CHECK: ldc [[R2:r[0-9]]], 12
 ; r0 = id*12 + 8 + &tl
 ; CHECK: lmul {{r[0-9]}}, r0, r11, [[R2]], [[R0]], [[R1]]
-  ret i32* getelementptr inbounds ([3 x i32], [3 x i32]* @tl, i32 0, i32 2)
+  ret ptr getelementptr inbounds ([3 x i32], ptr @tl, i32 0, i32 2)
 }
 
-define i32* @f_tle() {
+define ptr @f_tle() {
 ; CHECK-LABEL: f_tle:
 ; CHECK: get r11, id
 ; CHECK: shl [[R0:r[0-9]]], r11, 3
 ; CHECK: ldaw [[R1:r[0-9]]], dp[tle]
 ; r0 = &tl + id*8
 ; CHECK: add r0, [[R1]], [[R0]]
-  ret i32* getelementptr inbounds ([2 x i32], [2 x i32]* @tle, i32 0, i32 0)
+  ret ptr getelementptr inbounds ([2 x i32], ptr @tle, i32 0, i32 0)
 }
 
 define i32 @f_tlExpr () {
@@ -99,8 +99,8 @@ define i32 @f_tlExpr () {
 ; CHECK: add [[R2:r[0-9]]], [[R1]], [[R0]]
 ; CHECK: add r0, [[R2]], [[R2]]
   ret i32 add(
-      i32 ptrtoint( i32* getelementptr inbounds ([2 x i32], [2 x i32]* @tle, i32 0, i32 0) to i32),
-      i32 ptrtoint( i32* getelementptr inbounds ([2 x i32], [2 x i32]* @tle, i32 0, i32 0) to i32))
+      i32 ptrtoint( ptr getelementptr inbounds ([2 x i32], ptr @tle, i32 0, i32 0) to i32),
+      i32 ptrtoint( ptr getelementptr inbounds ([2 x i32], ptr @tle, i32 0, i32 0) to i32))
 }
 
 define void @phiNode1() {
@@ -113,8 +113,8 @@ define void @phiNode1() {
 entry:
   br label %ConstantExpPhiNode
 ConstantExpPhiNode:
-  %ptr = phi i32* [ getelementptr inbounds ([3 x i32], [3 x i32]* @tl, i32 0, i32 0), %entry ],
-                  [ getelementptr inbounds ([3 x i32], [3 x i32]* @tl, i32 0, i32 0), %ConstantExpPhiNode ]
+  %ptr = phi ptr [ getelementptr inbounds ([3 x i32], ptr @tl, i32 0, i32 1), %entry ],
+                 [ getelementptr inbounds ([3 x i32], ptr @tl, i32 0, i32 1), %ConstantExpPhiNode ]
   br label %ConstantExpPhiNode
 exit:
   ret void
@@ -134,8 +134,8 @@ define void @phiNode2( i1 %bool) {
 entry:
   br i1 %bool, label %ConstantExpPhiNode, label %exit
 ConstantExpPhiNode:
-  %ptr = phi i32* [ getelementptr inbounds ([3 x i32], [3 x i32]* @tl, i32 0, i32 0), %entry ],
-                  [ getelementptr inbounds ([3 x i32], [3 x i32]* @tl, i32 0, i32 0), %ConstantExpPhiNode ]
+  %ptr = phi ptr [ getelementptr inbounds ([3 x i32], ptr @tl, i32 0, i32 1), %entry ],
+                 [ getelementptr inbounds ([3 x i32], ptr @tl, i32 0, i32 1), %ConstantExpPhiNode ]
   br label %ConstantExpPhiNode
 exit:
   ret void