From patchwork Tue Jun 7 20:09:02 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Pero X-Patchwork-Id: 99324 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 751B1B6FDB for ; Wed, 8 Jun 2011 06:09:37 +1000 (EST) Received: (qmail 14245 invoked by alias); 7 Jun 2011 20:09:27 -0000 Received: (qmail 14213 invoked by uid 22791); 7 Jun 2011 20:09:24 -0000 X-SWARE-Spam-Status: No, hits=-0.1 required=5.0 tests=AWL, BAYES_50, TW_BJ, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (140.186.70.10) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 07 Jun 2011 20:09:09 +0000 Received: from eggs.gnu.org ([140.186.70.92]:44599) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QU2aK-00014u-Fw for gcc-patches@gnu.org; Tue, 07 Jun 2011 16:09:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QU2aH-0007WM-Uo for gcc-patches@gnu.org; Tue, 07 Jun 2011 16:09:07 -0400 Received: from smtp191.iad.emailsrvr.com ([207.97.245.191]:32937) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QU2aH-0007WF-Cx for gcc-patches@gnu.org; Tue, 07 Jun 2011 16:09:05 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp59.relay.iad1a.emailsrvr.com (SMTP Server) with ESMTP id B9B6F3F0376 for ; Tue, 7 Jun 2011 16:09:04 -0400 (EDT) Received: by smtp59.relay.iad1a.emailsrvr.com (Authenticated sender: nicola.pero-AT-meta-innovation.com) with ESMTPSA id 4B5173F01F7 for ; Tue, 7 Jun 2011 16:09:04 -0400 (EDT) From: Nicola Pero Subject: objc/objc++: fix most testsuite failures on darwin8 Date: Tue, 7 Jun 2011 21:09:02 +0100 Message-Id: <754C9AD7-0EC4-41CE-8C7D-D60F10702C57@meta-innovation.com> To: gcc-patches@gnu.org Mime-Version: 1.0 (Apple Message framework v1084) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 207.97.245.191 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 This patch (prepared by me and Iain) fixes almost all failures of the testsuite on Darwin 8 caused by the large testsuite changes I committed yesterday. The patch fixes all the failures but 2. These two require a different small fix that is being developed/tested and will be submitted separately. Thanks Iain for the help! :-) OK to commit ? Thanks Index: ChangeLog =================================================================== --- ChangeLog (revision 174760) +++ ChangeLog (working copy) @@ -1,3 +1,10 @@ +2011-06-07 Nicola Pero + Iain Sandoe + + * objc-obj-c++-shared/TestsuiteObject.h ([-free]): Return 'id'. + * objc-obj-c++-shared/TestsuiteObject.m ([-free]): Return 'id'. + Added cast. + 2011-06-07 Rainer Orth gcc/testsuite: Index: objc-obj-c++-shared/TestsuiteObject.h =================================================================== --- objc-obj-c++-shared/TestsuiteObject.h (revision 174760) +++ objc-obj-c++-shared/TestsuiteObject.h (working copy) @@ -35,7 +35,7 @@ along with GCC; see the file COPYING3. If not see + (id) new; + (id) alloc; - (id) init; -- (void) free; +- (id) free; /* Auxiliary methods. */ + (Class) class; Index: objc-obj-c++-shared/TestsuiteObject.m =================================================================== --- objc-obj-c++-shared/TestsuiteObject.m (revision 174760) +++ objc-obj-c++-shared/TestsuiteObject.m (working copy) @@ -41,9 +41,14 @@ along with GCC; see the file COPYING3. If not see { return self; } -- (void) free +/* We return 'id' to have the same signature as [Object -free] in + older runtimes and avoid warnings about conflicting signatures. */ +- (id) free { - object_dispose (self); + /* Cast 'self' to 'id' because the NeXT runtime in darwin8 (Apple + Mac OS X 10.4) declares object_dispose to take an "Object *" + argument. */ + return object_dispose ((id)self); } + (Class) class {