From patchwork Sun Oct 31 14:39:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 69715 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]) by ozlabs.org (Postfix) with SMTP id 7703EB70E4 for ; Mon, 1 Nov 2010 01:39:54 +1100 (EST) Received: (qmail 32207 invoked by alias); 31 Oct 2010 14:39:52 -0000 Received: (qmail 32196 invoked by uid 22791); 31 Oct 2010 14:39:51 -0000 X-SWARE-Spam-Status: No, hits=-1.7 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, TW_BJ, T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: sourceware.org Received: from mail-wy0-f175.google.com (HELO mail-wy0-f175.google.com) (74.125.82.175) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sun, 31 Oct 2010 14:39:44 +0000 Received: by wya21 with SMTP id 21so4649054wya.20 for ; Sun, 31 Oct 2010 07:39:41 -0700 (PDT) Received: by 10.227.128.197 with SMTP id l5mr9830747wbs.22.1288535981531; Sun, 31 Oct 2010 07:39:41 -0700 (PDT) Received: from localhost (rsandifo.gotadsl.co.uk [82.133.89.107]) by mx.google.com with ESMTPS id ga16sm4212443wbb.1.2010.10.31.07.39.39 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 31 Oct 2010 07:39:40 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [committed] Fix dg-require-effective-targets for thr-init* tests Date: Sun, 31 Oct 2010 14:39:36 +0000 Message-ID: <87aaluifyv.fsf@firetop.home> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) MIME-Version: 1.0 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 Many of the thr-init-* tests are execution tests. Those tests should therefore require tls_runtime rather than plain tls. Also, a couple of tests had the dg-do and the dg-require-effective-target in the wrong order, making the dg-r-e-t ineffective. Tested on mipsisa64-elf (where the tests were failing) and on mips64-linux-gnu. Applied as obvious. Richard gcc/testsuite/ * gcc.dg/tls/thr-init-1.c: Fix order of dg-do. * gcc.dg/tls/thr-init-2.c: Likewise. Require tls_runtime rather than tls. * gcc.dg/torture/tls/thr-init-1.c: Require tls_runtime rather than tls. * gcc.dg/torture/tls/thr-init-2.c: Likewise. * objc.dg/torture/tls/thr-init.m: Likewise. * objc.dg/torture/tls/thr-init-2.m: Likewise. * objc.dg/torture/tls/thr-init-3.m: Likewise. Index: gcc/testsuite/gcc.dg/tls/thr-init-1.c =================================================================== --- gcc/testsuite/gcc.dg/tls/thr-init-1.c 2010-10-31 14:32:53.000000000 +0000 +++ gcc/testsuite/gcc.dg/tls/thr-init-1.c 2010-10-31 14:32:55.000000000 +0000 @@ -1,5 +1,5 @@ -/* { dg-require-effective-target tls } */ /* { dg-do compile } */ +/* { dg-require-effective-target tls } */ static __thread int fstat ; static __thread int fstat = 1 ; Index: gcc/testsuite/gcc.dg/tls/thr-init-2.c =================================================================== --- gcc/testsuite/gcc.dg/tls/thr-init-2.c 2010-10-31 14:32:47.000000000 +0000 +++ gcc/testsuite/gcc.dg/tls/thr-init-2.c 2010-10-31 14:32:50.000000000 +0000 @@ -1,5 +1,5 @@ -/* { dg-require-effective-target tls } */ /* { dg-do run } */ +/* { dg-require-effective-target tls_runtime } */ /* { dg-add-options tls } */ extern void abort() ; Index: gcc/testsuite/gcc.dg/torture/tls/thr-init-1.c =================================================================== --- gcc/testsuite/gcc.dg/torture/tls/thr-init-1.c 2010-10-31 14:32:47.000000000 +0000 +++ gcc/testsuite/gcc.dg/torture/tls/thr-init-1.c 2010-10-31 14:32:50.000000000 +0000 @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-require-effective-target tls } */ +/* { dg-require-effective-target tls_runtime } */ /* { dg-add-options tls } */ extern int printf (char *,...); Index: gcc/testsuite/gcc.dg/torture/tls/thr-init-2.c =================================================================== --- gcc/testsuite/gcc.dg/torture/tls/thr-init-2.c 2010-10-31 14:32:47.000000000 +0000 +++ gcc/testsuite/gcc.dg/torture/tls/thr-init-2.c 2010-10-31 14:32:50.000000000 +0000 @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-require-effective-target tls } */ +/* { dg-require-effective-target tls_runtime } */ /* { dg-add-options tls } */ extern int printf (char *,...); Index: gcc/testsuite/objc.dg/torture/tls/thr-init.m =================================================================== --- gcc/testsuite/objc.dg/torture/tls/thr-init.m 2010-10-31 14:32:46.000000000 +0000 +++ gcc/testsuite/objc.dg/torture/tls/thr-init.m 2010-10-31 14:32:50.000000000 +0000 @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-require-effective-target tls } */ +/* { dg-require-effective-target tls_runtime } */ /* { dg-add-options tls } */ extern void _exit(int); Index: gcc/testsuite/objc.dg/torture/tls/thr-init-2.m =================================================================== --- gcc/testsuite/objc.dg/torture/tls/thr-init-2.m 2010-10-31 14:32:46.000000000 +0000 +++ gcc/testsuite/objc.dg/torture/tls/thr-init-2.m 2010-10-31 14:32:50.000000000 +0000 @@ -1,5 +1,5 @@ // { dg-do run } -// { dg-require-effective-target tls } +// { dg-require-effective-target tls_runtime } // { dg-add-options tls } extern void _exit(int); Index: gcc/testsuite/objc.dg/torture/tls/thr-init-3.m =================================================================== --- gcc/testsuite/objc.dg/torture/tls/thr-init-3.m 2010-10-31 14:32:47.000000000 +0000 +++ gcc/testsuite/objc.dg/torture/tls/thr-init-3.m 2010-10-31 14:32:50.000000000 +0000 @@ -1,5 +1,5 @@ /* { dg-do run } */ -/* { dg-require-effective-target tls } */ +/* { dg-require-effective-target tls_runtime } */ /* { dg-add-options tls } */ /* { dg-xfail-run-if "Needs OBJC2 ABI" { *-*-darwin* && { lp64 && { ! objc2 } } } { "-fnext-runtime" } { "" } } */ /* { dg-additional-sources "../../../objc-obj-c++-shared/Object1.m" } */