diff options
| author | AlexSm <alex@ydb.tech> | 2024-05-06 18:27:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-06 18:27:11 +0200 |
| commit | 068e8291de67631f063304b76dda3c1fd6601c12 (patch) | |
| tree | f9058c69ef88f04c55ff9c92949dffa8cd6b83a5 /contrib/restricted/boost/atomic | |
| parent | 653a427438ab0fa69068180c34233b015af0d405 (diff) | |
| parent | 41f0129e44731de1ba129fbae27008f8a4048fdc (diff) | |
| download | ydb-068e8291de67631f063304b76dda3c1fd6601c12.tar.gz | |
Merge pull request #4325 from ydb-platform/mergelibs-240506-1255
Library import 240506-1255
Diffstat (limited to 'contrib/restricted/boost/atomic')
| -rw-r--r-- | contrib/restricted/boost/atomic/include/boost/atomic/detail/pause.hpp | 7 | ||||
| -rw-r--r-- | contrib/restricted/boost/atomic/ya.make | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/contrib/restricted/boost/atomic/include/boost/atomic/detail/pause.hpp b/contrib/restricted/boost/atomic/include/boost/atomic/detail/pause.hpp index efdfb62b6a..0d47c927aa 100644 --- a/contrib/restricted/boost/atomic/include/boost/atomic/detail/pause.hpp +++ b/contrib/restricted/boost/atomic/include/boost/atomic/detail/pause.hpp @@ -48,6 +48,13 @@ BOOST_FORCEINLINE void pause() BOOST_NOEXCEPT __asm__ __volatile__("pause;" : : : "memory"); #elif (defined(__ARM_ARCH) && __ARM_ARCH >= 8) || defined(__ARM_ARCH_8A__) || defined(__aarch64__) __asm__ __volatile__("yield;" : : : "memory"); +#elif defined(__riscv) && __riscv_xlen == 64 +#if defined(__riscv_zihintpause) + __asm__ __volatile__("pause" : : : "memory"); +#else + /* Encoding of the pause instruction */ + __asm__ __volatile__ (".4byte 0x100000F"); +#endif #endif #endif } diff --git a/contrib/restricted/boost/atomic/ya.make b/contrib/restricted/boost/atomic/ya.make index beac80ecb1..8151509c51 100644 --- a/contrib/restricted/boost/atomic/ya.make +++ b/contrib/restricted/boost/atomic/ya.make @@ -6,9 +6,9 @@ LICENSE(BSL-1.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(1.84.0) +VERSION(1.85.0) -ORIGINAL_SOURCE(https://github.com/boostorg/atomic/archive/boost-1.84.0.tar.gz) +ORIGINAL_SOURCE(https://github.com/boostorg/atomic/archive/boost-1.85.0.tar.gz) PEERDIR( contrib/restricted/boost/align |