From patchwork Tue Jun 21 21:06:27 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Janis Johnson <janisjo@codesourcery.com>
X-Patchwork-Id: 101371
Return-Path: 
 <gcc-patches-return-294948-incoming=patchwork.ozlabs.org@gcc.gnu.org>
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 DFFCAB6F82
	for <incoming@patchwork.ozlabs.org>;
	Wed, 22 Jun 2011 07:04:27 +1000 (EST)
Received: (qmail 2559 invoked by alias); 21 Jun 2011 21:04:26 -0000
Received: (qmail 2549 invoked by uid 22791); 21 Jun 2011 21:04:25 -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, 21 Jun 2011 21:04:12 +0000
Received: (qmail 11553 invoked from network); 21 Jun 2011 21:04:11 -0000
Received: from unknown (HELO ?192.168.1.5?) (janisjo@127.0.0.2) by
	mail.codesourcery.com with ESMTPA; 21 Jun 2011 21:04:11 -0000
Message-ID: <4E0107D3.1020502@codesourcery.com>
Date: Tue, 21 Jun 2011 14:06:27 -0700
From: Janis Johnson <janisjo@codesourcery.com>
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" <gcc-patches@gcc.gnu.org>
Subject: [testsuite] ARM: require arm_thumb2_ok, drop -march
X-IsSubscribed: yes
Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm
Precedence: bulk
List-Id: <gcc-patches.gcc.gnu.org>
List-Unsubscribe: 
 <mailto:gcc-patches-unsubscribe-incoming=patchwork.ozlabs.org@gcc.gnu.org>
List-Archive: <http://gcc.gnu.org/ml/gcc-patches/>
List-Post: <mailto:gcc-patches@gcc.gnu.org>
List-Help: <mailto:gcc-patches-help@gcc.gnu.org>
Sender: gcc-patches-owner@gcc.gnu.org
Delivered-To: mailing list gcc-patches@gcc.gnu.org

Modify three tests that require thumb2 support to check for that rather
than specifying an arch value that might be overridden by multilib flags.

OK for trunk, and later for 4.6?
2011-06-21  Janis Johnson  <janisjo@codesourcery.com>
	
	* gcc.target/arm/ctz.c: Don't specify -march, require thumb2.
	* gcc.target/arm/pr42879.c: Likewise.
	* gcc.target/arm/pr45701-3.c: Likewise.

Index: gcc.target/arm/ctz.c
===================================================================
--- gcc.target/arm/ctz.c	(revision 175269)
+++ gcc.target/arm/ctz.c	(working copy)
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-require-effective-target arm32 } */
-/* { dg-options "-O2 -march=armv6t2" } */
+/* { dg-require-effective-target arm_thumb2_ok } */
+/* { dg-options "-O2" } */
 
 unsigned int functest(unsigned int x)
 {
Index: gcc.target/arm/pr42879.c
===================================================================
--- gcc.target/arm/pr42879.c	(revision 175269)
+++ gcc.target/arm/pr42879.c	(working copy)
@@ -1,4 +1,5 @@
-/* { dg-options "-march=armv7-a -mthumb -Os" }  */
+/* { dg-require-effective-target arm_thumb2_ok } */
+/* { dg-options "-mthumb -Os" }  */
 /* { dg-final { scan-assembler "lsls" } } */
 
 struct A
Index: gcc.target/arm/pr45701-3.c
===================================================================
--- gcc.target/arm/pr45701-3.c	(revision 175269)
+++ gcc.target/arm/pr45701-3.c	(working copy)
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
-/* { dg-options "-march=armv7-a -mthumb -Os" }  */
+/* { dg-require-effective-target arm_thumb2_ok } */
+/* { dg-options "-mthumb -Os" }  */
 /* { dg-final { scan-assembler "push\t.*r8" } } */
 /* { dg-final { scan-assembler-not "push\t*r3" } } */