summaryrefslogtreecommitdiffstats
path: root/patches/0030-x86-remove-errant-CFI-usage-from-rwlock.patch
blob: ffbec4d635dc3c2089328c4e66662f8e57ec4840 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
From 1013aca961d8dd47191b4371da95a26ccfb60689 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 24 May 2020 21:25:28 -0600
Subject: [PATCH 30/33] x86: remove errant CFI usage from rwlock

These don't assemble with newer binutils due to the use of the cfi
directives, so simply remove them, since they're anyway just for
debugging.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 arch/x86/lib/rwlock.S | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/arch/x86/lib/rwlock.S b/arch/x86/lib/rwlock.S
index cc4a8c2f9b8d..34d5184ada35 100644
--- a/arch/x86/lib/rwlock.S
+++ b/arch/x86/lib/rwlock.S
@@ -12,7 +12,6 @@
 #endif
 
 ENTRY(__write_lock_failed)
-	CFI_STARTPROC
 	FRAME_BEGIN
 0:	LOCK_PREFIX
 	WRITE_LOCK_ADD($RW_LOCK_BIAS) (%__lock_ptr)
@@ -24,11 +23,9 @@ ENTRY(__write_lock_failed)
 	jnz	0b
 	FRAME_END
 	ret
-	CFI_ENDPROC
 END(__write_lock_failed)
 
 ENTRY(__read_lock_failed)
-	CFI_STARTPROC
 	FRAME_BEGIN
 0:	LOCK_PREFIX
 	READ_LOCK_SIZE(inc) (%__lock_ptr)
@@ -40,5 +37,4 @@ ENTRY(__read_lock_failed)
 	js	0b
 	FRAME_END
 	ret
-	CFI_ENDPROC
 END(__read_lock_failed)
-- 
2.28.0