From f5388b1555122eb3ac1cac972990a5b5cb70938d Mon Sep 17 00:00:00 2001 From: Michiel Derhaeg Date: Tue, 30 Sep 2025 15:17:56 +0200 Subject: [PATCH] fixup! RISC-V: Add -mno-compress option Revert "RISC-V: Add -mno-compress option" This functionality is instead provided in the tcf script. Signed-off-by: Michiel Derhaeg --- gcc/common/config/riscv/riscv-common.cc | 7 ------- gcc/config/riscv/riscv.cc | 3 --- gcc/config/riscv/riscv.opt | 4 ---- gcc/testsuite/gcc.target/riscv/no-compress.c | 7 ------- 4 files changed, 21 deletions(-) delete mode 100644 gcc/testsuite/gcc.target/riscv/no-compress.c diff --git a/gcc/common/config/riscv/riscv-common.cc b/gcc/common/config/riscv/riscv-common.cc index cb2d7d529221..6c456c1bc670 100644 --- a/gcc/common/config/riscv/riscv-common.cc +++ b/gcc/common/config/riscv/riscv-common.cc @@ -933,7 +933,6 @@ riscv_subset_list::to_string (bool version_p) const bool skip_zicsr = false; bool skip_b = false; bool i2p0 = false; - bool skip_zc = false; /* For RISC-V ISA version 2.2 or earlier version, zicsr and zifencei is included in the base ISA. */ @@ -970,9 +969,6 @@ riscv_subset_list::to_string (bool version_p) const skip_b = true; #endif - if (riscv_mno_compress) - skip_zc = true; - for (subset = m_head; subset != NULL; subset = subset->next) { if (((subset->implied_p && skip_zifencei) || i2p0) && @@ -991,9 +987,6 @@ riscv_subset_list::to_string (bool version_p) const if (skip_b && subset->name == "b") continue; - if (skip_zc - && (subset->name.find ("zc") == 0 || subset->name.find ("c") == 0)) - continue; /* For !version_p, we only separate extension with underline for multi-letter extension. */ diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 04046af90f5f..09464ff89386 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -11470,9 +11470,6 @@ riscv_override_options_internal (struct gcc_options *opts) = (cf_protection_level) (opts->x_flag_cf_protection | CF_SET); } - if (opts->x_riscv_mno_compress) - opts->x_riscv_zc_subext = 0; - /* Enable advanced fusion for the ARC-V cores that support it unless explicitly disabled. TODO Add arcv_rmx500 once it supports fusion. */ diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt index 15290ced51c7..8eea4e1de30e 100644 --- a/gcc/config/riscv/riscv.opt +++ b/gcc/config/riscv/riscv.opt @@ -733,10 +733,6 @@ mlong-double-128 Target RejectNegative Negative(mlong-double-64) InverseMask(LONG_DOUBLE_64) Use 128-bit long double. -mno-compress -Target RejectNegative Var(riscv_mno_compress) Init(0) -Don't emit compressed instructions even if the extensions are enabled. - marc-v-rmx-500-series-advanced-fusion Target Mask(ARCV_ADVANCED_FUSION) Explicitly disable or enable advanced fusion for the RMX-500 core. diff --git a/gcc/testsuite/gcc.target/riscv/no-compress.c b/gcc/testsuite/gcc.target/riscv/no-compress.c deleted file mode 100644 index 5d2c0560353f..000000000000 --- a/gcc/testsuite/gcc.target/riscv/no-compress.c +++ /dev/null @@ -1,7 +0,0 @@ -/* { dg-do compile } */ -/* { dg-options " -march=rv32imac -mabi=ilp32 -mno-compress" } */ - -int a, b, c; -int foo(void) { return a + b + c; } - -/* { dg-final { scan-assembler "\.attribute arch, \"rv32i2p1_m2p0_a2p1_zmmul1p0_zaamo1p0_zalrsc1p0\"" } } */