From patchwork Mon Jan 2 10:57:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 133808 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 C46CEB6FA7 for ; Mon, 2 Jan 2012 21:57:52 +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=1326106673; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:From:To:Mail-Followup-To:Subject:Date:Message-ID: User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=QFL+ZF/UhiJ6cYAM8tE4i8Lq8Q8=; b=ahc6z5/3xCM5J/j qSM/FsHXqXE5sTwKewB94HVbJNlLCGhRpr5QQPIAQJKjOn/GpkI/Umm9lYJJB+Qj 8Kj3q5Gxdk9a8Sc4AVlCGk8QGHGPCC225ZFFqMVFPSWLxCfRYEyDa7EWOvq5ku2m 2RnYpULtz4q0m1bAYJ8KDt/SOyJE= 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:From:To:Mail-Followup-To:Subject:Date:Message-ID:User-Agent:MIME-Version:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=XbJzW3vA1KwfR/yKYTxk/RkSlSryBua8UIjr0Ccg4GfLTUQkucqXQr3vKh/UW0 JEXrdzHqkWXCgKF2HD5FI8d4i+9kL183VxYShUCQHVmmCelm1szeBL7jbrfWP/kG sesFNTj97kavY9x/eeZK/is7ds+lI/4xna4jHunGDkTLk=; Received: (qmail 18462 invoked by alias); 2 Jan 2012 10:57:48 -0000 Received: (qmail 18453 invoked by uid 22791); 2 Jan 2012 10:57:47 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL, BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW X-Spam-Check-By: sourceware.org Received: from mail-ww0-f51.google.com (HELO mail-ww0-f51.google.com) (74.125.82.51) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Mon, 02 Jan 2012 10:57:35 +0000 Received: by wgbdr1 with SMTP id dr1so23028689wgb.8 for ; Mon, 02 Jan 2012 02:57:33 -0800 (PST) Received: by 10.227.206.66 with SMTP id ft2mr47754809wbb.8.1325501853693; Mon, 02 Jan 2012 02:57:33 -0800 (PST) Received: from localhost (rsandifo.gotadsl.co.uk. [82.133.89.107]) by mx.google.com with ESMTPS id q5sm1344806wbo.8.2012.01.02.02.57.32 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 02 Jan 2012 02:57:32 -0800 (PST) From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rdsandiford@googlemail.com Subject: [committed] Fix g++.dg/opt/devirt2.C for mips*-linux-gnu Date: Mon, 02 Jan 2012 10:57:26 +0000 Message-ID: <87boqmv0bt.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 g++.dg/opt/devirt2.C was failing for mips64-linux-gnu because each call to xyzzy was accompanied by a R_MIPS_JALR .reloc statement that also mentioned xyzzy. This wouldn't happen if the compiler was built to use PLTs by default, so rather than look for 4 copies of xyzzy, it seemed better to add -mno-abicalls. Tested on mips64-linux-gnu and applied. Richard gcc/testsuite/ * g++.dg/opt/devirt2.C: Add -mno-abicalls for MIPS. Index: gcc/testsuite/g++.dg/opt/devirt2.C =================================================================== --- gcc/testsuite/g++.dg/opt/devirt2.C 2011-12-30 17:39:32.000000000 +0000 +++ gcc/testsuite/g++.dg/opt/devirt2.C 2011-12-30 17:42:30.000000000 +0000 @@ -3,6 +3,8 @@ /* Using -mshort-calls avoids loading the function addresses in registers and thus getting the counts wrong. */ // { dg-additional-options "-mshort-calls" {target epiphany-*-*} } +// Using -mno-abicalls avoids a R_MIPS_JALR .reloc. +// { dg-additional-options "-mno-abicalls" { target mips*-*-* } } // { dg-final { scan-assembler-times "xyzzy" 2 { target { ! { alpha*-*-* hppa*-*-* ia64*-*-hpux* sparc*-*-* } } } } } // The IA64 and HPPA compilers generate external declarations in addition // to the call so those scans need to be more specific.