From 6a3a1d157507e16eeb1955a55e085b4e589c8bb1 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Wed, 21 Jun 2017 20:38:36 +0200
Subject: [PATCH] Drop historic aarch64 TLS patches

---
 glibc-aarch64-tls-fixes.patch                 | 13 --------
 ...4-workaround-nzcv-clobber-in-tlsdesc.patch | 33 -------------------
 glibc.spec                                    |  5 ---
 3 files changed, 51 deletions(-)
 delete mode 100644 glibc-aarch64-tls-fixes.patch
 delete mode 100644 glibc-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch

diff --git a/glibc-aarch64-tls-fixes.patch b/glibc-aarch64-tls-fixes.patch
deleted file mode 100644
index a05d905..0000000
--- a/glibc-aarch64-tls-fixes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/sysdeps/aarch64/dl-machine.h b/sysdeps/aarch64/dl-machine.h
-index 997c860..50b37b0 100644
---- a/sysdeps/aarch64/dl-machine.h
-+++ b/sysdeps/aarch64/dl-machine.h
-@@ -295,7 +295,7 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc,
- # ifndef SHARED
- 		CHECK_STATIC_TLS (map, sym_map);
- # else
--		if (!TRY_STATIC_TLS (map, sym_map))
-+		if (1)
- 		  {
- 		    td->arg = _dl_make_tlsdesc_dynamic
- 		      (sym_map, sym->st_value + reloc->r_addend);
diff --git a/glibc-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch b/glibc-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
deleted file mode 100644
index 9db69d6..0000000
--- a/glibc-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/sysdeps/aarch64/dl-tlsdesc.S b/sysdeps/aarch64/dl-tlsdesc.S
-index ded5471..7d28496 100644
---- a/sysdeps/aarch64/dl-tlsdesc.S
-+++ b/sysdeps/aarch64/dl-tlsdesc.S
-@@ -140,7 +140,7 @@ _dl_tlsdesc_undefweak:
- 	cfi_startproc
- 	.align 2
- _dl_tlsdesc_dynamic:
--# define NSAVEXREGPAIRS 2
-+# define NSAVEXREGPAIRS 3
- 	stp	x29, x30, [sp,#-(32+16*NSAVEXREGPAIRS)]!
- 	cfi_adjust_cfa_offset (32+16*NSAVEXREGPAIRS)
- 	mov	x29, sp
-@@ -151,6 +151,10 @@ _dl_tlsdesc_dynamic:
- 	stp	x1,  x2, [sp, #32+16*0]
- 	stp	x3,  x4, [sp, #32+16*1]
- 
-+	/* Work around GCC rescheduling compares across tlsdesc calls.  */
-+	mrs	x30, nzcv
-+	stp	xzr, x30, [sp, #32+16*2]
-+
- 	mrs	x4, tpidr_el0
- 	/* The ldar here happens after the load from [x0] at the call site
- 	   (that is generated by the compiler as part of the TLS access ABI),
-@@ -169,6 +173,8 @@ _dl_tlsdesc_dynamic:
- 1:
- 	ldp	 x1,  x2, [sp, #32+16*0]
- 	ldp	 x3,  x4, [sp, #32+16*1]
-+	ldp	 xzr, x30, [sp, #32+16*2]
-+	msr	 nzcv, x30
- 
- 	ldp	x29, x30, [sp], #(32+16*NSAVEXREGPAIRS)
- 	cfi_adjust_cfa_offset (-32-16*NSAVEXREGPAIRS)
diff --git a/glibc.spec b/glibc.spec
index 54c9a79..8efc343 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -284,9 +284,6 @@ Patch2027: glibc-rh819430.patch
 
 Patch2031: glibc-rh1070416.patch
 
-Patch2033: glibc-aarch64-tls-fixes.patch
-Patch2034: glibc-aarch64-workaround-nzcv-clobber-in-tlsdesc.patch
-
 Patch2036: glibc-gcc-PR69537.patch
 
 # extend_alloca removal, BZ 18023
@@ -849,8 +846,6 @@ microbenchmark tests on the system.
 %patch0046 -p1
 %patch2031 -p1
 %patch0047 -p1
-%patch2033 -p1
-%patch2034 -p1
 %patch0053 -p1
 %patch0059 -p1
 %patch0060 -p1