[gcc(refs/vendors/riscv/heads/gcc-13-with-riscv-opts)] Fix typo in add_options_for_riscv_v, add_options_for_riscv_zfh, add_options_for_riscv_d .

Jeff Law law@gcc.gnu.org
Mon Oct 9 12:51:03 GMT 2023


https://gcc.gnu.org/g:89ef006e75e9b4cc9f55206d903a7c103ece3117

commit 89ef006e75e9b4cc9f55206d903a7c103ece3117
Author: Joern Rennecke <joern.rennecke@embecosm.com>
Date:   Sun Oct 1 22:46:43 2023 +0100

    Fix typo in add_options_for_riscv_v, add_options_for_riscv_zfh, add_options_for_riscv_d .
    
    gcc/testsuite/
            * lib/target-supports.exp (add_options_for_riscv_v):
            Fix typo in first regexp.
            (add_options_for_riscv_zfh): Likewise.
            (add_options_for_riscv_d): Likewise.
    
    (cherry picked from commit 5f3da480e7541a9c29d655dccb2463fc5f3cf2c4)

Diff:
---
 gcc/testsuite/lib/target-supports.exp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 022d9004ede..1ba14a39205 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -1990,7 +1990,7 @@ proc riscv_get_arch { } {
 proc add_options_for_riscv_d { flags } {
     if { [lsearch $flags -march=*] >= 0 } {
 	# If there are multiple -march flags, we have to adjust all of them.
-	return [regsub -all -- {((?^|[[:space:]])-march=rv[[:digit:]]*[a-ce-rt-wy]*)d*} $flags \\1d ]
+	return [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*[a-ce-rt-wy]*)d*} $flags \\1d ]
     }
     if { [check_effective_target_riscv_d] } {
 	return "$flags"
@@ -2001,7 +2001,7 @@ proc add_options_for_riscv_d { flags } {
 proc add_options_for_riscv_v { flags } {
     if { [lsearch $flags -march=*] >= 0 } {
 	# If there are multiple -march flags, we have to adjust all of them.
-	return [regsub -all -- {((?^|[[:space:]])-march=rv[[:digit:]]*[a-rt-uwy]*)v*} $flags \\1v ]
+	return [regsub -all -- {((?:^|[[:space:]])-march=rv[[:digit:]]*[a-rt-uwy]*)v*} $flags \\1v ]
     }
     if { [check_effective_target_riscv_v] } {
 	return "$flags"
@@ -2012,8 +2012,8 @@ proc add_options_for_riscv_v { flags } {
 proc add_options_for_riscv_zfh { flags } {
     if { [lsearch $flags -march=*] >= 0 } {
 	# If there are multiple -march flags, we have to adjust all of them.
-	set flags [regsub -all -- {(?^|[[:space:]])-march=[[:alnum:]_.]*} $flags &_zfh ]
-	return [regsub -all -- {((?^|[[:space:]])-march=[[:alnum:]_.]*_zfh[[:alnum:]_.]*)_zfh} $flags \\1 ]
+	set flags [regsub -all -- {(?:^|[[:space:]])-march=[[:alnum:]_.]*} $flags &_zfh ]
+	return [regsub -all -- {((?:^|[[:space:]])-march=[[:alnum:]_.]*_zfh[[:alnum:]_.]*)_zfh} $flags \\1 ]
     }
     if { [check_effective_target_riscv_zfh] } {
 	return "$flags"


More information about the Gcc-cvs mailing list