From patchwork Tue Jun 14 20:32:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 100432 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 6A2BAB6F85 for ; Wed, 15 Jun 2011 06:31:40 +1000 (EST) Received: (qmail 16830 invoked by alias); 14 Jun 2011 20:31:38 -0000 Received: (qmail 16822 invoked by uid 22791); 14 Jun 2011 20:31:38 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail.codesourcery.com (HELO mail.codesourcery.com) (38.113.113.100) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 14 Jun 2011 20:31:24 +0000 Received: (qmail 28801 invoked from network); 14 Jun 2011 20:31:23 -0000 Received: from unknown (HELO ?192.168.1.5?) (janisjo@127.0.0.2) by mail.codesourcery.com with ESMTPA; 14 Jun 2011 20:31:23 -0000 Message-ID: <4DF7C564.4070402@codesourcery.com> Date: Tue, 14 Jun 2011 13:32:36 -0700 From: Janis Johnson User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110424 Thunderbird/3.1.10 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [testsuite] (committed) let more ARM tests ignore warnings about conflicting switches X-IsSubscribed: yes 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 I made other changes to these tests earlier today, then the patch to ignore warnings for conflicting options was approved. I've committed this to trunk. Janis 2011-06-14 Janis Johnson * gcc.target/arm/pr45701-1.c: Ignore warnings about conflicting switches. * gcc.target/arm/pr45701-2.c: Likewise. * gcc.target/arm/thumb-branch1.c: Likewise. Index: gcc.target/arm/pr45701-1.c =================================================================== --- gcc.target/arm/pr45701-1.c (revision 175047) +++ gcc.target/arm/pr45701-1.c (working copy) @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */ /* { dg-options "-march=armv7-a -mthumb -Os" } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* { dg-final { scan-assembler "push\t\{r3" } } */ /* { dg-final { scan-assembler-not "r8" } } */ Index: gcc.target/arm/pr45701-2.c =================================================================== --- gcc.target/arm/pr45701-2.c (revision 175047) +++ gcc.target/arm/pr45701-2.c (working copy) @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */ /* { dg-options "-march=armv7-a -mthumb -Os" } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* { dg-final { scan-assembler "push\t\{r3" } } */ /* { dg-final { scan-assembler-not "r8" } } */ Index: gcc.target/arm/thumb-branch1.c =================================================================== --- gcc.target/arm/thumb-branch1.c (revision 175047) +++ gcc.target/arm/thumb-branch1.c (working copy) @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */ /* { dg-options "-Os -mthumb -march=armv5te" } */ +/* { dg-prune-output "switch .* conflicts with" } */ int returnbool(int a, int b) {