From 7fc76dd9d3d0abc441f52067351dbf06ed3553fd Mon Sep 17 00:00:00 2001 From: Wilson Snyder Date: Thu, 26 Mar 2026 22:33:20 -0400 Subject: [PATCH] Fix Ubuntu 26.04.beta issues --- ci/ci-install.bash | 16 ++++++++-------- ci/ci-script.bash | 6 +++--- configure.ac | 2 ++ test_regress/t/t_net_delay_timing_sc.py | 3 +++ test_regress/t/t_timing_clkgen_sc.py | 3 +++ 5 files changed, 19 insertions(+), 11 deletions(-) diff --git a/ci/ci-install.bash b/ci/ci-install.bash index 91b0f1bfc..e1f8bb1ad 100755 --- a/ci/ci-install.bash +++ b/ci/ci-install.bash @@ -30,7 +30,7 @@ elif [ "$CI_OS_NAME" = "osx" ]; then elif [ "$CI_OS_NAME" = "freebsd" ]; then MAKE=gmake else - fatal "Unknown os: '$CI_OS_NAME'" + fatal "Unknown CI_OS_NAME: '$CI_OS_NAME'" fi if [ "$CI_OS_NAME" = "linux" ]; then @@ -63,11 +63,11 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then sudo apt-get install libjemalloc-dev || sudo apt-get install libjemalloc-dev fi - if [[ "$CI_RUNS_ON" =~ "ubuntu-20.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-22.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-24.04" ]]; then + if [[ "$CI_RUNS_ON" =~ "ubuntu-22.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-24.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-26.04" ]]; then sudo apt-get install libsystemc libsystemc-dev || sudo apt-get install libsystemc libsystemc-dev fi - if [[ "$CI_RUNS_ON" =~ "ubuntu-22.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-24.04" ]]; then + if [[ "$CI_RUNS_ON" =~ "ubuntu-22.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-24.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-26.04" ]]; then sudo apt-get install bear mold || sudo apt-get install bear mold fi @@ -79,7 +79,7 @@ if [ "$CI_BUILD_STAGE_NAME" = "build" ]; then elif [ "$CI_OS_NAME" = "freebsd" ]; then sudo pkg install -y autoconf bison ccache gmake perl5 else - fatal "Unknown os: '$CI_OS_NAME'" + fatal "Unknown CI_OS_NAME: '$CI_OS_NAME'" fi if [ -n "$CCACHE_DIR" ]; then @@ -97,11 +97,11 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then sudo apt-get install gdb gtkwave lcov libfl-dev ccache jq z3 || sudo apt-get install gdb gtkwave lcov libfl-dev ccache jq z3 # Required for test_regress/t/t_dist_attributes.py - if [[ "$CI_RUNS_ON" =~ "ubuntu-22.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-24.04" ]]; then + if [[ "$CI_RUNS_ON" =~ "ubuntu-22.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-24.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-26.04" ]]; then sudo apt-get install python3-clang mold || sudo apt-get install python3-clang mold fi - if [[ "$CI_RUNS_ON" =~ "ubuntu-20.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-22.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-24.04" ]]; then + if [[ "$CI_RUNS_ON" =~ "ubuntu-22.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-24.04" ]] || [[ "$CI_RUNS_ON" =~ "ubuntu-26.04" ]]; then sudo apt-get install libsystemc-dev || sudo apt-get install libsystemc-dev fi @@ -113,7 +113,7 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then # fst2vcd fails with "Could not open '', exiting." sudo pkg install -y ccache gmake perl5 python3 jq z3 else - fatal "Unknown os: '$CI_OS_NAME'" + fatal "Unknown CI_OS_NAME: '$CI_OS_NAME'" fi # Common installs install-vcddiff @@ -122,5 +122,5 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then else ############################################################################## # Unknown build stage - fatal "Unknown build stage: '$CI_BUILD_STAGE_NAME'" + fatal "Unknown CI_BUILD_STAGE_NAME: '$CI_BUILD_STAGE_NAME'" fi diff --git a/ci/ci-script.bash b/ci/ci-script.bash index 816fe6636..aa7a5987a 100755 --- a/ci/ci-script.bash +++ b/ci/ci-script.bash @@ -29,7 +29,7 @@ elif [ "$CI_OS_NAME" = "freebsd" ]; then export MAKE=gmake NPROC=$(sysctl -n hw.ncpu) else - fatal "Unknown os: '$CI_OS_NAME'" + fatal "Unknown CI_OS_NAME: '$CI_OS_NAME'" fi NPROC=$(expr $NPROC '+' 1) @@ -192,7 +192,7 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then "$MAKE" -C "$TEST_REGRESS" SCENARIOS="--vltmt" DRIVER_HASHSET=--hashset=9/10 ;; *) - fatal "Unknown test: $TESTS" + fatal "Unknown TESTS: $TESTS" ;; esac @@ -204,5 +204,5 @@ elif [ "$CI_BUILD_STAGE_NAME" = "test" ]; then else ############################################################################## # Unknown build stage - fatal "Unknown build stage: '$CI_BUILD_STAGE_NAME'" + fatal "Unknown CI_BUILD_STAGE_NAME: '$CI_BUILD_STAGE_NAME'" fi diff --git a/configure.ac b/configure.ac index 9b3aa1fdd..53cfcb171 100644 --- a/configure.ac +++ b/configure.ac @@ -494,6 +494,7 @@ fi AC_SUBST(HAVE_DEV_ASAN) _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Qunused-arguments) _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Wno-shadow) +_MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Wno-unnecessary-virtual-specifier) _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Wno-unused-parameter) _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-Xclang -fno-pch-timestamp) _MY_CXX_CHECK_OPT(CFG_CXXFLAGS_SRC,-faligned-new) @@ -553,6 +554,7 @@ m4_foreach([cflag],[ [-Wno-tautological-bitwise-compare], [-Wno-tautological-compare], [-Wno-uninitialized], + [-Wno-unnecessary-virtual-specifier], [-Wno-unused-but-set-parameter], [-Wno-unused-but-set-variable], [-Wno-unused-parameter], diff --git a/test_regress/t/t_net_delay_timing_sc.py b/test_regress/t/t_net_delay_timing_sc.py index 85cb5093b..b99593275 100755 --- a/test_regress/t/t_net_delay_timing_sc.py +++ b/test_regress/t/t_net_delay_timing_sc.py @@ -13,6 +13,9 @@ test.scenarios('simulator') test.top_filename = "t/t_net_delay.v" test.main_time_multiplier = 2 +if re.search(r'clang', test.cxx_version): + test.skip("Known clang bug on ubuntu-26.04") + test.compile(verilator_flags2=["--sc --exe --timing --timescale 10ps/1ps"]) test.execute() diff --git a/test_regress/t/t_timing_clkgen_sc.py b/test_regress/t/t_timing_clkgen_sc.py index 4f1bad764..c917da81b 100755 --- a/test_regress/t/t_timing_clkgen_sc.py +++ b/test_regress/t/t_timing_clkgen_sc.py @@ -12,6 +12,9 @@ import vltest_bootstrap test.scenarios('simulator') test.top_filename = "t/t_timing_clkgen2.v" +if re.search(r'clang', test.cxx_version): + test.skip("Known clang bug on ubuntu-26.04") + test.compile(verilator_flags2=["--sc --exe --timing --timescale 10ps/1ps"]) test.execute()