From 99ed5bbe12cb04c8918514a9f32e4908e06b423d Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Sun, 6 Dec 2020 03:02:25 -0600 Subject: [PATCH] everywhere: rename __getcontext to libucontext_getcontext --- arch/aarch64/getcontext.S | 6 +++--- arch/arm/getcontext.S | 6 +++--- arch/m68k/getcontext.S | 6 +++--- arch/mips/getcontext.S | 10 +++++----- arch/mips64/getcontext.S | 10 +++++----- arch/ppc/getcontext.S | 6 +++--- arch/ppc64/getcontext.S | 12 ++++++------ arch/riscv64/getcontext.S | 6 +++--- arch/s390x/getcontext.S | 6 +++--- arch/x86/getcontext.S | 6 +++--- arch/x86_64/getcontext.S | 6 +++--- 11 files changed, 40 insertions(+), 40 deletions(-) diff --git a/arch/aarch64/getcontext.S b/arch/aarch64/getcontext.S index abc7995..98b659e 100644 --- a/arch/aarch64/getcontext.S +++ b/arch/aarch64/getcontext.S @@ -12,9 +12,9 @@ #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) str xzr, [x0, #REG_OFFSET(0)] /* save GPRs */ @@ -49,4 +49,4 @@ FUNC(__getcontext) mov x0, #0 ret -END(__getcontext) +END(libucontext_getcontext) diff --git a/arch/arm/getcontext.S b/arch/arm/getcontext.S index 9872724..003ad10 100644 --- a/arch/arm/getcontext.S +++ b/arch/arm/getcontext.S @@ -12,9 +12,9 @@ #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) /* copy all of the current registers into the ucontext structure */ add r1, r0, #REG_OFFSET(4) stmia r1, {r4-r12} @@ -24,4 +24,4 @@ FUNC(__getcontext) /* return 0 */ mov r0, #0 mov pc, lr -END(__getcontext) +END(libucontext_getcontext) diff --git a/arch/m68k/getcontext.S b/arch/m68k/getcontext.S index 1f0bae3..25e74a9 100644 --- a/arch/m68k/getcontext.S +++ b/arch/m68k/getcontext.S @@ -12,9 +12,9 @@ #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) move.l 4(%sp), %a0 /* load ucontext_t pointer from stack */ movem.l %d2-%d7, REG_OFFSET(REG_D2)(%a0) /* preserve $d2 through $d7 */ @@ -26,4 +26,4 @@ FUNC(__getcontext) clr.l %d0 /* return 0 */ rts -END(__getcontext) +END(libucontext_getcontext) diff --git a/arch/mips/getcontext.S b/arch/mips/getcontext.S index 4260850..f5194d5 100644 --- a/arch/mips/getcontext.S +++ b/arch/mips/getcontext.S @@ -14,15 +14,15 @@ LOCALSZ = 1 #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) /* copy $gp, $sp, $fp to temporary registers so we don't clobber them */ move $a2, $gp move $a3, $sp move $a1, $fp - PUSH_FRAME(__getcontext) + PUSH_FRAME(libucontext_getcontext) /* set registers */ sw $s0, REG_OFFSET(16)($a0) @@ -40,7 +40,7 @@ FUNC(__getcontext) sw $ra, REG_OFFSET(31)($a0) sw $ra, (MCONTEXT_PC)($a0) - POP_FRAME(__getcontext) + POP_FRAME(libucontext_getcontext) jr $ra -END(__getcontext) +END(libucontext_getcontext) diff --git a/arch/mips64/getcontext.S b/arch/mips64/getcontext.S index 1084aa6..8995281 100644 --- a/arch/mips64/getcontext.S +++ b/arch/mips64/getcontext.S @@ -14,15 +14,15 @@ LOCALSZ = 1 #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) /* copy $gp, $sp, $fp to temporary registers so we don't clobber them */ move $a2, $gp move $a3, $sp move $a4, $fp - PUSH_FRAME(__getcontext) + PUSH_FRAME(libucontext_getcontext) /* set registers */ sd $s0, REG_OFFSET(16)($a0) @@ -40,7 +40,7 @@ FUNC(__getcontext) sd $ra, REG_OFFSET(31)($a0) sd $ra, (MCONTEXT_PC)($a0) - POP_FRAME(__getcontext) + POP_FRAME(libucontext_getcontext) jr $ra -END(__getcontext) +END(libucontext_getcontext) diff --git a/arch/ppc/getcontext.S b/arch/ppc/getcontext.S index beffaf5..b1c4aea 100644 --- a/arch/ppc/getcontext.S +++ b/arch/ppc/getcontext.S @@ -10,11 +10,11 @@ * from the use of this software. */ -.global __getcontext +.global libucontext_getcontext .hidden __swapcontext -__getcontext: +libucontext_getcontext: li 4, 0 b __swapcontext@local .weak getcontext -getcontext = __getcontext +getcontext = libucontext_getcontext diff --git a/arch/ppc64/getcontext.S b/arch/ppc64/getcontext.S index 935edd2..813a997 100644 --- a/arch/ppc64/getcontext.S +++ b/arch/ppc64/getcontext.S @@ -10,16 +10,16 @@ * from the use of this software. */ -.global __getcontext +.global libucontext_getcontext .hidden __swapcontext -__getcontext: - addis 2, 12, .TOC.-__getcontext@ha - addi 2, 12, .TOC.-__getcontext@l +libucontext_getcontext: + addis 2, 12, .TOC.-libucontext_getcontext@ha + addi 2, 12, .TOC.-libucontext_getcontext@l - .localentry __getcontext,.-__getcontext + .localentry libucontext_getcontext,.-libucontext_getcontext li 4, 0 b __swapcontext .weak getcontext -getcontext = __getcontext +getcontext = libucontext_getcontext diff --git a/arch/riscv64/getcontext.S b/arch/riscv64/getcontext.S index ab13614..69ea29e 100644 --- a/arch/riscv64/getcontext.S +++ b/arch/riscv64/getcontext.S @@ -12,9 +12,9 @@ #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) sd ra, REG_OFFSET(REG_PC)(a0) sd ra, REG_OFFSET(REG_RA)(a0) sd sp, REG_OFFSET(REG_SP)(a0) @@ -41,4 +41,4 @@ FUNC(__getcontext) /* done saving, return */ ret -END(__getcontext) +END(libucontext_getcontext) diff --git a/arch/s390x/getcontext.S b/arch/s390x/getcontext.S index d38de97..49e231a 100644 --- a/arch/s390x/getcontext.S +++ b/arch/s390x/getcontext.S @@ -12,9 +12,9 @@ #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) lgr %r1, %r2 /* use %r1 as our working register */ la %r2, 0 /* we will return 0 */ @@ -22,4 +22,4 @@ FUNC(__getcontext) stmg %r0, %r15, REG_OFFSET(0)(%r1) /* store general-purpose registers */ br %r14 /* return to where we came from */ -END(__getcontext) +END(libucontext_getcontext) diff --git a/arch/x86/getcontext.S b/arch/x86/getcontext.S index 35407d7..7d21ebf 100644 --- a/arch/x86/getcontext.S +++ b/arch/x86/getcontext.S @@ -12,9 +12,9 @@ #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) /* load address of the ucontext structure */ movl 4(%esp), %eax @@ -46,4 +46,4 @@ FUNC(__getcontext) /* we're all done here, return 0 */ xorl %eax, %eax ret -END(__getcontext) +END(libucontext_getcontext) diff --git a/arch/x86_64/getcontext.S b/arch/x86_64/getcontext.S index 5b3a05d..84e91ac 100644 --- a/arch/x86_64/getcontext.S +++ b/arch/x86_64/getcontext.S @@ -12,9 +12,9 @@ #include "defs.h" -ALIAS(getcontext, __getcontext) +ALIAS(getcontext, libucontext_getcontext) -FUNC(__getcontext) +FUNC(libucontext_getcontext) /* copy all of the current registers into the ucontext structure */ movq %r8, REG_OFFSET(REG_R8)(%rdi) movq %r9, REG_OFFSET(REG_R9)(%rdi) @@ -45,4 +45,4 @@ FUNC(__getcontext) /* we're all done here, return 0 */ xorl %eax, %eax ret -END(__getcontext) +END(libucontext_getcontext)