diff --git a/0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch deleted file mode 100644 index f9adc5d6752b688fb0e6f802219af8f1c43b48e6..0000000000000000000000000000000000000000 --- a/0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch +++ /dev/null @@ -1,81 +0,0 @@ -From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001 -From: aurel32 -Date: Fri, 22 Mar 2024 14:21:13 -0700 -Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support - -Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644 - -Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear. - -The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2]. - -Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units. - -This fixes the testsuite on riscv64, tested on a VisionFive 2 board. - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 -[2] https://github.com/abseil/abseil-cpp/pull/1631 -Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1 - -Merging this change closes #1644 - -COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71 -PiperOrigin-RevId: 618286262 -Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652 ---- - absl/base/internal/unscaledcycleclock.cc | 12 ------------ - absl/base/internal/unscaledcycleclock_config.h | 8 ++++---- - 2 files changed, 4 insertions(+), 16 deletions(-) - -diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc -index 05e0e7ba..a0bf3a65 100644 ---- a/absl/base/internal/unscaledcycleclock.cc -+++ b/absl/base/internal/unscaledcycleclock.cc -@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() { - return aarch64_timer_frequency; - } - --#elif defined(__riscv) -- --int64_t UnscaledCycleClock::Now() { -- int64_t virtual_timer_value; -- asm volatile("rdcycle %0" : "=r"(virtual_timer_value)); -- return virtual_timer_value; --} -- --double UnscaledCycleClock::Frequency() { -- return base_internal::NominalCPUFrequency(); --} -- - #elif defined(_M_IX86) || defined(_M_X64) - - #pragma intrinsic(__rdtsc) -diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h -index 24b324ac..43a3dabe 100644 ---- a/absl/base/internal/unscaledcycleclock_config.h -+++ b/absl/base/internal/unscaledcycleclock_config.h -@@ -21,8 +21,8 @@ - - // The following platforms have an implementation of a hardware counter. - #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ -- defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) -+ defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \ -+ (defined(_M_X64) && !defined(_M_ARM64EC)) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 0 -@@ -53,8 +53,8 @@ - #if ABSL_USE_UNSCALED_CYCLECLOCK - // This macro can be used to test if UnscaledCycleClock::Frequency() - // is NominalCPUFrequency() on a particular platform. --#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \ -- defined(_M_IX86) || defined(_M_X64)) -+#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ -+ defined(_M_X64)) - #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY - #endif - #endif --- -2.39.2 - diff --git a/abseil-cpp-20240116.2.tar.gz b/abseil-cpp-20240116.2.tar.gz deleted file mode 100644 index 10a460ce028c2b66f2316768020368065d3c6e99..0000000000000000000000000000000000000000 Binary files a/abseil-cpp-20240116.2.tar.gz and /dev/null differ diff --git a/abseil-cpp-20240722.0.tar.gz b/abseil-cpp-20240722.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b5cc395c49afa2a2dec1d9c4072500494b126974 Binary files /dev/null and b/abseil-cpp-20240722.0.tar.gz differ diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 009c0b683b3b111826b164011fbc7b72d62e5eb9..04e67688bb16b2d886112ded52e4fd4da1152abd 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -2,11 +2,11 @@ %undefine __cmake_in_source_build # Installed library version -%global lib_version 2401.0.0 +%global lib_version 2407.0.0 Name: abseil-cpp -Version: 20240116.2 -Release: 2 +Version: 20240722.0 +Release: 1 Summary: C++ Common Libraries License: Apache-2.0 @@ -15,7 +15,6 @@ Source0: https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}- Patch1: abseil-cpp-20210324.2-sw.patch Patch100: 0001-add-loongarch-suopport-for-abseil-cpp.patch -Patch101: 0002-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch BuildRequires: cmake ninja-build BuildRequires: gcc-c++ @@ -81,7 +80,9 @@ DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" %{_libdir}/libabsl_crc_cpu_detect.so.%{lib_version} %{_libdir}/libabsl_crc_internal.so.%{lib_version} %{_libdir}/libabsl_debugging_internal.so.%{lib_version} +%{_libdir}/libabsl_decode_rust_punycode.so.%{lib_version} %{_libdir}/libabsl_demangle_internal.so.%{lib_version} +%{_libdir}/libabsl_demangle_rust.so.%{lib_version} %{_libdir}/libabsl_die_if_null.so.%{lib_version} %{_libdir}/libabsl_examine_stack.so.%{lib_version} %{_libdir}/libabsl_exponential_biased.so.%{lib_version} @@ -121,6 +122,7 @@ DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" %{_libdir}/libabsl_low_level_hash.so.%{lib_version} %{_libdir}/libabsl_malloc_internal.so.%{lib_version} %{_libdir}/libabsl_periodic_sampler.so.%{lib_version} +%{_libdir}/libabsl_poison.so.%{lib_version} %{_libdir}/libabsl_random_distributions.so.%{lib_version} %{_libdir}/libabsl_random_internal_distribution_test_util.so.%{lib_version} %{_libdir}/libabsl_random_internal_platform.so.%{lib_version} @@ -149,6 +151,7 @@ DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" %{_libdir}/libabsl_throw_delegate.so.%{lib_version} %{_libdir}/libabsl_time.so.%{lib_version} %{_libdir}/libabsl_time_zone.so.%{lib_version} +%{_libdir}/libabsl_utf8_for_code_point.so.%{lib_version} %{_libdir}/libabsl_vlog_config_internal.so.%{lib_version} %files devel @@ -158,6 +161,12 @@ DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" %{_libdir}/pkgconfig/*.pc %changelog +* Thu Sep 5 2024 dillon chen - 20240722.0-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update to 20240722.0 + * Thu Aug 01 2024 xinghe - 20240116.2-2 - Type:bugfix - ID:NA