From 9e7510ab24ded871846d0a60ce0c09301ef0ea7c Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Tue, 31 Mar 2015 17:57:40 +0000
Subject: [PATCH] Update RISCV tls assembly tests

---
 external/gpl3/gcc/dist/gcc/configure    | 14 +++++++-------
 external/gpl3/gcc/dist/gcc/configure.ac | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/external/gpl3/gcc/dist/gcc/configure b/external/gpl3/gcc/dist/gcc/configure
index d0e23cb55a8c..3c98023e56c1 100755
--- a/external/gpl3/gcc/dist/gcc/configure
+++ b/external/gpl3/gcc/dist/gcc/configure
@@ -23368,13 +23368,13 @@ x:
 	.text
 	la.tls.gd a0,x
 	la.tls.ie a1,x
-	lui v0,%tls_ie_hi(x)
-	lw v0,%tls_ie_lo(x)(v0)
-	add v0,v0,tp,%tls_ie_add(x)
-	lw v0,%tls_ie_off(x)(v0)
-        lui v0,%tprel_hi(x)
-	add v0,v0,tp,%tprel_add(x)
-	lw v0,%tprel_lo(x)(v0)'
+	lui a0,%tls_ie_pcrel_hi(x)
+	lw a0,%pcrel_lo(x)(a0)
+	add a0,a0,tp
+	lw a0,(a0)
+        lui a0,%tprel_hi(x)
+	add a0,a0,tp,%tprel_add(x)
+	lw a0,%tprel_lo(x)(a0)'
 	tls_first_major=2
 	tls_first_minor=21
 	tls_as_opt='-m32 --fatal-warnings'
diff --git a/external/gpl3/gcc/dist/gcc/configure.ac b/external/gpl3/gcc/dist/gcc/configure.ac
index 16b1bf24ec37..4c69b0e84526 100644
--- a/external/gpl3/gcc/dist/gcc/configure.ac
+++ b/external/gpl3/gcc/dist/gcc/configure.ac
@@ -3116,13 +3116,13 @@ x:
 	.text
 	la.tls.gd a0,x
 	la.tls.ie a1,x
-	lui v0,%tls_ie_hi(x)
-	lw v0,%tls_ie_lo(x)(v0)
-	add v0,v0,tp,%tls_ie_add(x)
-	lw v0,%tls_ie_off(x)(v0)
-	lui v0,%tprel_hi(x)
-	add v0,v0,tp,%tprel_add(x)
-	lw v0,%tprel_lo(x)(v0)'
+	lui a0,%tls_ie_pcrel_hi(x)
+	lw a0,%pcrel_lo(x)(a0)
+	add a0,a0,tp
+	lw a0,0(a0)
+	lui a0,%tprel_hi(x)
+	add a0,a0,tp,%tprel_add(x)
+	lw a0,%tprel_lo(x)(a0)'
 	tls_first_major=2
 	tls_first_minor=21
 	tls_as_opt='-m32 --fatal-warnings'