summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkettenis <kettenis@openbsd.org>2021-01-02 16:50:18 +0000
committerkettenis <kettenis@openbsd.org>2021-01-02 16:50:18 +0000
commit27cedaf7e7816d285faf28a74dcdadd45e0b3272 (patch)
tree2d890cd9a6259bd0b13af41b1d3eb4c8a5fe45c7
parentMarkup route flags such that apropos(1) finds them (diff)
downloadwireguard-openbsd-27cedaf7e7816d285faf28a74dcdadd45e0b3272.tar.xz
wireguard-openbsd-27cedaf7e7816d285faf28a74dcdadd45e0b3272.zip
Adjust local modifications to follow changes made upstream.
Fixes build on powerpc and sparc64. ok patrick@
-rw-r--r--gnu/llvm/libunwind/src/UnwindRegistersRestore.S2
-rw-r--r--gnu/llvm/libunwind/src/UnwindRegistersSave.S4
2 files changed, 3 insertions, 3 deletions
diff --git a/gnu/llvm/libunwind/src/UnwindRegistersRestore.S b/gnu/llvm/libunwind/src/UnwindRegistersRestore.S
index 9f60594b654..33f6c84b126 100644
--- a/gnu/llvm/libunwind/src/UnwindRegistersRestore.S
+++ b/gnu/llvm/libunwind/src/UnwindRegistersRestore.S
@@ -1053,7 +1053,7 @@ DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind21Registers_mips_newabi6jumptoEv)
#elif defined(__sparc__) && defined(__arch64__)
-DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind17Registers_sparc646jumptoEv)
+DEFINE_LIBUNWIND_FUNCTION(_ZN9libunwind17Registers_sparc646jumptoEv)
#
# void libunwind::Registers_sparc64::jumpto()
#
diff --git a/gnu/llvm/libunwind/src/UnwindRegistersSave.S b/gnu/llvm/libunwind/src/UnwindRegistersSave.S
index 78c8c534131..13c1c06fce9 100644
--- a/gnu/llvm/libunwind/src/UnwindRegistersSave.S
+++ b/gnu/llvm/libunwind/src/UnwindRegistersSave.S
@@ -651,7 +651,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
// On entry:
// thread_state pointer is in r3
//
-DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZNK9libunwind13Registers_ppc19saveVectorRegistersEv)
+DEFINE_LIBUNWIND_FUNCTION(_ZNK9libunwind13Registers_ppc19saveVectorRegistersEv)
// return if we have already saved VRsave
lwz %r0, 156(%r3)
cmpwi %r0, 0
@@ -1016,7 +1016,7 @@ DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
# On entry:
# thread_state pointer is in %o0
#
-DEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
+DEFINE_LIBUNWIND_FUNCTION(__unw_getcontext)
stx %g1, [%o0 + 0x08]
stx %g2, [%o0 + 0x10]
stx %g3, [%o0 + 0x18]