From patchwork Wed Apr 30 14:13:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 344169 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 193A3140145 for ; Thu, 1 May 2014 00:13:29 +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:from :to:subject:date:message-id:mime-version:content-type; q=dns; s= default; b=N/VkbkNjMFm0ywnVKgHsxh/brp9r+VWh2sjDroVCAaQb6VicNJPMc YoQaJ7CXqmNHZjgWqk7PqoihmAqQHizZFz02DWyR8zQ2gf7WAP0x8+ZlRo2zZdfY R5dR6GfpeZufifggn4HgHBb6VOfzITrHSVeoRVGUA2jp+mfegcvQ+c= 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:from :to:subject:date:message-id:mime-version:content-type; s= default; bh=02qpyR+ts7S9x8XhhLErmCIQlek=; b=I0iYvw2FDg77u7F1BuuO +NIQae6BxDYOUlsSpr9lGGfkYLyBjkVBiIy1G9SLh0gVOIsssTWiNmO4sd0uua0S fSogNoceWM8nJdC2F2fKaL2lkSddUu36Yns6s02ew/uvV45rKxsUGs+giDb60uWE HweyHaDyL6b7JvCM66dMsV0= Received: (qmail 7229 invoked by alias); 30 Apr 2014 14:13:19 -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 7218 invoked by uid 89); 30 Apr 2014 14:13:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp13.uk.ibm.com Received: from e06smtp13.uk.ibm.com (HELO e06smtp13.uk.ibm.com) (195.75.94.109) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Wed, 30 Apr 2014 14:13:13 +0000 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 30 Apr 2014 15:13:09 +0100 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp13.uk.ibm.com (192.168.101.143) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 30 Apr 2014 15:13:09 +0100 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id A2E892190041 for ; Wed, 30 Apr 2014 15:13:00 +0100 (BST) Received: from d06av04.portsmouth.uk.ibm.com (d06av04.portsmouth.uk.ibm.com [9.149.37.216]) by b06cxnps3075.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s3UED81c917876 for ; Wed, 30 Apr 2014 14:13:08 GMT Received: from d06av04.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s3UED7Am031443 for ; Wed, 30 Apr 2014 08:13:07 -0600 Received: from sandifor-thinkpad.stglab.manchester.uk.ibm.com (sig-9-79-14-13.uk.ibm.com [9.79.14.13]) by d06av04.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s3UED6VR031344 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO) for ; Wed, 30 Apr 2014 08:13:07 -0600 From: Richard Sandiford To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, rsandifo@linux.vnet.ibm.com Subject: [committed] Remove W_TYPE_SIZE==64 handling for i386 Date: Wed, 30 Apr 2014 15:13:06 +0100 Message-ID: <874n1ahpn1.fsf@sandifor-thinkpad.stglab.manchester.uk.ibm.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14043014-2966-0000-0000-00000B1DD2D0 Using longlong.h for wide-int.cc failed on 32-bit x86 because the 64-bit x86_64 patterns were being defined for i386 too. Specifically: #define umul_ppmm(w1, w0, u, v) \ __asm__ ("mul{q} %3" \ : "=a" ((UDItype) (w0)), \ "=d" ((UDItype) (w1)) \ : "%0" ((UDItype) (u)), \ "rm" ((UDItype) (v))) was being used if __i386__ was defined. Tested on x86_64-linux-gnu and i686-linux-gnu. I put a: #if defined (__i386__) #error FOO #endif trap in the old block just to make sure that libgcc wasn't using any of the other macros. Approved by Richard B. on irc and applied. Thanks, Richard include/ * longlong.h (__i386__): Remove W_TYPE_SIZE==64 handling. Index: include/longlong.h =================================================================== --- include/longlong.h 2014-04-30 15:05:37.983489787 +0100 +++ include/longlong.h 2014-04-30 15:11:38.883697625 +0100 @@ -483,7 +483,7 @@ #define UMUL_TIME 40 #define UDIV_TIME 40 #endif /* 80x86 */ -#if (defined (__x86_64__) || defined (__i386__)) && W_TYPE_SIZE == 64 +#if defined (__x86_64__) && W_TYPE_SIZE == 64 #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ __asm__ ("add{q} {%5,%1|%1,%5}\n\tadc{q} {%3,%0|%0,%3}" \ : "=r" ((UDItype) (sh)), \