From 8038562968fd4260a3b11291f04388799cc3f5b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Sat, 2 Jan 2021 23:53:57 +0100
Subject: [PATCH] libucontext: proper patch for x86

Make renaming of local __i868.get_pc_thunk.bx to i686_get_pc_thunk_bx a proper patch.
---
 .../patches/arch-x86-i668_get_thunk_bx.patch  | 20 +++++++++++++++++++
 srcpkgs/libucontext/template                  |  3 ---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch

diff --git a/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch b/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
new file mode 100644
index 00000000000..702f06f5b28
--- /dev/null
+++ b/srcpkgs/libucontext/patches/arch-x86-i668_get_thunk_bx.patch
@@ -0,0 +1,20 @@
+--- arch/x86/startcontext.S	2020-05-18 05:28:21.000000000 +0200
++++ arch/x86/startcontext.S	2021-01-02 23:52:32.728187160 +0100
+@@ -18,7 +18,7 @@
+ 	cmpl	$0, (%esp)
+ 
+ 	/* restore global offset table, exit@plt and __setcontext@plt need this */
+-	call	__i686.get_pc_thunk.bx
++	call	i686_get_pc_thunk_bx
+ 	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
+ 
+ 	/* if we have no linked context, lets get out of here */
+@@ -35,7 +35,7 @@
+ 	/* something is really hosed, call hlt to force termination */
+ 	hlt
+ 
+-__i686.get_pc_thunk.bx:
++i686_get_pc_thunk_bx:
+ 	mov	(%esp), %ebx
+ 	ret
+ END(__start_context)
diff --git a/srcpkgs/libucontext/template b/srcpkgs/libucontext/template
index be891eb6f42..738b1e317d0 100644
--- a/srcpkgs/libucontext/template
+++ b/srcpkgs/libucontext/template
@@ -22,9 +22,6 @@ mips*)  export LIBUCONTEXT_ARCH="mips";;
 esac
 
 do_build() {
-	case "${XBPS_TARGET_MACHINE}" in
-	i686*) vsed -i arch/x86/startcontext.S -e "s;__i686.get_pc_thunk.bx;i686_get_pc_thunk_bx;g" ;;
-	esac
 	make ARCH="${LIBUCONTEXT_ARCH}"
 }