From patchwork Mon Jul 28 14:50:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Weigand X-Patchwork-Id: 374223 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id E44BB14012B for ; Tue, 29 Jul 2014 00:50:44 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:date:from:cc:in-reply-to:mime-version:message-id :content-transfer-encoding:content-type; q=dns; s=default; b=DUc 7s35c0sJZcFjWoRN04rLy/sRXCis64PQ8HLC/gEk6pHtm1yEu3xDsy1zPZt4Fsv7 lx37MjJGw7vMPkIDV/35PwGPw0Zi22Aqlo2UbHPZ/skdtmuOIyHaLfnjrCWGN1A3 fAbtYs9q58e2U1ayBFHteWtUIZVbyuEtVOW0wJCA= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :subject:to:date:from:cc:in-reply-to:mime-version:message-id :content-transfer-encoding:content-type; s=default; bh=zEaUfgYk3 VqIIizvB67xWePdZp4=; b=i6ZBH8Sj+pl5CbeHXsk789ZfDKldqy+G6YhnmBMTB STEdxTtntJQ8Xpqsb1LYXNaeZnbO6SQNLgg3ECHriMRJakjV3tm4+JsbG7eI82D4 eYrKGGDjWYOo2IMU58xSGBMSUZABce7pSXJzxQI5TOHdNcQ8XLsEdBGLNI07Xgct WU= Received: (qmail 7965 invoked by alias); 28 Jul 2014 14:50:37 -0000 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 Received: (qmail 7934 invoked by uid 89); 28 Jul 2014 14:50:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: e06smtp10.uk.ibm.com Received: from e06smtp10.uk.ibm.com (HELO e06smtp10.uk.ibm.com) (195.75.94.106) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Mon, 28 Jul 2014 14:50:35 +0000 Received: from /spool/local by e06smtp10.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 28 Jul 2014 15:50:31 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp10.uk.ibm.com (192.168.101.140) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 28 Jul 2014 15:50:29 +0100 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 602F917D8059 for ; Mon, 28 Jul 2014 15:52:11 +0100 (BST) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps4076.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s6SEoTBA36110586 for ; Mon, 28 Jul 2014 14:50:29 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s6SEoSvW012898 for ; Mon, 28 Jul 2014 08:50:28 -0600 Received: from d06ml032.portsmouth.uk.ibm.com (d06ml032.portsmouth.uk.ibm.com [9.149.76.137]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s6SEoHJR012439; Mon, 28 Jul 2014 08:50:19 -0600 Received: from tuxmaker.boeblingen.de.ibm.com ([9.152.85.9]) by d06ml032.portsmouth.uk.ibm.com (Lotus Domino Release 8.5.3FP5IF1HF3) with SMTP id 2014072816501567-25502 ; Mon, 28 Jul 2014 16:50:15 +0200 Received: by tuxmaker.boeblingen.de.ibm.com (sSMTP sendmail emulation); Mon, 28 Jul 2014 16:50:16 +0200 Subject: [commit, 4.8/4.9, libobjc] Match branch ABI (Re: [PATCH, rs6000, 4.8/4.9] Fix alignment of non-Altivec vector struct fields) To: Ulrich Weigand Date: Mon, 28 Jul 2014 16:50:16 +0200 (CEST) From: Ulrich Weigand Cc: doko@ubuntu.com (Matthias Klose), pinskia@gmail.com, amodra@gmail.com (Alan Modra), gcc-patches@gcc.gnu.org (gcc-patches@gcc.gnu.org), dje.gcc@gmail.com (dje.gcc@gmail.com) In-Reply-To: <201407281152.s6SBq3Y9025310@d03av02.boulder.ibm.com> from "Ulrich Weigand" at Jul 28, 2014 01:51:38 PM MIME-Version: 1.0 X-TNEFEvaluated: 1 Message-ID: X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14072814-4966-0000-0000-000000DBF880 > Matthias Klose wrote: > > > #define rs6000_special_adjust_field_align_p(FIELD, COMPUTED) 0 > > > > is what succeeds for me. false is not defined for ObjC. Checked in on the trunk > > and the branches. > > Since we didn't backport the actual ABI change to the branches, only the warning, > I think it would be consistent to use something like this on the branches: > > #define rs6000_special_adjust_field_align_p(FIELD, COMPUTED) \ > (TARGET_ALTIVEC && TREE_CODE (TREE_TYPE (FIELD)) == VECTOR_TYPE) > > rather than the #define ... 0 that is appropriate for mainline. I've now checked this in to the 4.8 and 4.9 branches. Tested on powerpc64le-linux. Bye, Ulrich libobjc/ PR libobjc/61920 * encoding.c (rs6000_special_adjust_field_align_p): Use definition that matches the 4.8/4.9 branch ABI. Index: libobjc/encoding.c =================================================================== --- libobjc/encoding.c (revision 213124) +++ libobjc/encoding.c (working copy) @@ -192,7 +192,8 @@ ? MAX (MAX (COMPUTED, SPECIFIED), 64) \ : MAX (COMPUTED, SPECIFIED));}) -#define rs6000_special_adjust_field_align_p(FIELD, COMPUTED) 0 +#define rs6000_special_adjust_field_align_p(FIELD, COMPUTED) \ + (TARGET_ALTIVEC && TREE_CODE (TREE_TYPE (FIELD)) == VECTOR_TYPE) /* Skip a variable name, enclosed in quotes ("). */ static inline