From c693dc663c04044078a14090364a31cdc4befbc5 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Sun, 6 Dec 2020 02:56:59 -0600
Subject: [PATCH] rename __makecontext to libucontext_makecontext

---
 arch/aarch64/makecontext.c |  4 ++--
 arch/arm/makecontext.c     |  4 ++--
 arch/m68k/makecontext.c    |  4 ++--
 arch/mips/makecontext.S    | 10 +++++-----
 arch/mips64/makecontext.S  | 10 +++++-----
 arch/ppc/makecontext.c     |  4 ++--
 arch/ppc64/makecontext.c   |  4 ++--
 arch/riscv64/makecontext.c |  4 ++--
 arch/s390x/makecontext.c   |  4 ++--
 arch/x86/makecontext.c     |  4 ++--
 arch/x86_64/makecontext.c  |  4 ++--
 11 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/arch/aarch64/makecontext.c b/arch/aarch64/makecontext.c
index fddf027..0fd6a2a 100644
--- a/arch/aarch64/makecontext.c
+++ b/arch/aarch64/makecontext.c
@@ -24,7 +24,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
 	unsigned long *sp;
 	unsigned long *regp;
@@ -54,4 +54,4 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));
diff --git a/arch/arm/makecontext.c b/arch/arm/makecontext.c
index 3075880..d276db3 100644
--- a/arch/arm/makecontext.c
+++ b/arch/arm/makecontext.c
@@ -26,7 +26,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
 	unsigned long *sp;
 	unsigned long *regp;
@@ -58,4 +58,4 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));
diff --git a/arch/m68k/makecontext.c b/arch/m68k/makecontext.c
index 716a3e5..d7ef416 100644
--- a/arch/m68k/makecontext.c
+++ b/arch/m68k/makecontext.c
@@ -24,7 +24,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
 	greg_t *sp;
 	va_list va;
@@ -57,4 +57,4 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));
diff --git a/arch/mips/makecontext.S b/arch/mips/makecontext.S
index e72c094..bfed44c 100644
--- a/arch/mips/makecontext.S
+++ b/arch/mips/makecontext.S
@@ -21,10 +21,10 @@ A3_OFF = FRAMESZ + (3 * REG_SZ)
  * assembly rather than C.  Annoying, that...
  */
 
-ALIAS(makecontext, __makecontext)
+ALIAS(makecontext, libucontext_makecontext)
 
-FUNC(__makecontext)
-	PUSH_FRAME(__makecontext)
+FUNC(libucontext_makecontext)
+	PUSH_FRAME(libucontext_makecontext)
 
 	/* store $a3 through $a7 to the stack frame. */
 	sw	$a3, A3_OFF($sp)
@@ -94,7 +94,7 @@ no_more_arguments:
 	/* set our $pc */
 	sw	$a1, MCONTEXT_PC($a0)
 
-	POP_FRAME(__makecontext)
+	POP_FRAME(libucontext_makecontext)
 
 	jr	$ra
-END(__makecontext)
+END(libucontext_makecontext)
diff --git a/arch/mips64/makecontext.S b/arch/mips64/makecontext.S
index 482176d..6b7975b 100644
--- a/arch/mips64/makecontext.S
+++ b/arch/mips64/makecontext.S
@@ -26,10 +26,10 @@ A7_OFF = FRAMESZ - (1 * REG_SZ)
  * assembly rather than C.  Annoying, that...
  */
 
-ALIAS(makecontext, __makecontext)
+ALIAS(makecontext, libucontext_makecontext)
 
-FUNC(__makecontext)
-	PUSH_FRAME(__makecontext)
+FUNC(libucontext_makecontext)
+	PUSH_FRAME(libucontext_makecontext)
 
 	/* store $a3 through $a7 to the stack frame. */
 	sd	$a3, A3_OFF($sp)
@@ -100,7 +100,7 @@ no_more_arguments:
 	/* set our $pc */
 	sd	$a1, MCONTEXT_PC($a0)
 
-	POP_FRAME(__makecontext)
+	POP_FRAME(libucontext_makecontext)
 
 	jr	$ra
-END(__makecontext)
+END(libucontext_makecontext)
diff --git a/arch/ppc/makecontext.c b/arch/ppc/makecontext.c
index a4990aa..2937ce1 100644
--- a/arch/ppc/makecontext.c
+++ b/arch/ppc/makecontext.c
@@ -24,7 +24,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
 {
 	greg_t *sp;
 	va_list va;
@@ -57,4 +57,4 @@ __makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));
diff --git a/arch/ppc64/makecontext.c b/arch/ppc64/makecontext.c
index 8e91fe0..2d4974e 100644
--- a/arch/ppc64/makecontext.c
+++ b/arch/ppc64/makecontext.c
@@ -24,7 +24,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
 {
 	greg_t *sp;
 	va_list va;
@@ -58,4 +58,4 @@ __makecontext(ucontext_t *ucp, void (*func)(), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));
diff --git a/arch/riscv64/makecontext.c b/arch/riscv64/makecontext.c
index e983316..2c3e8e9 100644
--- a/arch/riscv64/makecontext.c
+++ b/arch/riscv64/makecontext.c
@@ -24,7 +24,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
 	greg_t *sp, *regp;
 	va_list va;
@@ -59,4 +59,4 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));
diff --git a/arch/s390x/makecontext.c b/arch/s390x/makecontext.c
index 82da273..a0b84fc 100644
--- a/arch/s390x/makecontext.c
+++ b/arch/s390x/makecontext.c
@@ -26,7 +26,7 @@ extern int __setcontext(const ucontext_t *ucp);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
 	greg_t *sp;
 	va_list va;
@@ -64,4 +64,4 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));
diff --git a/arch/x86/makecontext.c b/arch/x86/makecontext.c
index c4888cc..20156d5 100644
--- a/arch/x86/makecontext.c
+++ b/arch/x86/makecontext.c
@@ -23,7 +23,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
 	greg_t *sp, *argp;
 	va_list va;
@@ -54,4 +54,4 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));
diff --git a/arch/x86_64/makecontext.c b/arch/x86_64/makecontext.c
index dd070ef..bcc07f3 100644
--- a/arch/x86_64/makecontext.c
+++ b/arch/x86_64/makecontext.c
@@ -23,7 +23,7 @@ extern void __start_context(void);
 
 
 void
-__makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
+libucontext_makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 {
 	greg_t *sp;
 	va_list va;
@@ -75,4 +75,4 @@ __makecontext(ucontext_t *ucp, void (*func)(void), int argc, ...)
 }
 
 
-extern __typeof(__makecontext) makecontext __attribute__((weak, __alias__("__makecontext")));
+extern __typeof(libucontext_makecontext) makecontext __attribute__((weak, __alias__("libucontext_makecontext")));