gentoo auto-resync : 19:03:2024 - 00:49:58

2 files changed, 0 insertions, 41 deletions

diff --git a/dev-libs/rocksdb/Manifest b/dev-libs/rocksdb/Manifest
index 1730731b9ed3..38aa559f969e 100644
--- a/dev-libs/rocksdb/Manifest
+++ b/dev-libs/rocksdb/Manifest
@@ -1,5 +1,4 @@
 AUX rocksdb-6.14.6-gcc13.patch 1139 BLAKE2B 9cc1fc9a51f6e96c36564c1df33ab0648ce823c1dda7415bf122904028e3a5ec54386f90426cff77580f0b3a0d7ad55650610a8421400caf966ee7600644ec96 SHA512 c72bbe325d989411fbc6b34f5f1ce55053703bf49f30355e9b45595bcc611785dd5783cb21b59c381e4eeee5df458abb2b9717afcaea278135785006216eb922
-AUX rocksdb-6.17.3-add_timer_for_riscv.patch 1647 BLAKE2B d1e78c98149f534ce8d02754f5e15b5aeccadb99cf82586bd24c44c68aef5134bdd5d00f5f81699bae59f27ae9f565f40069afedba081f7a76ec54d90a37462b SHA512 ebcf6c5df091860bf53edf54af47678e90da251f28d0ed46be7ac1cf32f50528f8185e94d82ec770c97aa23d24dfcbba634ffcf2671a5dad5fcfd6104115bb69
 AUX rocksdb-6.17.3-libatomic.patch 2131 BLAKE2B 2f12fee9b062cf4bf633d784bd4234a1076d0b763f85b9ab0332c828661674944251098e7784b07118e95aa2f4729360cfe3b7b0c95afe58772ea0d3579afd96 SHA512 4717fb67b322f34a2fa351eac1d8fdcbf239acedefd8bcb69c07f11f472f0adc8579e7ddf01be6ba9239009f81d8df4b1cbfb1b88e996ad63fc1d3ff8b801526
 AUX rocksdb-7.9.2-gcc-13.patch 1117 BLAKE2B 675802fdeee88304b37e0a7a50685f5103d52b017fe8551ef562f7336421cc28501774a5c7e0ec83e18ddff2be8258a67e3e6abe8131158207963a385de4deb2 SHA512 c55e33fcca683248bd49a342e923736f27b3fbf98443f09bb6a2df7dfe571b93d99997aa8cf308879d77d63beed12e3b50dd30aa0b745b4488304055decf5c29
 DIST rocksdb-6.14.6.tar.gz 6397194 BLAKE2B 43ad8e7e9fdf0c6c75ff03370f2107899bbcef9fd34630c85408abcf208a8213f5e24ea50407bd6a719220b6c29b9ba29c121e94a5a2701f637b17ccf50b90a4 SHA512 609f407b0b2810954541ad8ebad5c754ebfde5021f24ee4b3f1544a5335252c06cbe2b282562e3d084bb9cbe8de239668fdedb2d2d726056c31cf9463db08fe7
diff --git a/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch b/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch
deleted file mode 100644
index b98cc9dc5fd6..000000000000
--- a/dev-libs/rocksdb/files/rocksdb-6.17.3-add_timer_for_riscv.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Add timer for riscv.
-Upstream PR status: https://github.com/facebook/rocksdb/pull/9215
-This PR hasn't been merged into the main branch.
-https://bugs.gentoo.org/834855
-
---- a/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-+++ b/utilities/transactions/lock/range/range_tree/lib/portability/toku_time.h
-@@ -101,7 +101,7 @@ int toku_clock_gettime(clockid_t clk_id, struct timespec *ts) __attribute__((__v
- typedef uint64_t tokutime_t;  // Time type used in by tokutek timers.
- 
- #if 0
--// The value of tokutime_t is not specified here. 
-+// The value of tokutime_t is not specified here.
- // It might be microseconds since 1/1/1970 (if gettimeofday() is
- // used), or clock cycles since boot (if rdtsc is used).  Or something
- // else.
-@@ -133,6 +133,23 @@ static inline tokutime_t toku_time_now(void) {
-   return result;
- #elif defined(__powerpc__)
-   return __ppc_get_timebase();
-+#elif defined(__riscv) && __riscv_xlen == 32
-+  uint32_t cycles_lo, cycles_hi0, cycles_hi1;
-+  // Implemented in assembly because Clang insisted on branching.
-+  asm volatile(
-+               "rdcycleh %0\n"
-+               "rdcycle %1\n"
-+               "rdcycleh %2\n"
-+               "sub %0, %0, %2\n"
-+               "seqz %0, %0\n"
-+               "sub %0, zero, %0\n"
-+               "and %1, %1, %0\n"
-+               : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1));
-+  return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo;
-+#elif defined(__riscv) && __riscv_xlen == 64
-+  uint64_t cycles;
-+  asm volatile("rdcycle %0" : "=r"(cycles));
-+  return cycles;
- #else
- #error No timer implementation for this platform
- #endif