From patchwork Tue Jun 14 17:47:15 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 100393 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 0048BB6F99 for ; Wed, 15 Jun 2011 03:46:22 +1000 (EST) Received: (qmail 9348 invoked by alias); 14 Jun 2011 17:46:20 -0000 Received: (qmail 9333 invoked by uid 22791); 14 Jun 2011 17:46:19 -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 17:46:05 +0000 Received: (qmail 8641 invoked from network); 14 Jun 2011 17:46:04 -0000 Received: from unknown (HELO ?192.168.1.5?) (janisjo@127.0.0.2) by mail.codesourcery.com with ESMTPA; 14 Jun 2011 17:46:04 -0000 Message-ID: <4DF79EA3.9060507@codesourcery.com> Date: Tue, 14 Jun 2011 10:47:15 -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] ARM tests should ignore warning 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 Many tests in gcc.target/arm that specify "-march=" fail compilation when multilib flags include "-mcpu=" due to warnings about conflicts in switches, but then go on to pass the remainder of the test. This patch causes some of those tests to ignore that compiler warning; I'll get to the rest later. Alternate options for tests that specify -march is to skip for multilibs that include -mcpu, or a new test directive or effective target to skip a test if the options used generate a warning. Tested on arm-none-linux-gnueabi with a variety of multilib flags, including some with "-mcpu=". OK for trunk and 4.6? Janis 2011-06-14 Janis Johnson * mla-1.c: Ignore warnings about conflicting switches. * pr39839.c: Likewise. * pr40657-2.c: Likewise. * pr40956.c: Likewise. * pr41679.c: Likewise. * pr42235.c: Likewise. * pr42495.c: Likewise. * pr42505.c: Likewise. * pr42574.c: Likewise. * pr46883.c: Likewise. * pr46934.c: Likewise. * xor-and.c: Likewise. Index: mla-1.c =================================================================== --- mla-1.c (revision 174920) +++ mla-1.c (working copy) @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O2 -march=armv5te" } */ +/* { dg-prune-output "switch .* conflicts with" } */ int Index: pr39839.c =================================================================== --- pr39839.c (revision 174920) +++ pr39839.c (working copy) @@ -1,5 +1,6 @@ /* { dg-options "-mthumb -Os -march=armv5te -mthumb-interwork -fpic" } */ /* { dg-require-effective-target arm_thumb1_ok } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* { dg-final { scan-assembler-not "str\[\\t \]*r.,\[\\t \]*.sp," } } */ struct S Index: pr40657-2.c =================================================================== --- pr40657-2.c (revision 174920) +++ pr40657-2.c (working copy) @@ -1,5 +1,6 @@ /* { dg-options "-Os -march=armv4t -mthumb" } */ /* { dg-require-effective-target arm_thumb1_ok } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* { dg-final { scan-assembler-not "sub\[\\t \]*sp,\[\\t \]*sp" } } */ /* { dg-final { scan-assembler-not "add\[\\t \]*sp,\[\\t \]*sp" } } */ Index: pr40956.c =================================================================== --- pr40956.c (revision 174920) +++ pr40956.c (working copy) @@ -1,6 +1,7 @@ /* { dg-options "-mthumb -Os -fpic -march=armv5te" } */ /* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-require-effective-target fpic } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* Make sure the constant "0" is loaded into register only once. */ /* { dg-final { scan-assembler-times "mov\[\\t \]*r., #0" 1 } } */ Index: pr41679.c =================================================================== --- pr41679.c (revision 174920) +++ pr41679.c (working copy) @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-march=armv5te -g -O2" } */ +/* { dg-prune-output "switch .* conflicts with" } */ extern int a; extern char b; Index: pr42235.c =================================================================== --- pr42235.c (revision 174920) +++ pr42235.c (working copy) @@ -1,5 +1,6 @@ /* { dg-options "-mthumb -O2 -march=armv5te" } */ /* { dg-require-effective-target arm_thumb1_ok } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* { dg-final { scan-assembler-not "add\[\\t \]*r.,\[\\t \]*r.,\[\\t \]*\#1" } } */ /* { dg-final { scan-assembler-not "add\[\\t \]*r.,\[\\t \]*\#1" } } */ Index: pr42495.c =================================================================== --- pr42495.c (revision 174920) +++ pr42495.c (working copy) @@ -1,6 +1,7 @@ /* { dg-options "-mthumb -Os -fpic -march=armv5te -fdump-rtl-hoist" } */ /* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-require-effective-target fpic } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* Make sure all calculations of gObj's address get hoisted to one location. */ /* { dg-final { scan-rtl-dump "PRE/HOIST: end of bb .* copying expression" "hoist" } } */ Index: pr42505.c =================================================================== --- pr42505.c (revision 174920) +++ pr42505.c (working copy) @@ -1,5 +1,6 @@ /* { dg-options "-mthumb -Os -march=armv5te" } */ /* { dg-require-effective-target arm_thumb1_ok } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* { dg-final { scan-assembler-not "str\[\\t \]*r.,\[\\t \]*.sp," } } */ struct A { Index: pr42574.c =================================================================== --- pr42574.c (revision 174920) +++ pr42574.c (working copy) @@ -1,6 +1,7 @@ /* { dg-options "-mthumb -Os -fpic -march=armv5te" } */ /* { dg-require-effective-target arm_thumb1_ok } */ /* { dg-require-effective-target fpic } */ +/* { dg-prune-output "switch .* conflicts with" } */ /* Make sure the address of glob.c is calculated only once and using a logical shift for the offset (200<<1). */ /* { dg-final { scan-assembler-times "lsl" 1 } } */ Index: pr46883.c =================================================================== --- pr46883.c (revision 174920) +++ pr46883.c (working copy) @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O1 -march=armv5te" } */ +/* { dg-prune-output "switch .* conflicts with" } */ void bar (unsigned char *q, unsigned short *data16s, int len) { Index: pr46934.c =================================================================== --- pr46934.c (revision 174920) +++ pr46934.c (working copy) @@ -1,6 +1,7 @@ /* { dg-do compile } */ /* { dg-options "-march=armv5te -mthumb -Os" } */ /* { dg-require-effective-target arm_thumb1_ok } */ +/* { dg-prune-output "switch .* conflicts with" } */ int caller (unsigned int reg_type) { Index: xor-and.c =================================================================== --- xor-and.c (revision 174920) +++ xor-and.c (working copy) @@ -1,5 +1,6 @@ /* { dg-do compile } */ /* { dg-options "-O -march=armv6" } */ +/* { dg-prune-output "switch .* conflicts with" } */ unsigned short foo (unsigned short x) {