From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1386) id 108C43858D32; Thu, 27 Apr 2023 07:37:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 108C43858D32 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1682581026; bh=jXbwCyJ4I1h7sBAqbEwaUgc6xYe0+zYNSuOsEuHN8kM=; h=From:To:Subject:Date:From; b=yAsrijljeDqmagFebewX+SWM07rm4U7qIKnoABHcNZ35Qewna7oP3s30Z8Tl33T7+ v/vXe4m6H6ZOoQ9J1L2R3NjdxuymKhROlFpTjQccQXSyODBMM1kGUwc4PyWEGvzV8i +rv8f74qu2qrh80ccIBSil72fwUZ8YqMLEbF9+DQ= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jan Beulich To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-284] testsuite: adjust NOP expectations for RISC-V X-Act-Checkin: gcc X-Git-Author: Jan Beulich X-Git-Refname: refs/heads/master X-Git-Oldrev: 95d4c0d2e6318aef88ba0bc607dfc1ec6b7a612f X-Git-Newrev: d94ca762f6e0e4f117c1a61aa6d6613b2abc1216 Message-Id: <20230427073706.108C43858D32@sourceware.org> Date: Thu, 27 Apr 2023 07:37:06 +0000 (GMT) List-Id: https://gcc.gnu.org/g:d94ca762f6e0e4f117c1a61aa6d6613b2abc1216 commit r14-284-gd94ca762f6e0e4f117c1a61aa6d6613b2abc1216 Author: Jan Beulich Date: Thu Apr 27 09:36:55 2023 +0200 testsuite: adjust NOP expectations for RISC-V RISC-V will emit ".option nopic" when -fno-pie is in effect, which matches the generic pattern. Just like done for Alpha, special-case RISC-V. gcc/testsuite/ * c-c++-common/patchable_function_entry-decl.c: Special-case RISC-V. * c-c++-common/patchable_function_entry-default.c: Likewise. * c-c++-common/patchable_function_entry-definition.c: Likewise. Diff: --- gcc/testsuite/c-c++-common/patchable_function_entry-decl.c | 3 ++- gcc/testsuite/c-c++-common/patchable_function_entry-default.c | 3 ++- gcc/testsuite/c-c++-common/patchable_function_entry-definition.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/testsuite/c-c++-common/patchable_function_entry-decl.c b/gcc/testsuite/c-c++-common/patchable_function_entry-decl.c index 3ce7a5b8790..513702822da 100644 --- a/gcc/testsuite/c-c++-common/patchable_function_entry-decl.c +++ b/gcc/testsuite/c-c++-common/patchable_function_entry-decl.c @@ -1,8 +1,9 @@ /* { dg-do compile { target { ! { nvptx*-*-* visium-*-* } } } } */ /* { dg-options "-O2 -fpatchable-function-entry=3,1" } */ /* { dg-additional-options "-fno-pie" { target sparc*-*-* } } */ -/* { dg-final { scan-assembler-times "nop|NOP|SWYM" 2 { target { ! { alpha*-*-* } } } } } */ +/* { dg-final { scan-assembler-times "nop|NOP|SWYM" 2 { target { ! { alpha*-*-* riscv*-*-* } } } } } */ /* { dg-final { scan-assembler-times "bis" 2 { target alpha*-*-* } } } */ +/* { dg-final { scan-assembler-times "nop\n" 2 { target riscv*-*-* } } } */ extern int a; diff --git a/gcc/testsuite/c-c++-common/patchable_function_entry-default.c b/gcc/testsuite/c-c++-common/patchable_function_entry-default.c index a501efccb19..3ccbafc87db 100644 --- a/gcc/testsuite/c-c++-common/patchable_function_entry-default.c +++ b/gcc/testsuite/c-c++-common/patchable_function_entry-default.c @@ -4,8 +4,9 @@ /* See PR99888, one single preceding nop isn't allowed on powerpc_elfv2, so overriding with two preceding nops to make it pass there. */ /* { dg-additional-options "-fpatchable-function-entry=3,2" { target powerpc_elfv2 } } */ -/* { dg-final { scan-assembler-times "nop|NOP|SWYM" 3 { target { ! { alpha*-*-* } } } } } */ +/* { dg-final { scan-assembler-times "nop|NOP|SWYM" 3 { target { ! { alpha*-*-* riscv*-*-* } } } } } */ /* { dg-final { scan-assembler-times "bis" 3 { target alpha*-*-* } } } */ +/* { dg-final { scan-assembler-times "nop\n" 3 { target riscv*-*-* } } } */ extern int a; diff --git a/gcc/testsuite/c-c++-common/patchable_function_entry-definition.c b/gcc/testsuite/c-c++-common/patchable_function_entry-definition.c index ad7d7a9e076..5ed356c1645 100644 --- a/gcc/testsuite/c-c++-common/patchable_function_entry-definition.c +++ b/gcc/testsuite/c-c++-common/patchable_function_entry-definition.c @@ -1,8 +1,9 @@ /* { dg-do compile { target { ! { nvptx*-*-* visium-*-* } } } } */ /* { dg-options "-O2 -fpatchable-function-entry=3,1" } */ /* { dg-additional-options "-fno-pie" { target sparc*-*-* } } */ -/* { dg-final { scan-assembler-times "nop|NOP|SWYM" 1 { target { ! { alpha*-*-* } } } } } */ +/* { dg-final { scan-assembler-times "nop|NOP|SWYM" 1 { target { ! { alpha*-*-* riscv*-*-* } } } } } */ /* { dg-final { scan-assembler-times "bis" 1 { target alpha*-*-* } } } */ +/* { dg-final { scan-assembler-times "nop\n" 1 { target riscv*-*-* } } } */ extern int a;