From 6a6ed6649f0adb51ed94bbf3ebf4c3adefae3e6d Mon Sep 17 00:00:00 2001
From: Filip Kokosinski <fkokosinski@antmicro.com>
Date: Thu, 11 Jul 2024 13:37:33 +0200
Subject: [PATCH] wip: fix c disable

---
 run.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/run.py b/run.py
index ac323177..6cf52d50 100644
--- a/run.py
+++ b/run.py
@@ -446,7 +446,9 @@ def gcc_compile(test_list, output_dir, isa, mabi, opts, debug_cmd):
             if 'gen_opts' in test:
                 # Disable compressed instruction
                 if re.search('disable_compressed_instr', test['gen_opts']):
-                    test_isa = re.sub("c", "", test_isa)
+                    # Note that this substitution assumes the cannonical order
+                    # of extensions
+                    test_isa = re.sub(r"(rv.+?)c", r"\1", test_isa)
             # If march/mabi is not defined in the test gcc_opts, use the default
             # setting from the command line.
             if not re.search('march', cmd):