From 686056b7965d5f6c3e7ef568e66b1435faad950d Mon Sep 17 00:00:00 2001
From: Robin Dapp <rdapp@ventanamicro.com>
Date: Mon, 20 Nov 2023 16:19:46 +0100
Subject: [PATCH] RISC-V: testsuite: Add rv64 requirement for bug-9 and bug-14.

This adds an effective target requirement to compile the tests.  Since
we disabled 64-bit indices on rv32 targets those tests should be
unsupported on rv32.

gcc/testsuite/ChangeLog:

	* g++.target/riscv/rvv/base/bug-14.C: Add
	dg-require-effective-target rv64.
	* g++.target/riscv/rvv/base/bug-9.C: Ditto.
---
 gcc/testsuite/g++.target/riscv/rvv/base/bug-14.C | 4 +++-
 gcc/testsuite/g++.target/riscv/rvv/base/bug-9.C  | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/bug-14.C b/gcc/testsuite/g++.target/riscv/rvv/base/bug-14.C
index bf0c7bd3a36d..f2d67c859681 100644
--- a/gcc/testsuite/g++.target/riscv/rvv/base/bug-14.C
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/bug-14.C
@@ -1,5 +1,7 @@
-/* { dg-do run { target { { {riscv_v} && {rv64} } } } } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
+/* { dg-require-effective-target rv64 } */
+/* { dg-require-effective-target riscv_v } */
 
 #include<cstdalign>
 #include<cmath>
diff --git a/gcc/testsuite/g++.target/riscv/rvv/base/bug-9.C b/gcc/testsuite/g++.target/riscv/rvv/base/bug-9.C
index 8d17883bb570..c43dfae677d8 100644
--- a/gcc/testsuite/g++.target/riscv/rvv/base/bug-9.C
+++ b/gcc/testsuite/g++.target/riscv/rvv/base/bug-9.C
@@ -1,5 +1,7 @@
-/* { dg-do run { target { { {riscv_v} && {rv64} } } } } */
+/* { dg-do run } */
 /* { dg-options "-O2" } */
+/* { dg-require-effective-target rv64 } */
+/* { dg-require-effective-target riscv_v } */
 
 #include<cstdalign>
 #include<cmath>
-- 
2.47.2