From patchwork Fri Mar 21 20:38:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 332743 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 0DF3C2C00B5 for ; Sat, 22 Mar 2014 07:38:28 +1100 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:reply-to:mime-version :content-type; q=dns; s=default; b=a6taviG2JD6+FKU5Cz/moc6JHIkfr zJ6GSXch1vAE10iw/ujvjaYjq0f+od+brtepfQf+TMNL9elYV6GxIEibRFTIAmDQ dr2p7aTm0P/2Q7rwRfBT2AYeyCtow6jfYOzjna2X8Zeh7sb7VHVZQgAUmOtCEMYk hdsgIFiOUhtSzE= 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:date :from:to:cc:subject:message-id:reply-to:mime-version :content-type; s=default; bh=sYOpFUe1LspzoUc/x7vCL8YcskM=; b=av3 KGomnHVAf7dFt+VrlM1Rl9I3ipueEtenjAMEz4ihhcVR9VWXc1EfGHdJFKDmEVrX MSOAZExN2IUBiQUfGCQhSOa1Imt5OsCZ1N+OV3lQiQSC2ny6EkS7+Zsf0uWlzPcO mjt638tPSv3rULhCFYf7bIntNHVGMBXDKUrLWxSk= Received: (qmail 30017 invoked by alias); 21 Mar 2014 20:38:21 -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 30008 invoked by uid 89); 21 Mar 2014 20:38:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.6 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 21 Mar 2014 20:38:20 +0000 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s2LKcJbw006355 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 21 Mar 2014 16:38:19 -0400 Received: from tucnak.zalov.cz (ovpn-116-51.ams2.redhat.com [10.36.116.51]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id s2LKcH4M008810 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 21 Mar 2014 16:38:18 -0400 Received: from tucnak.zalov.cz (localhost [127.0.0.1]) by tucnak.zalov.cz (8.14.8/8.14.7) with ESMTP id s2LKcFZE025646; Fri, 21 Mar 2014 21:38:15 +0100 Received: (from jakub@localhost) by tucnak.zalov.cz (8.14.8/8.14.8/Submit) id s2LKcDMc025645; Fri, 21 Mar 2014 21:38:13 +0100 Date: Fri, 21 Mar 2014 21:38:13 +0100 From: Jakub Jelinek To: Uros Bizjak , Richard Henderson Cc: gcc-patches@gcc.gnu.org Subject: [PATCH] Fix non-biarch sorry diagnostics on unsupported -m64 or -m32 (PR target/60610) Message-ID: <20140321203813.GX1817@tucnak.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes Hi! Prior to r203634 we were comparing TARGET_64BIT with ix86_isa_flags & OPTION_MASK_ISA_64BIT, which is the same thing for TARGET_BI_ARCH, otherwise the former is hardcoded constant. But with r203634, the condition was changed and is now always false and so e.g. for 32-bit non-multilib i?86 gcc we don't complain about lack of -m64 support anymore, instead just ICE later on. Fixed by making TARGET_64BIT_P that the new condition tests also constant for !TARGET_BI_ARCH. Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? 2014-03-21 Jakub Jelinek PR target/60610 * config/i386/i386.h (TARGET_64BIT_P): If not TARGET_BI_ARCH, redefine to 1 or 0. * config/i386/darwin.h (TARGET_64BIT_P): Redefine to TARGET_ISA_64BIT_P(x). Jakub --- gcc/config/i386/i386.h.jj 2014-03-18 10:04:14.000000000 +0100 +++ gcc/config/i386/i386.h 2014-03-21 17:50:22.465016379 +0100 @@ -284,10 +284,13 @@ extern const struct processor_costs ix86 #else #ifndef TARGET_BI_ARCH #undef TARGET_64BIT +#undef TARGET_64BIT_P #if TARGET_64BIT_DEFAULT #define TARGET_64BIT 1 +#define TARGET_64BIT_P(x) 1 #else #define TARGET_64BIT 0 +#define TARGET_64BIT_P(x) 0 #endif #endif #endif --- gcc/config/i386/darwin.h.jj 2014-01-03 11:41:06.000000000 +0100 +++ gcc/config/i386/darwin.h 2014-03-21 17:51:56.492536202 +0100 @@ -26,7 +26,9 @@ along with GCC; see the file COPYING3. #define DARWIN_X86 1 #undef TARGET_64BIT +#undef TARGET_64BIT_P #define TARGET_64BIT TARGET_ISA_64BIT +#define TARGET_64BIT_P(x) TARGET_ISA_64BIT_P(x) #ifdef IN_LIBGCC2 #undef TARGET_64BIT