From cfd50a0fa4a0821773b41a2ce4f5565461940447 Mon Sep 17 00:00:00 2001
From: Yvan Roux <yvan.roux@foss.st.com>
Date: Thu, 4 Jan 2024 10:57:40 +0100
Subject: [PATCH 1/2] arch_test.h: Reuse .ifc for string comparisons

Using LLVM to build the testsuite is broken since commit d885d66. Revert
the changes to reuse .ifc for string comparisons and make spacing format
consistent.
---
 riscv-test-suite/env/arch_test.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/riscv-test-suite/env/arch_test.h b/riscv-test-suite/env/arch_test.h
index bfb74b4b7..fee1e748b 100644
--- a/riscv-test-suite/env/arch_test.h
+++ b/riscv-test-suite/env/arch_test.h
@@ -574,13 +574,13 @@
 /******************************************************************************/
 
  .macro XCSR_RENAME __MODE__    // enable CSR names to be parameterized, V,S merged
-  .ifc   \__MODE__, M
+  .ifc   \__MODE__ , M
        _XCSR_RENAME_M
   .endif
-  .ifc   \__MODE__, S
+  .ifc   \__MODE__ , S
        _XCSR_RENAME_S
   .endif
-  .ifc  \__MODE__,  V
+  .ifc  \__MODE__ ,  V
        _XCSR_RENAME_S
   .endif
 .endm
@@ -593,13 +593,13 @@
 /******************************************************************************/
 
  .macro XCSR_VRENAME __MODE__   // enable CSR names to be parameterized, V,S separate 
-  .ifc   \__MODE__, M
+  .ifc   \__MODE__ , M
        _XCSR_RENAME_M
   .endif
-  .ifc   \__MODE__, S
+  .ifc   \__MODE__ , S
        _XCSR_RENAME_S
   .endif
-  .ifc  \__MODE__,  V
+  .ifc  \__MODE__ ,  V
        _XCSR_RENAME_V
   .endif
  .endm
@@ -979,10 +979,10 @@ init_\__MODE__\()scratch:
 //----------------------------------------------------------------------
 init_\__MODE__\()edeleg:
         li      T2, 0                   // save and clear edeleg so we can exit to Mmode
-.if (\__MODE__\() == V)
+.ifc \__MODE__ , V
         csrrw   T2, CSR_VEDELEG, T2     // special case: VS EDELEG available from Vmode
 .else
-  .if (\__MODE__\() == M)
+  .ifc \__MODE__ , M
     #ifdef rvtest_strap_routine
         csrrw   T2, CSR_XEDELEG, T2     // this handles M  mode save, but only if Smode exists
     #endif

From 5645290298620178decb63b57abb305afb8019f5 Mon Sep 17 00:00:00 2001
From: Yvan Roux <yvan.roux@foss.st.com>
Date: Thu, 4 Jan 2024 11:20:38 +0100
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6846c0469..2511d0928 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # CHANGELOG
 
+## [3.8.8] -- 2024-01-04
+- Fixed macros to allow assembling tests with LLVM.
+
 ## [3.8.7] -- 2024-01-02
 - Update satp initialization macro