From patchwork Tue Sep 28 16:51:47 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicola Pero X-Patchwork-Id: 66000 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 6629CB7106 for ; Wed, 29 Sep 2010 02:52:00 +1000 (EST) Received: (qmail 1003 invoked by alias); 28 Sep 2010 16:51:58 -0000 Received: (qmail 992 invoked by uid 22791); 28 Sep 2010 16:51:57 -0000 X-SWARE-Spam-Status: No, hits=0.2 required=5.0 tests=AWL, BAYES_00, RCVD_IN_PSBL, 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, 28 Sep 2010 16:51:51 +0000 Received: from eggs.gnu.org ([140.186.70.92]:52203) by fencepost.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1P0dPB-0004gI-E0 for gcc-patches@gnu.org; Tue, 28 Sep 2010 12:51:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1P0dPA-000673-3i for gcc-patches@gnu.org; Tue, 28 Sep 2010 12:51:49 -0400 Received: from smtp191.iad.emailsrvr.com ([207.97.245.191]:48116) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1P0dPA-00066q-1N for gcc-patches@gnu.org; Tue, 28 Sep 2010 12:51:48 -0400 Received: from localhost (localhost.localdomain [127.0.0.1]) by smtp49.relay.iad1a.emailsrvr.com (SMTP Server) with ESMTP id 772E8190240 for ; Tue, 28 Sep 2010 12:51:47 -0400 (EDT) Received: from dynamic10.wm-web.iad.mlsrvr.com (dynamic10.wm-web.iad1a.rsapps.net [192.168.2.217]) by smtp49.relay.iad1a.emailsrvr.com (SMTP Server) with ESMTP id 65262190204 for ; Tue, 28 Sep 2010 12:51:47 -0400 (EDT) Received: from meta-innovation.com (localhost [127.0.0.1]) by dynamic10.wm-web.iad.mlsrvr.com (Postfix) with ESMTP id 10593478807F for ; Tue, 28 Sep 2010 12:51:47 -0400 (EDT) Received: by www2.webmail.us (Authenticated sender: nicola.pero@meta-innovation.com, from: nicola.pero@meta-innovation.com) with HTTP; Tue, 28 Sep 2010 18:51:47 +0200 (CEST) Date: Tue, 28 Sep 2010 18:51:47 +0200 (CEST) Subject: ObjC - another -fnext-runtime encoding fix From: "Nicola Pero" To: gcc-patches@gnu.org MIME-Version: 1.0 X-Type: plain Message-ID: <1285692707.06388316@192.168.2.229> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) 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 Another small (obvious) fix for a typo (affecting only the next-runtime) introduced with the big encoding patch. Ok to apply ? Thanks Index: gcc/objc/objc-act.c =================================================================== --- gcc/objc/objc-act.c (revision 164686) +++ gcc/objc/objc-act.c (working copy) @@ -8365,7 +8365,6 @@ static void encode_type (tree type, int curtype, int format) { enum tree_code code = TREE_CODE (type); - char c; /* Ignore type qualifiers other than 'const' when encoding a type. */ @@ -8387,13 +8386,14 @@ encode_type (tree type, int curtype, int /* Kludge for backwards-compatibility with gcc-3.3: enums are always encoded as 'i' no matter what type they actually are (!). */ - c = 'i'; + obstack_1grow (&util_obstack, 'i'); break; } /* Else, they are encoded exactly like the integer type that is used by the compiler to store them. */ case INTEGER_TYPE: { + char c; switch (GET_MODE_BITSIZE (TYPE_MODE (type))) { case 8: c = TYPE_UNSIGNED (type) ? 'C' : 'c'; break; @@ -8437,6 +8437,7 @@ encode_type (tree type, int curtype, int } case REAL_TYPE: { + char c; /* Floating point types. */ switch (GET_MODE_BITSIZE (TYPE_MODE (type))) { Index: gcc/objc/ChangeLog =================================================================== --- gcc/objc/ChangeLog (revision 164686) +++ gcc/objc/ChangeLog (working copy) @@ -1,3 +1,8 @@ +2010-09-28 Nicola Pero + + * objc-act.c (encode_type): Fixed encoding enums with the next + runtime. + 2010-09-28 Nicola Pero Merge from 'apple/trunk' branch on FSF servers.