From patchwork Mon Jan 14 23:03:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janis Johnson X-Patchwork-Id: 211941 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 78C7B2C0097 for ; Tue, 15 Jan 2013 10:02:08 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1358809329; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version: To:Subject:Content-Type:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=pd18smRYKK/UgI4VR8teVc5B8QE=; b=ZhR9Hh2A1JbS/cB pB6mCUOQh8rZjG32Z7GLkTM5n48S5iMpPYJVLT8MAQM36Uq6zr9zjjy3jvc2biy8 9SEwL5a6Ef3sVBZVklW9bRlgl0Rcv+CvpYQxSCDDVyI/Fjc/cj+7Ar4qxNyi2SxW VHuGTXOkVrEdg0MlzylEil2e/Jh4= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:Message-ID:Date:From:Reply-To:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=pOX9vtb1srFri9T2X8SMdlZZQpgM4zyPCy0nOG9q1tiksFXGSKsgqqC4YK3SG9 v+A1zIPcYkSIcsOuOxgWGUPzV+2Raaw3tH6mAywE3OQeji2KMWrkDuER+R8nkYI9 D5zB0RN7ISHo7mYfGCV6ZuqFP742vKx14pMoh5oQk5V2w=; Received: (qmail 8272 invoked by alias); 14 Jan 2013 23:01:45 -0000 Received: (qmail 8187 invoked by uid 22791); 14 Jan 2013 23:01:43 -0000 X-SWARE-Spam-Status: No, hits=-3.8 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, RCVD_IN_HOSTKARMA_W, RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 14 Jan 2013 23:01:38 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1Tut29-0002bb-Sw from Janis_Johnson@mentor.com for gcc-patches@gcc.gnu.org; Mon, 14 Jan 2013 15:01:37 -0800 Received: from SVR-ORW-FEM-04.mgc.mentorg.com ([147.34.97.41]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Mon, 14 Jan 2013 15:01:37 -0800 Received: from [127.0.0.1] (147.34.91.1) by svr-orw-fem-04.mgc.mentorg.com (147.34.97.41) with Microsoft SMTP Server id 14.1.289.1; Mon, 14 Jan 2013 15:01:37 -0800 Message-ID: <50F48EC7.6020003@mentor.com> Date: Mon, 14 Jan 2013 15:03:35 -0800 From: Janis Johnson Reply-To: User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.28) Gecko/20120313 Thunderbird/3.1.20 MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" Subject: [testsuite] skip ARM tests fma.c and fma-sp.c for conflicting options 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 The options specified for gcc.target/arm/fma.c and fma-sp.c can conflict with several multilib options. This patch skips the tests for multilibs with conflicting options, and it adds option "-mfloat-abi=hard" which is needed for the test. OK for trunk? Janis 2013-01-14 Janis Johnson * gcc.target/arm/fma.c: Skip for conflicting multilib options. * gcc.target/arm/fma-sp.c: Likewise. Index: gcc.target/arm/fma.c =================================================================== --- gcc.target/arm/fma.c (revision 195178) +++ gcc.target/arm/fma.c (working copy) @@ -1,5 +1,9 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -mcpu=cortex-a15 -mfpu=vfpv4" } */ +/* { dg-skip-if "avoid conflicts with multilib options" { ! arm_thumb2_ok } { "-mthumb" } { "" } } */ +/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mcpu=*" } { "-mcpu=cortex-a15" } } */ +/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mfpu=*" } { "-mfpu=vfpv4" } } */ +/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=hard" } } */ +/* { dg-options "-O2 -mcpu=cortex-a15 -mfpu=vfpv4 -mfloat-abi=hard" } */ #include "fma.h" Index: gcc.target/arm/fma-sp.c =================================================================== --- gcc.target/arm/fma-sp.c (revision 195178) +++ gcc.target/arm/fma-sp.c (working copy) @@ -1,5 +1,9 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mthumb" } */ +/* { dg-skip-if "avoid conflicts with multilib options" { ! arm_thumb2_ok } { "-march=*" } { "" } } */ +/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mcpu=*" } { "-mcpu=cortex-m4" } } */ +/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mfpu=*" } { "-mfpu=fpv4-sp-d16" } } */ +/* { dg-skip-if "avoid conflicts with multilib options" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=hard" } } */ +/* { dg-options "-O2 -mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mthumb -mfloat-abi=hard" } */ #include "fma.h"