Revert "Revert "verilator fix attempt""

This reverts commit 7532003.
SpinalHDL · Dec 9, 2024 · 998754a · 998754a
1 parent 7532003
commit 998754a
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml
@@ -12,7 +12,7 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v3

diff --git a/.github/workflows/tools.sh b/.github/workflows/tools.sh
@@ -11,9 +11,9 @@ install_verilator(){
   unset VERILATOR_ROOT  # For bash
   cd verilator
   git pull        # Make sure we're up-to-date
-  git checkout v4.218
+  git checkout v4.216
   autoconf        # Create ./configure script
-  ./configure --prefix ~/tools
+  CPPFLAGS=-std=c++14 ./configure --prefix ~/tools
   make -j4
   make install
   cd ..

diff --git a/board.info b/board.info
diff --git a/ext/NaxSoftware b/ext/NaxSoftware
diff --git a/src/test/cpp/naxriscv/input_nax_0.elf b/src/test/cpp/naxriscv/input_nax_0.elf
diff --git a/src/test/cpp/naxriscv/input_nax_27.elf b/src/test/cpp/naxriscv/input_nax_27.elf
diff --git a/src/test/cpp/naxriscv/input_nax_3.elf b/src/test/cpp/naxriscv/input_nax_3.elf
diff --git a/src/test/cpp/naxriscv/input_nax_86.elf b/src/test/cpp/naxriscv/input_nax_86.elf
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ permissions: @@
     jobs:
       build:
-        runs-on: ubuntu-latest
+        runs-on: ubuntu-22.04
         steps:
           - uses: actions/checkout@v3
@@ Expand Down @@