aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorthegeorg <thegeorg@yandex-team.com>2025-01-21 19:34:12 +0300
committerthegeorg <thegeorg@yandex-team.com>2025-01-21 19:57:40 +0300
commit10feea72534dc5f149c6f0282675e76da8102275 (patch)
tree38e17243983d0bd539a34338dfbc5a3e72bbcae6
parent3cfd089f583b5c95b28aa87ed10dc684c7e15c85 (diff)
downloadydb-10feea72534dc5f149c6f0282675e76da8102275.tar.gz
Revert contrib/restricted/boost/context to 1.86.0
commit_hash:8f96480a77563db5941dbdc705a2a092cb773a2b
-rw-r--r--contrib/restricted/boost/context/.yandex_meta/devtools.copyrights.report10
-rw-r--r--contrib/restricted/boost/context/.yandex_meta/devtools.licenses.report1
-rw-r--r--contrib/restricted/boost/context/.yandex_meta/licenses.list.txt6
-rw-r--r--contrib/restricted/boost/context/fcontext_impl/ya.make5
-rw-r--r--contrib/restricted/boost/context/impl_common/ya.make4
-rw-r--r--contrib/restricted/boost/context/include/boost/context/detail/fcontext.hpp9
-rw-r--r--contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/jump_arm_aapcs_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/jump_arm_aapcs_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/jump_i386_sysv_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/jump_i386_sysv_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_elf_gas.S9
-rw-r--r--contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/make_arm64_aapcs_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/make_arm64_aapcs_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/make_arm_aapcs_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/make_arm_aapcs_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/make_i386_sysv_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/make_i386_sysv_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/make_x86_64_sysv_elf_gas.S30
-rw-r--r--contrib/restricted/boost/context/src/asm/make_x86_64_sysv_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/ontop_i386_sysv_elf_gas.S7
-rw-r--r--contrib/restricted/boost/context/src/asm/ontop_i386_sysv_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_elf_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_macho_gas.S1
-rw-r--r--contrib/restricted/boost/context/src/fcontext.cpp39
-rw-r--r--contrib/restricted/boost/context/ucontext_impl/ya.make4
-rw-r--r--contrib/restricted/boost/context/ya.make4
33 files changed, 51 insertions, 98 deletions
diff --git a/contrib/restricted/boost/context/.yandex_meta/devtools.copyrights.report b/contrib/restricted/boost/context/.yandex_meta/devtools.copyrights.report
index 5ab98d2b00..60d046ffec 100644
--- a/contrib/restricted/boost/context/.yandex_meta/devtools.copyrights.report
+++ b/contrib/restricted/boost/context/.yandex_meta/devtools.copyrights.report
@@ -95,16 +95,6 @@ BELONGS ya.make
src/asm/ontop_x86_64_sysv_macho_gas.S [2:4]
src/untested.cpp [2:4]
-KEEP COPYRIGHT_SERVICE_LABEL 9ed7b7468c684d33492a4176e9cf31b1
-BELONGS ya.make
- Note: matched license text is too long. Read it in the source files.
- Scancode info:
- Original SPDX id: COPYRIGHT_SERVICE_LABEL
- Score : 100.00
- Match type : COPYRIGHT
- Files with this license:
- src/fcontext.cpp [1:3]
-
KEEP COPYRIGHT_SERVICE_LABEL c3ce9643507aa0942a28211fe8f95eff
BELONGS ya.make
License text:
diff --git a/contrib/restricted/boost/context/.yandex_meta/devtools.licenses.report b/contrib/restricted/boost/context/.yandex_meta/devtools.licenses.report
index 2259eba708..87fc619612 100644
--- a/contrib/restricted/boost/context/.yandex_meta/devtools.licenses.report
+++ b/contrib/restricted/boost/context/.yandex_meta/devtools.licenses.report
@@ -127,7 +127,6 @@ BELONGS ya.make
include/boost/context/stack_traits.hpp [3:5]
include/boost/context/windows/protected_fixedsize_stack.hpp [3:5]
src/continuation.cpp [3:5]
- src/fcontext.cpp [2:4]
src/fiber.cpp [3:5]
src/posix/stack_traits.cpp [3:5]
src/untested.cpp [3:5]
diff --git a/contrib/restricted/boost/context/.yandex_meta/licenses.list.txt b/contrib/restricted/boost/context/.yandex_meta/licenses.list.txt
index dbd9323671..6eecddf257 100644
--- a/contrib/restricted/boost/context/.yandex_meta/licenses.list.txt
+++ b/contrib/restricted/boost/context/.yandex_meta/licenses.list.txt
@@ -56,9 +56,3 @@
// Copyright Oliver Kowalke 2017.
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt or copy at
-
-
-====================COPYRIGHT====================
-// SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
diff --git a/contrib/restricted/boost/context/fcontext_impl/ya.make b/contrib/restricted/boost/context/fcontext_impl/ya.make
index d0b2bdffa7..da427b0f30 100644
--- a/contrib/restricted/boost/context/fcontext_impl/ya.make
+++ b/contrib/restricted/boost/context/fcontext_impl/ya.make
@@ -4,9 +4,9 @@ LIBRARY()
WITHOUT_LICENSE_TEXTS()
-VERSION(1.87.0)
+VERSION(1.86.0)
-ORIGINAL_SOURCE(https://github.com/boostorg/context/archive/boost-1.87.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/context/archive/boost-1.86.0.tar.gz)
LICENSE(BSL-1.0)
@@ -68,7 +68,6 @@ SRCS(
src/asm/make_${FCONTEXT_ARCH}_${FCONTEXT_ABI}_${FCONTEXT_FMT}_${FCONTEXT_SUF}
src/asm/jump_${FCONTEXT_ARCH}_${FCONTEXT_ABI}_${FCONTEXT_FMT}_${FCONTEXT_SUF}
src/asm/ontop_${FCONTEXT_ARCH}_${FCONTEXT_ABI}_${FCONTEXT_FMT}_${FCONTEXT_SUF}
- src/fcontext.cpp
)
END()
diff --git a/contrib/restricted/boost/context/impl_common/ya.make b/contrib/restricted/boost/context/impl_common/ya.make
index 3a9a118a9c..61f7516118 100644
--- a/contrib/restricted/boost/context/impl_common/ya.make
+++ b/contrib/restricted/boost/context/impl_common/ya.make
@@ -4,9 +4,9 @@ LIBRARY()
WITHOUT_LICENSE_TEXTS()
-VERSION(1.87.0)
+VERSION(1.86.0)
-ORIGINAL_SOURCE(https://github.com/boostorg/context/archive/boost-1.87.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/context/archive/boost-1.86.0.tar.gz)
LICENSE(BSL-1.0)
diff --git a/contrib/restricted/boost/context/include/boost/context/detail/fcontext.hpp b/contrib/restricted/boost/context/include/boost/context/detail/fcontext.hpp
index 52be6083af..00cb24d941 100644
--- a/contrib/restricted/boost/context/include/boost/context/detail/fcontext.hpp
+++ b/contrib/restricted/boost/context/include/boost/context/detail/fcontext.hpp
@@ -27,11 +27,14 @@ struct transfer_t {
void * data;
};
-BOOST_CONTEXT_DECL transfer_t jump_fcontext( fcontext_t const to, void * vp);
-BOOST_CONTEXT_DECL fcontext_t make_fcontext( void * sp, std::size_t size, void (* fn)( transfer_t) );
+extern "C" BOOST_CONTEXT_DECL
+transfer_t BOOST_CONTEXT_CALLDECL jump_fcontext( fcontext_t const to, void * vp);
+extern "C" BOOST_CONTEXT_DECL
+fcontext_t BOOST_CONTEXT_CALLDECL make_fcontext( void * sp, std::size_t size, void (* fn)( transfer_t) );
// based on an idea of Giovanni Derreta
-BOOST_CONTEXT_DECL transfer_t ontop_fcontext( fcontext_t const to, void * vp, transfer_t (* fn)( transfer_t) );
+extern "C" BOOST_CONTEXT_DECL
+transfer_t BOOST_CONTEXT_CALLDECL ontop_fcontext( fcontext_t const to, void * vp, transfer_t (* fn)( transfer_t) );
}}}
diff --git a/contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_elf_gas.S b/contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_elf_gas.S
index 7c1f075355..cefd1830d7 100644
--- a/contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_elf_gas.S
@@ -55,7 +55,6 @@
.text
.align 2
.global jump_fcontext
-.hidden jump_fcontext
.type jump_fcontext, %function
jump_fcontext:
# prepare stack for GP + FPU
diff --git a/contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_macho_gas.S b/contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_macho_gas.S
index 12cc021586..31738f7453 100644
--- a/contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/jump_arm64_aapcs_macho_gas.S
@@ -52,7 +52,6 @@
*******************************************************/
.text
-.private_extern _jump_fcontext
.globl _jump_fcontext
.balign 16
_jump_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/jump_arm_aapcs_elf_gas.S b/contrib/restricted/boost/context/src/asm/jump_arm_aapcs_elf_gas.S
index 9934c0897c..86efe9d821 100644
--- a/contrib/restricted/boost/context/src/asm/jump_arm_aapcs_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/jump_arm_aapcs_elf_gas.S
@@ -41,7 +41,6 @@
.file "jump_arm_aapcs_elf_gas.S"
.text
.globl jump_fcontext
-.hidden jump_fcontext
.align 2
.type jump_fcontext,%function
.syntax unified
diff --git a/contrib/restricted/boost/context/src/asm/jump_arm_aapcs_macho_gas.S b/contrib/restricted/boost/context/src/asm/jump_arm_aapcs_macho_gas.S
index 44e7f2a422..077c36409e 100644
--- a/contrib/restricted/boost/context/src/asm/jump_arm_aapcs_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/jump_arm_aapcs_macho_gas.S
@@ -39,7 +39,6 @@
*******************************************************/
.text
-.private_extern _jump_fcontext
.globl _jump_fcontext
.align 2
_jump_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/jump_i386_sysv_elf_gas.S b/contrib/restricted/boost/context/src/asm/jump_i386_sysv_elf_gas.S
index d00ac4fffd..ed83717ce2 100644
--- a/contrib/restricted/boost/context/src/asm/jump_i386_sysv_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/jump_i386_sysv_elf_gas.S
@@ -31,7 +31,6 @@
.file "jump_i386_sysv_elf_gas.S"
.text
.globl jump_fcontext
-.hidden jump_fcontext
.align 2
.type jump_fcontext,@function
jump_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/jump_i386_sysv_macho_gas.S b/contrib/restricted/boost/context/src/asm/jump_i386_sysv_macho_gas.S
index 12aa702be9..8ab7c6f29c 100644
--- a/contrib/restricted/boost/context/src/asm/jump_i386_sysv_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/jump_i386_sysv_macho_gas.S
@@ -25,7 +25,6 @@
****************************************************************************************/
.text
-.private_extern _jump_fcontext
.globl _jump_fcontext
.align 2
_jump_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_elf_gas.S b/contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_elf_gas.S
index 2eff59a380..be264bdc2e 100644
--- a/contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_elf_gas.S
@@ -44,7 +44,6 @@
.file "jump_x86_64_sysv_elf_gas.S"
.text
.globl jump_fcontext
-.hidden jump_fcontext
.type jump_fcontext,@function
.align 16
jump_fcontext:
@@ -74,6 +73,14 @@ jump_fcontext:
/* read the current SSP and store it */
rdsspq %rcx
movq %rcx, (%rsp)
+#endif
+
+#if BOOST_CONTEXT_SHADOW_STACK
+ /* grow the stack to reserve space for shadow stack pointer(SSP) */
+ leaq -0x8(%rsp), %rsp
+ /* read the current SSP and store it */
+ rdsspq %rcx
+ movq %rcx, (%rsp)
# endif
/* store RSP (pointing to context-data) in RAX */
diff --git a/contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_macho_gas.S b/contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_macho_gas.S
index 673daa61df..afc3e5c126 100644
--- a/contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/jump_x86_64_sysv_macho_gas.S
@@ -25,7 +25,6 @@
****************************************************************************************/
.text
-.private_extern _jump_fcontext
.globl _jump_fcontext
.align 8
_jump_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/make_arm64_aapcs_elf_gas.S b/contrib/restricted/boost/context/src/asm/make_arm64_aapcs_elf_gas.S
index 8ac825bf54..66cfb2da17 100644
--- a/contrib/restricted/boost/context/src/asm/make_arm64_aapcs_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/make_arm64_aapcs_elf_gas.S
@@ -55,7 +55,6 @@
.text
.align 2
.global make_fcontext
-.hidden make_fcontext
.type make_fcontext, %function
make_fcontext:
# shift address in x0 (allocated stack) to lower 16 byte boundary
diff --git a/contrib/restricted/boost/context/src/asm/make_arm64_aapcs_macho_gas.S b/contrib/restricted/boost/context/src/asm/make_arm64_aapcs_macho_gas.S
index a6a1314c0d..b30b1e3e5b 100644
--- a/contrib/restricted/boost/context/src/asm/make_arm64_aapcs_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/make_arm64_aapcs_macho_gas.S
@@ -52,7 +52,6 @@
*******************************************************/
.text
-.private_extern _make_fcontext
.globl _make_fcontext
.balign 16
diff --git a/contrib/restricted/boost/context/src/asm/make_arm_aapcs_elf_gas.S b/contrib/restricted/boost/context/src/asm/make_arm_aapcs_elf_gas.S
index 9616e566af..98ae64b43f 100644
--- a/contrib/restricted/boost/context/src/asm/make_arm_aapcs_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/make_arm_aapcs_elf_gas.S
@@ -41,7 +41,6 @@
.file "make_arm_aapcs_elf_gas.S"
.text
.globl make_fcontext
-.hidden make_fcontext
.align 2
.type make_fcontext,%function
.syntax unified
diff --git a/contrib/restricted/boost/context/src/asm/make_arm_aapcs_macho_gas.S b/contrib/restricted/boost/context/src/asm/make_arm_aapcs_macho_gas.S
index de934075d2..c909ae9d43 100644
--- a/contrib/restricted/boost/context/src/asm/make_arm_aapcs_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/make_arm_aapcs_macho_gas.S
@@ -39,7 +39,6 @@
*******************************************************/
.text
-.private_extern _make_fcontext
.globl _make_fcontext
.align 2
_make_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/make_i386_sysv_elf_gas.S b/contrib/restricted/boost/context/src/asm/make_i386_sysv_elf_gas.S
index 992bae019a..c6e0b36558 100644
--- a/contrib/restricted/boost/context/src/asm/make_i386_sysv_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/make_i386_sysv_elf_gas.S
@@ -31,7 +31,6 @@
.file "make_i386_sysv_elf_gas.S"
.text
.globl make_fcontext
-.hidden make_fcontext
.align 2
.type make_fcontext,@function
make_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/make_i386_sysv_macho_gas.S b/contrib/restricted/boost/context/src/asm/make_i386_sysv_macho_gas.S
index a5890d75f6..519e406248 100644
--- a/contrib/restricted/boost/context/src/asm/make_i386_sysv_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/make_i386_sysv_macho_gas.S
@@ -25,7 +25,6 @@
****************************************************************************************/
.text
-.private_extern _make_fcontext
.globl _make_fcontext
.align 2
_make_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/make_x86_64_sysv_elf_gas.S b/contrib/restricted/boost/context/src/asm/make_x86_64_sysv_elf_gas.S
index 7561c0896b..b0d0c0341e 100644
--- a/contrib/restricted/boost/context/src/asm/make_x86_64_sysv_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/make_x86_64_sysv_elf_gas.S
@@ -44,7 +44,6 @@
.file "make_x86_64_sysv_elf_gas.S"
.text
.globl make_fcontext
-.hidden make_fcontext
.type make_fcontext,@function
.align 16
make_fcontext:
@@ -93,6 +92,35 @@ make_fcontext:
movq %rcx, 0x38(%rax)
#if BOOST_CONTEXT_SHADOW_STACK
+ /* Populate the shadow stack and normal stack */
+ /* get original SSP */
+ rdsspq %r8
+ /* restore new shadow stack */
+ rstorssp -0x8(%r9)
+ /* save the restore token on the original shadow stack */
+ saveprevssp
+ /* push the address of "jmp trampoline" to the new shadow stack */
+ /* as well as the stack */
+ call 1f
+ jmp trampoline
+1:
+ /* save address of "jmp trampoline" as return-address */
+ /* for context-function */
+ pop 0x38(%rax)
+ /* Get the new SSP. */
+ rdsspq %r9
+ /* restore original shadow stack */
+ rstorssp -0x8(%r8)
+ /* save the restore token on the new shadow stack. */
+ saveprevssp
+
+ /* reserve space for the new SSP */
+ leaq -0x8(%rax), %rax
+ /* save the new SSP to this fcontext */
+ movq %r9, (%rax)
+#endif
+
+#if BOOST_CONTEXT_SHADOW_STACK
/* Populate the shadow stack */
/* get original SSP */
diff --git a/contrib/restricted/boost/context/src/asm/make_x86_64_sysv_macho_gas.S b/contrib/restricted/boost/context/src/asm/make_x86_64_sysv_macho_gas.S
index 06357f678a..5d6c5431c5 100644
--- a/contrib/restricted/boost/context/src/asm/make_x86_64_sysv_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/make_x86_64_sysv_macho_gas.S
@@ -25,7 +25,6 @@
****************************************************************************************/
.text
-.private_extern _make_fcontext
.globl _make_fcontext
.align 8
_make_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_elf_gas.S b/contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_elf_gas.S
index 8e40fc7d36..665ca5a2c1 100644
--- a/contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_elf_gas.S
@@ -55,7 +55,6 @@
.text
.align 2
.global ontop_fcontext
-.hidden ontop_fcontext
.type ontop_fcontext, %function
ontop_fcontext:
# prepare stack for GP + FPU
diff --git a/contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_macho_gas.S b/contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_macho_gas.S
index 8babe47023..a387d06dd2 100644
--- a/contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/ontop_arm64_aapcs_macho_gas.S
@@ -52,7 +52,6 @@
*******************************************************/
.text
-.private_extern _ontop_fcontext
.global _ontop_fcontext
.balign 16
_ontop_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_elf_gas.S b/contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_elf_gas.S
index 8c6c9020de..59ad5ca9ce 100644
--- a/contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_elf_gas.S
@@ -41,7 +41,6 @@
.file "ontop_arm_aapcs_elf_gas.S"
.text
.globl ontop_fcontext
-.hidden ontop_fcontext
.align 2
.type ontop_fcontext,%function
.syntax unified
diff --git a/contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_macho_gas.S b/contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_macho_gas.S
index 07e63fb24f..3633aca641 100644
--- a/contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/ontop_arm_aapcs_macho_gas.S
@@ -39,7 +39,6 @@
*******************************************************/
.text
-.private_extern _ontop_fcontext
.globl _ontop_fcontext
.align 2
_ontop_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/ontop_i386_sysv_elf_gas.S b/contrib/restricted/boost/context/src/asm/ontop_i386_sysv_elf_gas.S
index ea7a75b90f..0cb6168fab 100644
--- a/contrib/restricted/boost/context/src/asm/ontop_i386_sysv_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/ontop_i386_sysv_elf_gas.S
@@ -24,14 +24,9 @@
* *
****************************************************************************************/
-#ifdef __x86_64__
-#include "ontop_x86_64_sysv_elf_gas.S"
-#else
-
.file "ontop_i386_sysv_elf_gas.S"
.text
.globl ontop_fcontext
-.hidden ontop_fcontext
.align 2
.type ontop_fcontext,@function
ontop_fcontext:
@@ -103,5 +98,3 @@ ontop_fcontext:
/* Mark that we don't need executable stack. */
.section .note.GNU-stack,"",%progbits
-
-#endif
diff --git a/contrib/restricted/boost/context/src/asm/ontop_i386_sysv_macho_gas.S b/contrib/restricted/boost/context/src/asm/ontop_i386_sysv_macho_gas.S
index c129e8e0c7..3a88372b3a 100644
--- a/contrib/restricted/boost/context/src/asm/ontop_i386_sysv_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/ontop_i386_sysv_macho_gas.S
@@ -25,7 +25,6 @@
****************************************************************************************/
.text
-.private_extern _ontop_fcontext
.globl _ontop_fcontext
.align 2
_ontop_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_elf_gas.S b/contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_elf_gas.S
index e3e4bdf870..c3892b8ba0 100644
--- a/contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_elf_gas.S
+++ b/contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_elf_gas.S
@@ -40,7 +40,6 @@
.file "ontop_x86_64_sysv_elf_gas.S"
.text
.globl ontop_fcontext
-.hidden ontop_fcontext
.type ontop_fcontext,@function
.align 16
ontop_fcontext:
diff --git a/contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_macho_gas.S b/contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_macho_gas.S
index 7d15b5ba24..49755c69b0 100644
--- a/contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_macho_gas.S
+++ b/contrib/restricted/boost/context/src/asm/ontop_x86_64_sysv_macho_gas.S
@@ -25,7 +25,6 @@
****************************************************************************************/
.text
-.private_extern _ontop_fcontext
.globl _ontop_fcontext
.align 8
_ontop_fcontext:
diff --git a/contrib/restricted/boost/context/src/fcontext.cpp b/contrib/restricted/boost/context/src/fcontext.cpp
deleted file mode 100644
index 9fe0a4892d..0000000000
--- a/contrib/restricted/boost/context/src/fcontext.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
-// Distributed under the Boost Software License, Version 1.0.
-// (See accompanying file LICENSE_1_0.txt or copy at
-// http://www.boost.org/LICENSE_1_0.txt)
-
-// This code wraps the plain C asm symbols into properly
-// namespaced and mangled C++ symbols that are safe to
-// export from a library.
-
-#include <boost/context/detail/fcontext.hpp>
-
-extern "C"
-boost::context::detail::transfer_t BOOST_CONTEXT_CALLDECL jump_fcontext( boost::context::detail::fcontext_t const to, void * vp);
-extern "C"
-boost::context::detail::fcontext_t BOOST_CONTEXT_CALLDECL make_fcontext( void * sp, std::size_t size, void (* fn)( boost::context::detail::transfer_t) );
-
-// based on an idea of Giovanni Derreta
-extern "C"
-boost::context::detail::transfer_t BOOST_CONTEXT_CALLDECL ontop_fcontext( boost::context::detail::fcontext_t const to, void * vp, boost::context::detail::transfer_t (* fn)( boost::context::detail::transfer_t) );
-
-namespace boost {
-namespace context {
-namespace detail {
-
-transfer_t jump_fcontext( fcontext_t const to, void * vp)
-{
- return ::jump_fcontext(to, vp);
-}
-
-fcontext_t make_fcontext( void * sp, std::size_t size, void (* fn)( transfer_t) )
-{
- return ::make_fcontext(sp, size, fn);
-}
-
-transfer_t ontop_fcontext( fcontext_t const to, void * vp, transfer_t (* fn)( transfer_t) )
-{
- return ::ontop_fcontext(to, vp, fn);
-}
-}}}
diff --git a/contrib/restricted/boost/context/ucontext_impl/ya.make b/contrib/restricted/boost/context/ucontext_impl/ya.make
index 8c9ce98e9b..61ba1464c0 100644
--- a/contrib/restricted/boost/context/ucontext_impl/ya.make
+++ b/contrib/restricted/boost/context/ucontext_impl/ya.make
@@ -4,9 +4,9 @@ LIBRARY()
WITHOUT_LICENSE_TEXTS()
-VERSION(1.87.0)
+VERSION(1.86.0)
-ORIGINAL_SOURCE(https://github.com/boostorg/context/archive/boost-1.87.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/context/archive/boost-1.86.0.tar.gz)
LICENSE(BSL-1.0)
diff --git a/contrib/restricted/boost/context/ya.make b/contrib/restricted/boost/context/ya.make
index d3c74aa986..f70cdc034c 100644
--- a/contrib/restricted/boost/context/ya.make
+++ b/contrib/restricted/boost/context/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(1.87.0)
+VERSION(1.86.0)
-ORIGINAL_SOURCE(https://github.com/boostorg/context/archive/boost-1.87.0.tar.gz)
+ORIGINAL_SOURCE(https://github.com/boostorg/context/archive/boost-1.86.0.tar.gz)
IF (SANITIZER_TYPE)
PEERDIR(