Index: lib/libc/arch/aarch64/genassym.cf
===================================================================
RCS file: /cvsroot/src/lib/libc/arch/aarch64/genassym.cf,v
retrieving revision 1.1
diff -u -p -r1.1 genassym.cf
--- lib/libc/arch/aarch64/genassym.cf	10 Aug 2014 05:47:36 -0000	1.1
+++ lib/libc/arch/aarch64/genassym.cf	10 May 2020 08:24:09 -0000
@@ -53,7 +53,6 @@ define _JB_X27		sizeof(_BSD_JBSLOT_T_ [_
 define _JB_X28		sizeof(_BSD_JBSLOT_T_ [_JB_X29])
 define _JB_X29		sizeof(_BSD_JBSLOT_T_ [_JB_X29])
 define _JB_X30		sizeof(_BSD_JBSLOT_T_ [_JB_X30])
-define _JB_TPIDR	sizeof(_BSD_JBSLOT_T_ [_JB_TPIDR])
 define _JB_D8		sizeof(_BSD_JBSLOT_T_ [_JB_D8])
 define _JB_D9		sizeof(_BSD_JBSLOT_T_ [_JB_D9])
 define _JB_D10		sizeof(_BSD_JBSLOT_T_ [_JB_D10])
Index: lib/libc/arch/aarch64/gen/_setjmp.S
===================================================================
RCS file: /cvsroot/src/lib/libc/arch/aarch64/gen/_setjmp.S,v
retrieving revision 1.3
diff -u -p -r1.3 _setjmp.S
--- lib/libc/arch/aarch64/gen/_setjmp.S	28 Nov 2017 13:09:05 -0000	1.3
+++ lib/libc/arch/aarch64/gen/_setjmp.S	10 May 2020 08:24:09 -0000
@@ -63,9 +63,6 @@ ENTRY(_setjmp)
 	stp	x27, x28, [x0, #_JB_X27]
 	stp	x29, x30, [x0, #_JB_X29]
 
-	mrs	x5, tpidr_el0
-	str	x5, [x0, #_JB_TPIDR]
-
 	stp	d8,  d9,  [x0, #_JB_D8]
 	stp	d10, d11, [x0, #_JB_D10]
 	stp	d12, d13, [x0, #_JB_D12]
@@ -93,9 +90,6 @@ ENTRY(_longjmp)
 	ldp	x25, x26, [x0, #_JB_X25]
 	ldp	x27, x28, [x0, #_JB_X27]
 
-	ldr	x2, [x0, #_JB_TPIDR]
-	msr	tpidr_el0, x2
-
 	ldp	d8,  d9,  [x0, #_JB_D8]
 	ldp	d10, d11, [x0, #_JB_D10]
 	ldp	d12, d13, [x0, #_JB_D12]
Index: lib/libc/arch/aarch64/gen/setjmp.S
===================================================================
RCS file: /cvsroot/src/lib/libc/arch/aarch64/gen/setjmp.S,v
retrieving revision 1.2
diff -u -p -r1.2 setjmp.S
--- lib/libc/arch/aarch64/gen/setjmp.S	28 Nov 2017 13:09:05 -0000	1.2
+++ lib/libc/arch/aarch64/gen/setjmp.S	10 May 2020 08:24:09 -0000
@@ -61,9 +61,6 @@ ENTRY(__setjmp14)
 	stp	x27, x28, [x0, #_JB_X27]
 	stp	x29, x30, [x0, #_JB_X29]
 
-	mrs	x5, tpidr_el0
-	str	x5, [x0, #_JB_TPIDR]
-
 	stp	d8,  d9,  [x0, #_JB_D8]
 	stp	d10, d11, [x0, #_JB_D10]
 	stp	d12, d13, [x0, #_JB_D12]
@@ -100,9 +97,6 @@ ENTRY(__longjmp14)
 	ldp	x25, x26, [x0, #_JB_X25]
 	ldp	x27, x28, [x0, #_JB_X27]
 
-	ldr	x2, [x0, #_JB_TPIDR]
-	msr	tpidr_el0, x2
-
 	ldp	d8,  d9,  [x0, #_JB_D8]
 	ldp	d10, d11, [x0, #_JB_D10]
 	ldp	d12, d13, [x0, #_JB_D12]
Index: sys/arch/aarch64/include/setjmp.h
===================================================================
RCS file: /cvsroot/src/sys/arch/aarch64/include/setjmp.h,v
retrieving revision 1.1
diff -u -p -r1.1 setjmp.h
--- sys/arch/aarch64/include/setjmp.h	10 Aug 2014 05:47:38 -0000	1.1
+++ sys/arch/aarch64/include/setjmp.h	10 May 2020 08:24:18 -0000
@@ -50,7 +50,6 @@
 #define _JB_X28		11
 #define _JB_X29		12
 #define _JB_X30		13
-#define _JB_TPIDR	14
 #define _JB_D8		16
 #define _JB_D9		17
 #define _JB_D10		18