proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-12-30 20:42:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bring back mips-rdhwr.diff as it isn't in rc2

Browse Source
This commit is contained in:
Sylvestre Ledru 2018-11-25 17:01:04 +01:00
parent d455bf2016
commit 40d927e090
3 changed files with 59 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
llvm-toolchain-7 (1:7.0.1~+rc2-7) unstable; urgency=medium
* Bring back mips-rdhwr.diff as it isn't in rc2
-- Sylvestre Ledru <sylvestre@debian.org> Sun, 25 Nov 2018 17:00:31 +0100
llvm-toolchain-7 (1:7.0.1~+rc2-6) unstable; urgency=medium
[ Samuel Thibault ]

50
debian/patches/mips-rdhwr.diff vendored Normal file
View File

@ -0,0 +1,50 @@
Index: llvm/trunk/lib/Target/Mips/Mips64InstrInfo.td
===================================================================
--- llvm/trunk/lib/Target/Mips/Mips64InstrInfo.td
+++ llvm/trunk/lib/Target/Mips/Mips64InstrInfo.td
@@ -1139,3 +1139,6 @@
"sltu\t$rs, $rt, $imm">, GPR_64;
def : MipsInstAlias<"sltu\t$rs, $imm", (SLTUImm64 GPR64Opnd:$rs, GPR64Opnd:$rs,
imm64:$imm)>, GPR_64;
+
+def : MipsInstAlias<"rdhwr $rt, $rs",
+ (RDHWR64 GPR64Opnd:$rt, HWRegsOpnd:$rs, 0), 1>, GPR_64;
Index: llvm/trunk/test/CodeGen/Mips/tls.ll
===================================================================
--- llvm/trunk/test/CodeGen/Mips/tls.ll
+++ llvm/trunk/test/CodeGen/Mips/tls.ll
@@ -48,14 +48,14 @@
; STATIC32-LABEL: f1:
; STATIC32: lui $[[R0:[0-9]+]], %tprel_hi(t1)
; STATIC32: addiu $[[R1:[0-9]+]], $[[R0]], %tprel_lo(t1)
-; STATIC32: rdhwr $3, $29
+; STATIC32: rdhwr $3, $29{{$}}
; STATIC32: addu $[[R2:[0-9]+]], $3, $[[R1]]
; STATIC32: lw $2, 0($[[R2]])
; STATIC64-LABEL: f1:
; STATIC64: lui $[[R0:[0-9]+]], %tprel_hi(t1)
; STATIC64: daddiu $[[R1:[0-9]+]], $[[R0]], %tprel_lo(t1)
-; STATIC64: rdhwr $3, $29, 0
+; STATIC64: rdhwr $3, $29{{$}}
; STATIC64: daddu $[[R2:[0-9]+]], $3, $[[R0]]
; STATIC64: lw $2, 0($[[R2]])
}
@@ -101,15 +101,15 @@
; STATIC32-LABEL: f2:
; STATIC32: lui $[[R0:[0-9]+]], %hi(__gnu_local_gp)
; STATIC32: addiu $[[GP:[0-9]+]], $[[R0]], %lo(__gnu_local_gp)
-; STATIC32: rdhwr $3, $29
+; STATIC32: rdhwr $3, $29{{$}}
; STATIC32: lw $[[R0:[0-9]+]], %gottprel(t2)($[[GP]])
; STATIC32: addu $[[R1:[0-9]+]], $3, $[[R0]]
; STATIC32: lw $2, 0($[[R1]])
; STATIC64-LABEL: f2:
; STATIC64: lui $[[R0:[0-9]+]], %hi(%neg(%gp_rel(f2)))
; STATIC64: daddiu $[[GP:[0-9]+]], $[[R0]], %lo(%neg(%gp_rel(f2)))
-; STATIC64: rdhwr $3, $29
+; STATIC64: rdhwr $3, $29{{$}}
; STATIC64: ld $[[R0:[0-9]+]], %gottprel(t2)($[[GP]])
; STATIC64: daddu $[[R1:[0-9]+]], $3, $[[R0]]
; STATIC64: lw $2, 0($[[R1]])

3
debian/patches/series vendored
View File

@ -98,3 +98,6 @@ D54379-hurd-triple-clang.diff
D54677-hurd-path_max.diff
hurd-cxx-paths.diff
D53557-hurd-self-exe-realpath.diff
# mips
mips-rdhwr.diff