From 8c7c252cffbdbb3f3ed0e7dc5a285ede64679257 Mon Sep 17 00:00:00 2001
From: "Benjamin A. Beasley" <code@musicinmybrain.net>
Date: Mon, 10 Jun 2024 13:47:14 -0400
Subject: [PATCH] Backport patch for RISC-V negative NaN issue

---
 ...f6cc87e7a21d92f9f96a72263a93d3929ec7.patch | 52 +++++++++++++++++++
 abseil-cpp.spec                               | 22 ++++----
 2 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch

diff --git a/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch b/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
new file mode 100644
index 0000000..3875985
--- /dev/null
+++ b/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
@@ -0,0 +1,52 @@
+From 96cdf6cc87e7a21d92f9f96a72263a93d3929ec7 Mon Sep 17 00:00:00 2001
+From: Benjamin Barenblat <bbaren@google.com>
+Date: Mon, 10 Jun 2024 10:14:21 -0700
+Subject: [PATCH] Disable negative NaN float ostream format checking on RISC-V
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It’s not clear whether negative NaN floats are supposed to print as
+"-nan" or "nan" on RISC-V (https://cplusplus.github.io/LWG/issue4101).
+Until that’s resolved, don’t require that logging such a float with
+Abseil produce the same result as streaming it to an ostream does.
+
+Closes: https://github.com/abseil/abseil-cpp/issues/1684
+PiperOrigin-RevId: 641942176
+Change-Id: Iec7ef130cc15c114714f2d124cb37886b3c37ab4
+---
+ absl/log/log_format_test.cc | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+diff --git a/absl/log/log_format_test.cc b/absl/log/log_format_test.cc
+index dbad5d97615..8ca6df3e586 100644
+--- a/absl/log/log_format_test.cc
++++ b/absl/log/log_format_test.cc
+@@ -608,6 +608,19 @@ TYPED_TEST(FloatingPointLogFormatTest, NegativeNaN) {
+   auto comparison_stream = ComparisonStream();
+   comparison_stream << value;
+ 
++  // On RISC-V, don't expect that formatting -NaN produces the same string as
++  // streaming it. #ifdefing out just the relevant line breaks the MSVC build,
++  // so duplicate the entire EXPECT_CALL.
++#ifdef __riscv
++  EXPECT_CALL(
++      test_sink,
++      Send(AllOf(
++          TextMessage(AnyOf(Eq("-nan"), Eq("nan"), Eq("NaN"), Eq("-nan(ind)"))),
++          ENCODED_MESSAGE(
++              AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"),
++                    EqualsProto(R"pb(value { str: "nan" })pb"),
++                    EqualsProto(R"pb(value { str: "-nan(ind)" })pb"))))));
++#else
+   EXPECT_CALL(
+       test_sink,
+       Send(AllOf(
+@@ -617,6 +630,7 @@ TYPED_TEST(FloatingPointLogFormatTest, NegativeNaN) {
+               AnyOf(EqualsProto(R"pb(value { str: "-nan" })pb"),
+                     EqualsProto(R"pb(value { str: "nan" })pb"),
+                     EqualsProto(R"pb(value { str: "-nan(ind)" })pb"))))));
++#endif
+   test_sink.StartCapturingLogs();
+   LOG(INFO) << value;
+ }
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 60341a9..3cf5983 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -24,6 +24,15 @@ License:        Apache-2.0 AND LicenseRef-Fedora-Public-Domain
 URL:            https://abseil.io
 Source0:        https://github.com/abseil/abseil-cpp/archive/%{version}/%{name}-%{version}.tar.gz
 
+# Disable negative NaN float ostream format checking on RISC-V
+# https://github.com/abseil/abseil-cpp/commit/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7
+#
+# Fixes:
+#
+# [Bug]: NegativeNaN test fails on riscv64
+# https://github.com/abseil/abseil-cpp/issues/1684
+Patch:          https://github.com/abseil/abseil-cpp/commit/96cdf6cc87e7a21d92f9f96a72263a93d3929ec7.patch
+
 BuildRequires:  cmake
 # The default make backend would work just as well; ninja is observably faster
 BuildRequires:  ninja-build
@@ -90,19 +99,6 @@ Development headers for %{name}
 %prep
 %autosetup -p1 -S gendiff
 
-%ifarch riscv64
-# [Bug]: NegativeNaN test fails on riscv64
-# https://github.com/abseil/abseil-cpp/issues/1684
-# NOTE(davidlt): see https://github.com/WebAssembly/design/issues/646
-# [==========] 125 tests from 35 test suites ran. (3501 ms total)
-# [  PASSED  ] 124 tests.
-# [  FAILED  ] 1 test, listed below:
-# [  FAILED  ] FloatingPointLogFormatTest/0.NegativeNaN, where TypeParam = float
-#  1 FAILED TEST
-sed -r -i 's/\bNegativeNaN\b/DISABLED_&/' \
-    absl/log/log_format_test.cc
-%endif
-
 %build
 # ABSL_BUILD_TEST_HELPERS is needed to build libraries for the -testing
 # subpackage when tests are not enabled. It is therefore redundant here, but we