From patchwork Thu Jun 8 10:41:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 772948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wk27D63qBz9s78 for ; Thu, 8 Jun 2017 20:42:32 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="J29i3TT4"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=g10L5fRtgmTvs3wEYqIRjKfZq/9aVBWwO40J7pNfRAsyQTHRn4 OtPjU9tFHmns/YCDcWXuHwGAHmxqzcNPiKrecMbeIafV6Ec8/kmfK6BxdzyJgGtJ /phhQYSMdCHtcQ5E1Q+Kh27nd2DhxbqsceVBj7ll56FN23M3ZM2BXjS+0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; s= default; bh=fLbkXEqMLHmxOGakZIDL84S50AY=; b=J29i3TT4rUDLUH/pliEQ lSQ+EyTyd7aaSQgnziEJcNeVREael8Ot7XjxxyIbWQ9wijqMwh7d21D8leG32PF5 cM2GqOM6xzfUpiTak3EVzlLd9sp7xiWnyiQBXhXuoaCy6dysV/S1MG+058cd/NYP mf8R9VC1itcmuNfyVlFI/Yk= Received: (qmail 119054 invoked by alias); 8 Jun 2017 10:42:14 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 118983 invoked by uid 89); 8 Jun 2017 10:42:09 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy=___, 4711 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 08 Jun 2017 10:42:07 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-03.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1dIutF-0007mO-7C from Tom_deVries@mentor.com ; Thu, 08 Jun 2017 03:42:09 -0700 Received: from [127.0.0.1] (137.202.0.87) by SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) with Microsoft SMTP Server (TLS) id 15.0.1210.3; Thu, 8 Jun 2017 11:42:04 +0100 To: GCC Patches CC: Mike Stump , Rainer Orth From: Tom de Vries Subject: [PATCH, testsuite] Remove NO_TRAMPOLINES Message-ID: <885ae6d2-a3ea-4b74-5c40-71f326762a47@mentor.com> Date: Thu, 8 Jun 2017 12:41:58 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.1.1 MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) Hi, this patch removes the additional_flags=-DNO_TRAMPOLINES addition, and instead uses the effective target trampolines. Tested on x86_64. Tested on nvptx. OK for trunk? Thanks, - Tom Remove NO_TRAMPOLINES 2017-06-07 Tom de Vries * gcc.c-torture/compile/930506-2.c: Use dg-require-effective-target trampolines instead of NO_TRAMPOLINES. * gcc.c-torture/execute/20000822-1.c: Same. * gcc.c-torture/execute/920428-2.c: Same. * gcc.c-torture/execute/920501-7.c: Same. * gcc.c-torture/execute/920612-2.c: Same. * gcc.c-torture/execute/921017-1.c: Same. * gcc.c-torture/execute/921215-1.c: Same. * gcc.c-torture/execute/931002-1.c: Same. * gcc.c-torture/execute/comp-goto-2.c: Same. * gcc.c-torture/execute/nestfunc-1.c: Same. * gcc.c-torture/execute/nestfunc-2.c: Same. * gcc.c-torture/execute/nestfunc-3.c: Same. * gcc.c-torture/execute/nestfunc-5.c: Same. * gcc.c-torture/execute/nestfunc-6.c: Same. * gcc.c-torture/execute/pr24135.c: Same. * gcc.dg/Wtrampolines.c: Same. * gcc.dg/torture/stackalign/comp-goto-1.c: Same. * gcc.dg/torture/stackalign/nested-5.c: Same. * gcc.dg/torture/stackalign/nested-6.c: Same. * gcc.dg/torture/stackalign/non-local-goto-3.c: Same. * gcc.dg/torture/stackalign/non-local-goto-4.c: Same. * gcc.dg/torture/stackalign/non-local-goto-5.c: Same. * gcc.dg/trampoline-1.c: Same. * gcc.dg/tree-prof/pr44777.c: Same. * gcc.target/i386/pr67770.c: Same. * lib/gcc.exp (gcc_target_compile): Remove appending of -DNO_TRAMPOLINES to additional_flags. * lib/objc.exp (objc_target_compile): Same. --- gcc/testsuite/gcc.c-torture/compile/930506-2.c | 6 ++---- gcc/testsuite/gcc.c-torture/execute/20000822-1.c | 7 +++---- gcc/testsuite/gcc.c-torture/execute/920428-2.c | 5 +---- gcc/testsuite/gcc.c-torture/execute/920501-7.c | 6 ++---- gcc/testsuite/gcc.c-torture/execute/920612-2.c | 6 ++++-- gcc/testsuite/gcc.c-torture/execute/921017-1.c | 5 +++-- gcc/testsuite/gcc.c-torture/execute/921215-1.c | 5 +++-- gcc/testsuite/gcc.c-torture/execute/931002-1.c | 5 +++-- gcc/testsuite/gcc.c-torture/execute/comp-goto-2.c | 7 +++---- gcc/testsuite/gcc.c-torture/execute/nestfunc-1.c | 4 ++-- gcc/testsuite/gcc.c-torture/execute/nestfunc-2.c | 6 +++--- gcc/testsuite/gcc.c-torture/execute/nestfunc-3.c | 3 +-- gcc/testsuite/gcc.c-torture/execute/nestfunc-5.c | 6 ++---- gcc/testsuite/gcc.c-torture/execute/nestfunc-6.c | 8 ++------ gcc/testsuite/gcc.c-torture/execute/pr24135.c | 6 ++---- gcc/testsuite/gcc.dg/Wtrampolines.c | 6 +----- gcc/testsuite/gcc.dg/torture/stackalign/comp-goto-1.c | 6 ++---- gcc/testsuite/gcc.dg/torture/stackalign/nested-5.c | 5 +---- gcc/testsuite/gcc.dg/torture/stackalign/nested-6.c | 7 +------ gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-3.c | 5 +---- gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-4.c | 6 ++---- gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-5.c | 5 +---- gcc/testsuite/gcc.dg/trampoline-1.c | 5 ----- gcc/testsuite/gcc.dg/tree-prof/pr44777.c | 7 +++---- gcc/testsuite/gcc.target/i386/pr67770.c | 5 +---- gcc/testsuite/lib/gcc.exp | 3 --- gcc/testsuite/lib/objc.exp | 3 --- 27 files changed, 49 insertions(+), 99 deletions(-) diff --git a/gcc/testsuite/gcc.c-torture/compile/930506-2.c b/gcc/testsuite/gcc.c-torture/compile/930506-2.c index e11e62f..bc982ac 100644 --- a/gcc/testsuite/gcc.c-torture/compile/930506-2.c +++ b/gcc/testsuite/gcc.c-torture/compile/930506-2.c @@ -1,4 +1,5 @@ -#ifndef NO_TRAMPOLINES +/* { dg-require-effective-target trampolines } */ + int f1() { { int ___() { foo(1); } bar(___); } @@ -10,6 +11,3 @@ int f2(int j) { int ___() { foo(j); } bar(___); } return( { int ___() { foo(j); } bar(___);} ); } -#else -int x; -#endif diff --git a/gcc/testsuite/gcc.c-torture/execute/20000822-1.c b/gcc/testsuite/gcc.c-torture/execute/20000822-1.c index f4a084b..e99bcc2 100644 --- a/gcc/testsuite/gcc.c-torture/execute/20000822-1.c +++ b/gcc/testsuite/gcc.c-torture/execute/20000822-1.c @@ -1,4 +1,5 @@ -#ifndef NO_TRAMPOLINES +/* { dg-require-effective-target trampolines } */ + int f0(int (*fn)(int *), int *p) { return (*fn) (p); @@ -16,13 +17,11 @@ int f1(void) return f0(f2, &i); } -#endif int main() { -#ifndef NO_TRAMPOLINES if (f1() != 2) abort (); -#endif + return 0; } diff --git a/gcc/testsuite/gcc.c-torture/execute/920428-2.c b/gcc/testsuite/gcc.c-torture/execute/920428-2.c index 99a3925..c6a5bda 100644 --- a/gcc/testsuite/gcc.c-torture/execute/920428-2.c +++ b/gcc/testsuite/gcc.c-torture/execute/920428-2.c @@ -1,9 +1,6 @@ /* { dg-require-effective-target label_values } */ +/* { dg-require-effective-target trampolines } */ -#if !defined (NO_TRAMPOLINES) s(i){if(i>0){__label__ l1;int f(int i){if(i==2)goto l1;return 0;}return f(i);l1:;}return 1;} x(){return s(0)==1&&s(1)==0&&s(2)==1;} main(){if(x()!=1)abort();exit(0);} -#else -main(){ exit (0); } -#endif diff --git a/gcc/testsuite/gcc.c-torture/execute/920501-7.c b/gcc/testsuite/gcc.c-torture/execute/920501-7.c index ea8f931..d05ac61 100644 --- a/gcc/testsuite/gcc.c-torture/execute/920501-7.c +++ b/gcc/testsuite/gcc.c-torture/execute/920501-7.c @@ -1,4 +1,5 @@ /* { dg-require-effective-target label_values } */ +/* { dg-require-effective-target trampolines } */ #ifdef STACK_SIZE #define DEPTH ((STACK_SIZE) / 512 + 1) @@ -6,7 +7,6 @@ #define DEPTH 1000 #endif -#if !defined (NO_TRAMPOLINES) x(a) { __label__ xlab; @@ -20,13 +20,11 @@ x(a) xlab:; return a; } -#endif main () { -#if !defined (NO_TRAMPOLINES) if (x (DEPTH) != DEPTH) abort (); -#endif + exit (0); } diff --git a/gcc/testsuite/gcc.c-torture/execute/920612-2.c b/gcc/testsuite/gcc.c-torture/execute/920612-2.c index 9bbdce2..23796fc 100644 --- a/gcc/testsuite/gcc.c-torture/execute/920612-2.c +++ b/gcc/testsuite/gcc.c-torture/execute/920612-2.c @@ -1,3 +1,5 @@ +/* { dg-require-effective-target trampolines } */ + main () { int i = 0; @@ -7,9 +9,9 @@ main () i++, x--; return x; } -#ifndef NO_TRAMPOLINES + if (a (2) != 0) abort (); -#endif + exit (0); } diff --git a/gcc/testsuite/gcc.c-torture/execute/921017-1.c b/gcc/testsuite/gcc.c-torture/execute/921017-1.c index c7fab58..a2784f6 100644 --- a/gcc/testsuite/gcc.c-torture/execute/921017-1.c +++ b/gcc/testsuite/gcc.c-torture/execute/921017-1.c @@ -1,4 +1,6 @@ /* { dg-skip-if "requires alloca" { ! alloca } { "-O0" } { "" } } */ +/* { dg-require-effective-target trampolines } */ + f(n) { int a[n]; @@ -11,8 +13,7 @@ f(n) } main() { -#ifndef NO_TRAMPOLINES if(f(2)!=4711)abort(); -#endif + exit(0); } diff --git a/gcc/testsuite/gcc.c-torture/execute/921215-1.c b/gcc/testsuite/gcc.c-torture/execute/921215-1.c index 4fa3b7d..28dccd6 100644 --- a/gcc/testsuite/gcc.c-torture/execute/921215-1.c +++ b/gcc/testsuite/gcc.c-torture/execute/921215-1.c @@ -1,6 +1,7 @@ +/* { dg-require-effective-target trampolines } */ + main() { -#ifndef NO_TRAMPOLINES void p(void ((*f) (void ()))) { void r() @@ -17,7 +18,7 @@ main() } p(q); -#endif + exit(0); } diff --git a/gcc/testsuite/gcc.c-torture/execute/931002-1.c b/gcc/testsuite/gcc.c-torture/execute/931002-1.c index 6a02b23..fc52223 100644 --- a/gcc/testsuite/gcc.c-torture/execute/931002-1.c +++ b/gcc/testsuite/gcc.c-torture/execute/931002-1.c @@ -1,3 +1,5 @@ +/* { dg-require-effective-target trampolines } */ + f (void (*func) ()) { func (); @@ -5,7 +7,6 @@ f (void (*func) ()) main () { -#ifndef NO_TRAMPOLINES void t0 () { } @@ -23,6 +24,6 @@ main () t1 (); t1 (); t2 (); -#endif + exit (0); } diff --git a/gcc/testsuite/gcc.c-torture/execute/comp-goto-2.c b/gcc/testsuite/gcc.c-torture/execute/comp-goto-2.c index 1b594db..eaf83d8 100644 --- a/gcc/testsuite/gcc.c-torture/execute/comp-goto-2.c +++ b/gcc/testsuite/gcc.c-torture/execute/comp-goto-2.c @@ -1,4 +1,5 @@ /* { dg-require-effective-target label_values } */ +/* { dg-require-effective-target trampolines } */ /* A slight variation of 920501-7.c. */ @@ -8,7 +9,6 @@ #define DEPTH 1000 #endif -#if !defined (NO_TRAMPOLINES) x(a) { __label__ xlab; @@ -26,13 +26,12 @@ x(a) xlab:; return a; } -#endif main () { -#if !defined (NO_TRAMPOLINES) + if (x (DEPTH) != DEPTH) abort (); -#endif + exit (0); } diff --git a/gcc/testsuite/gcc.c-torture/execute/nestfunc-1.c b/gcc/testsuite/gcc.c-torture/execute/nestfunc-1.c index e34a56b..29ccfc3 100644 --- a/gcc/testsuite/gcc.c-torture/execute/nestfunc-1.c +++ b/gcc/testsuite/gcc.c-torture/execute/nestfunc-1.c @@ -1,3 +1,5 @@ +/* { dg-require-effective-target trampolines } */ + int g (int a, int b, int (*gi) (int, int)) { @@ -9,7 +11,6 @@ g (int a, int b, int (*gi) (int, int)) f () { -#ifndef NO_TRAMPOLINES int i, j; int f2 (int a, int b) { @@ -18,7 +19,6 @@ f () if (g (1, 2, f2) != 2) abort (); -#endif } main () diff --git a/gcc/testsuite/gcc.c-torture/execute/nestfunc-2.c b/gcc/testsuite/gcc.c-torture/execute/nestfunc-2.c index 0308755..1a25a17 100644 --- a/gcc/testsuite/gcc.c-torture/execute/nestfunc-2.c +++ b/gcc/testsuite/gcc.c-torture/execute/nestfunc-2.c @@ -1,3 +1,5 @@ +/* { dg-require-effective-target trampolines } */ + extern int foo (int, int, int (*) (int, int, int, int, int, int, int)); int z; @@ -5,7 +7,6 @@ int z; int main (void) { -#ifndef NO_TRAMPOLINES int sum = 0; int i; @@ -37,8 +38,7 @@ main (void) if (z != 0x1b) abort (); -#endif - + exit (0); } diff --git a/gcc/testsuite/gcc.c-torture/execute/nestfunc-3.c b/gcc/testsuite/gcc.c-torture/execute/nestfunc-3.c index 9d09b19..2bdfece 100644 --- a/gcc/testsuite/gcc.c-torture/execute/nestfunc-3.c +++ b/gcc/testsuite/gcc.c-torture/execute/nestfunc-3.c @@ -1,3 +1,4 @@ +/* { dg-require-effective-target trampolines } */ extern long foo (long, long, long (*) (long, long)); extern long use (long (*) (long, long), long, long); @@ -5,7 +6,6 @@ extern long use (long (*) (long, long), long, long); int main (void) { -#ifndef NO_TRAMPOLINES long sum = 0; long i; @@ -42,7 +42,6 @@ main (void) if ((sum & 0xffffffff) != 0xbecfcbf5) abort (); -#endif exit (0); } diff --git a/gcc/testsuite/gcc.c-torture/execute/nestfunc-5.c b/gcc/testsuite/gcc.c-torture/execute/nestfunc-5.c index 88e74cc..fc9ad95 100644 --- a/gcc/testsuite/gcc.c-torture/execute/nestfunc-5.c +++ b/gcc/testsuite/gcc.c-torture/execute/nestfunc-5.c @@ -1,7 +1,8 @@ +/* { dg-require-effective-target trampolines } */ + extern void abort (void); extern void exit (int); -#ifndef NO_TRAMPOLINES static void recursive (int n, void (*proc) (void)) { __label__ l1; @@ -31,6 +32,3 @@ int main () recursive (10, abort); abort (); } -#else -int main () { return 0; } -#endif diff --git a/gcc/testsuite/gcc.c-torture/execute/nestfunc-6.c b/gcc/testsuite/gcc.c-torture/execute/nestfunc-6.c index c8e8243..fad729a 100644 --- a/gcc/testsuite/gcc.c-torture/execute/nestfunc-6.c +++ b/gcc/testsuite/gcc.c-torture/execute/nestfunc-6.c @@ -1,8 +1,8 @@ +/* { dg-require-effective-target trampolines } */ + /* Test that the GP gets properly restored, either by the nonlocal receiver or the nested function. */ -#ifndef NO_TRAMPOLINES - typedef __SIZE_TYPE__ size_t; extern void abort (void); extern void exit (int); @@ -23,7 +23,3 @@ int main () nonlocal: exit (0); } - -#else -int main() { return 0; } -#endif diff --git a/gcc/testsuite/gcc.c-torture/execute/pr24135.c b/gcc/testsuite/gcc.c-torture/execute/pr24135.c index fdeda16..f1d1298 100644 --- a/gcc/testsuite/gcc.c-torture/execute/pr24135.c +++ b/gcc/testsuite/gcc.c-torture/execute/pr24135.c @@ -1,4 +1,5 @@ -#ifndef NO_TRAMPOLINES +/* { dg-require-effective-target trampolines } */ + extern void abort (void); int x(int a, int b) @@ -41,6 +42,3 @@ int main () return 0; } -#else -int main() { return 0; } -#endif diff --git a/gcc/testsuite/gcc.dg/Wtrampolines.c b/gcc/testsuite/gcc.dg/Wtrampolines.c index 7e9646b..8ff09eb 100644 --- a/gcc/testsuite/gcc.dg/Wtrampolines.c +++ b/gcc/testsuite/gcc.dg/Wtrampolines.c @@ -5,8 +5,6 @@ /* { dg-require-effective-target trampolines } */ /* { dg-options "-O2 -Wtrampolines" } */ -#ifndef NO_TRAMPOLINES - /* This used to fail on various versions of Solaris 2 because the trampoline couldn't be made executable. */ @@ -46,12 +44,10 @@ void foo (void) abort(); } } -#endif int main (void) { -#ifndef NO_TRAMPOLINES foo (); -#endif + return 0; } diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/comp-goto-1.c b/gcc/testsuite/gcc.dg/torture/stackalign/comp-goto-1.c index 1129b00..98a47a8 100644 --- a/gcc/testsuite/gcc.dg/torture/stackalign/comp-goto-1.c +++ b/gcc/testsuite/gcc.dg/torture/stackalign/comp-goto-1.c @@ -1,5 +1,6 @@ /* { dg-do run } */ /* { dg-require-effective-target label_values } */ +/* { dg-require-effective-target trampolines } */ #ifdef STACK_SIZE #define DEPTH ((STACK_SIZE) / 512 + 1) @@ -10,7 +11,6 @@ extern void abort (void); extern void exit (int); -#if !defined (NO_TRAMPOLINES) int x(int a) { @@ -29,14 +29,12 @@ x(int a) xlab:; return a; } -#endif int main () { -#if !defined (NO_TRAMPOLINES) if (x (DEPTH) != DEPTH) abort (); -#endif + exit (0); } diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/nested-5.c b/gcc/testsuite/gcc.dg/torture/stackalign/nested-5.c index 95eba04..e6bf364 100644 --- a/gcc/testsuite/gcc.dg/torture/stackalign/nested-5.c +++ b/gcc/testsuite/gcc.dg/torture/stackalign/nested-5.c @@ -1,9 +1,9 @@ /* { dg-do run } */ +/* { dg-require-effective-target trampolines } */ extern void abort (void); extern void exit (int); -#ifndef NO_TRAMPOLINES static void recursive (int n, void (*proc) (void)) { __label__ l1; @@ -33,6 +33,3 @@ int main () recursive (10, abort); abort (); } -#else -int main () { return 0; } -#endif diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/nested-6.c b/gcc/testsuite/gcc.dg/torture/stackalign/nested-6.c index d853825..708cd9e 100644 --- a/gcc/testsuite/gcc.dg/torture/stackalign/nested-6.c +++ b/gcc/testsuite/gcc.dg/torture/stackalign/nested-6.c @@ -1,6 +1,5 @@ /* { dg-do run } */ - -#ifndef NO_TRAMPOLINES +/* { dg-require-effective-target trampolines } */ typedef __SIZE_TYPE__ size_t; extern void abort (void); @@ -22,7 +21,3 @@ int main () nonlocal: exit (0); } - -#else -int main() { return 0; } -#endif diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-3.c b/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-3.c index f18366f..39525d7 100644 --- a/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-3.c +++ b/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-3.c @@ -1,7 +1,7 @@ /* { dg-do run } */ /* { dg-require-effective-target nonlocal_goto } */ +/* { dg-require-effective-target trampolines } */ -#ifndef NO_TRAMPOLINES extern void abort (void); int x(int a, int b) @@ -38,6 +38,3 @@ int main () return 0; } -#else -int main() { return 0; } -#endif diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-4.c b/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-4.c index bcad887..591428d 100644 --- a/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-4.c +++ b/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-4.c @@ -1,6 +1,7 @@ /* { dg-do run } */ /* { dg-require-effective-target nonlocal_goto } */ /* { dg-require-effective-target label_values } */ +/* { dg-require-effective-target trampolines } */ extern void abort (void); extern void exit (int); @@ -11,7 +12,6 @@ extern void exit (int); #define DEPTH 1000 #endif -#if !defined (NO_TRAMPOLINES) int x(int a) { @@ -26,14 +26,12 @@ x(int a) xlab:; return a; } -#endif int main () { -#if !defined (NO_TRAMPOLINES) if (x (DEPTH) != DEPTH) abort (); -#endif + exit (0); } diff --git a/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-5.c b/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-5.c index ab524fe..b158cea 100644 --- a/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-5.c +++ b/gcc/testsuite/gcc.dg/torture/stackalign/non-local-goto-5.c @@ -1,13 +1,10 @@ /* { dg-do run } */ /* { dg-require-effective-target nonlocal_goto } */ /* { dg-require-effective-target label_values } */ +/* { dg-require-effective-target trampolines } */ extern void exit (int); -#if !defined (NO_TRAMPOLINES) extern void abort (void); int s(int i){if(i>0){__label__ l1;int f(int i){if(i==2)goto l1;return 0;}return f(i);l1:;}return 1;} int x(){return s(0)==1&&s(1)==0&&s(2)==1;} int main(){if(x()!=1)abort();exit(0);} -#else -int main(){ exit (0); } -#endif diff --git a/gcc/testsuite/gcc.dg/trampoline-1.c b/gcc/testsuite/gcc.dg/trampoline-1.c index 37a582c..e3dcf57 100644 --- a/gcc/testsuite/gcc.dg/trampoline-1.c +++ b/gcc/testsuite/gcc.dg/trampoline-1.c @@ -5,8 +5,6 @@ /* { dg-require-effective-target trampolines } */ /* { dg-options "-O2" } */ -#ifndef NO_TRAMPOLINES - /* This used to fail on various versions of Solaris 2 because the trampoline couldn't be made executable. */ @@ -46,12 +44,9 @@ void foo (void) abort(); } } -#endif int main (void) { -#ifndef NO_TRAMPOLINES foo (); -#endif return 0; } diff --git a/gcc/testsuite/gcc.dg/tree-prof/pr44777.c b/gcc/testsuite/gcc.dg/tree-prof/pr44777.c index 4550599..4074b75 100644 --- a/gcc/testsuite/gcc.dg/tree-prof/pr44777.c +++ b/gcc/testsuite/gcc.dg/tree-prof/pr44777.c @@ -1,5 +1,6 @@ /* PR middle-end/44777 */ /* { dg-require-effective-target label_values } */ +/* { dg-require-effective-target trampolines } */ /* { dg-options "-O0" } */ /* A variant of gcc.c-torture/execute/comp-goto-2.c. */ @@ -12,7 +13,6 @@ extern void exit (int); #define DEPTH 1000 #endif -#if !defined (NO_TRAMPOLINES) int x (int a) { @@ -31,14 +31,13 @@ x (int a) xlab:; return a; } -#endif int main () { -#if !defined (NO_TRAMPOLINES) + if (x (DEPTH) != DEPTH) abort (); -#endif + exit (0); } diff --git a/gcc/testsuite/gcc.target/i386/pr67770.c b/gcc/testsuite/gcc.target/i386/pr67770.c index 3826aff..9368524 100644 --- a/gcc/testsuite/gcc.target/i386/pr67770.c +++ b/gcc/testsuite/gcc.target/i386/pr67770.c @@ -3,18 +3,15 @@ /* { dg-require-effective-target trampolines } */ /* { dg-options "-O2" } */ -#ifndef NO_TRAMPOLINES __attribute__ ((noinline)) void foo (int i, void (* __attribute__ ((regparm (3))) bar) (int)) { bar (i); } -#endif int main () { -#ifndef NO_TRAMPOLINES int p = 0; __attribute__ ((regparm (3), noinline)) void @@ -35,6 +32,6 @@ main () if (p != 2) __builtin_abort (); -#endif + return 0; } diff --git a/gcc/testsuite/lib/gcc.exp b/gcc/testsuite/lib/gcc.exp index 19d500c..fd32a30 100644 --- a/gcc/testsuite/lib/gcc.exp +++ b/gcc/testsuite/lib/gcc.exp @@ -144,9 +144,6 @@ proc gcc_target_compile { source dest type options } { if [target_info exists gcc,stack_size] { lappend options "additional_flags=-DSTACK_SIZE=[target_info gcc,stack_size]" } - if [target_info exists gcc,no_trampolines] { - lappend options "additional_flags=-DNO_TRAMPOLINES" - } if [target_info exists gcc,signal_suppress] { lappend options "additional_flags=-DSIGNAL_SUPPRESS" } diff --git a/gcc/testsuite/lib/objc.exp b/gcc/testsuite/lib/objc.exp index c4c954e..c8b9741 100644 --- a/gcc/testsuite/lib/objc.exp +++ b/gcc/testsuite/lib/objc.exp @@ -194,9 +194,6 @@ proc objc_target_compile { source dest type options } { if [target_info exists objc,stack_size] { lappend options "additional_flags=-DSTACK_SIZE=[target_info objc,stack_size]" } - if [target_info exists objc,no_trampolines] { - lappend options "additional_flags=-DNO_TRAMPOLINES" - } # TEST_ALWAYS_FLAGS are flags that should be passed to every # compilation. They are passed first to allow individual