From patchwork Sun Oct 31 15:04:15 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 69717 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 9D1231007D2 for ; Mon, 1 Nov 2010 02:04:27 +1100 (EST) Received: (qmail 8543 invoked by alias); 31 Oct 2010 15:04:26 -0000 Received: (qmail 8535 invoked by uid 22791); 31 Oct 2010 15:04:25 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE, 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 15:04:21 +0000 Received: by wya21 with SMTP id 21so4663963wya.20 for ; Sun, 31 Oct 2010 08:04:18 -0700 (PDT) Received: by 10.227.154.20 with SMTP id m20mr4929826wbw.107.1288537458583; Sun, 31 Oct 2010 08:04:18 -0700 (PDT) Received: from localhost (rsandifo.gotadsl.co.uk [82.133.89.107]) by mx.google.com with ESMTPS id f14sm4222527wbe.14.2010.10.31.08.04.16 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 31 Oct 2010 08:04:17 -0700 (PDT) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [committed] Tweak gcc.dg/stack-usage-1.c for MIPS Date: Sun, 31 Oct 2010 15:04:15 +0000 Message-ID: <8762wiiets.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 The current setting of SIZE in gcc.dg/stack-usage-1.c is correct for GNU/Linux targets, but is too small for some embedded targets. Tested on mips64-linux-gnu and mipsisa64-elf. Also tested with the combination: mips-sim-idt64'{-mabi=32,-mabi=eabi/-mgp32,-mabi=eabi,-mabi=o64,-mabi=n32,-mabi=64}{-mabicalls,-mno-abicalls}{-mshared,-mno-shared}{-mplt,-mno-plt}' on mipsisa64-elf. This has 8 nonsensical combinations (EABI + abicalls), but all the others pass. Applied. Richard gcc/testsuite/ * gcc.dg/stack-usage-1.c (SIZE): Increase to 248 for some MIPS targets. Index: gcc/testsuite/gcc.dg/stack-usage-1.c =================================================================== --- gcc/testsuite/gcc.dg/stack-usage-1.c 2010-10-31 14:52:19.000000000 +0000 +++ gcc/testsuite/gcc.dg/stack-usage-1.c 2010-10-31 14:57:57.000000000 +0000 @@ -24,7 +24,12 @@ #elif defined (__ia64__) # define SIZE 272 #elif defined(__mips__) -# define SIZE 240 +# if defined (__mips_abicalls) \ + || (defined _MIPS_SIM && (_MIPS_SIM ==_ABIN32 || _MIPS_SIM==_ABI64)) +# define SIZE 240 +# else +# define SIZE 248 +# endif #elif defined (__powerpc__) || defined (__PPC__) || defined (__ppc__) \ || defined (__POWERPC__) || defined (PPC) || defined (_IBMR2) # define SIZE 240