From patchwork Fri Feb 18 02:21:44 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 83525 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 F3043B7124 for ; Fri, 18 Feb 2011 13:21:51 +1100 (EST) Received: (qmail 27005 invoked by alias); 18 Feb 2011 02:21:50 -0000 Received: (qmail 26995 invoked by uid 22791); 18 Feb 2011 02:21:49 -0000 X-SWARE-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL, BAYES_00, NO_DNS_FOR_FROM, RCVD_IN_DNSWL_HI, TW_FN, T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mga01.intel.com (HELO mga01.intel.com) (192.55.52.88) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 18 Feb 2011 02:21:45 +0000 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 17 Feb 2011 18:21:44 -0800 X-ExtLoop1: 1 Received: from gnu-6.sc.intel.com ([10.3.194.135]) by fmsmga001.fm.intel.com with ESMTP; 17 Feb 2011 18:21:44 -0800 Received: by gnu-6.sc.intel.com (Postfix, from userid 500) id 28A2B180F04; Thu, 17 Feb 2011 18:21:44 -0800 (PST) Date: Thu, 17 Feb 2011 18:21:44 -0800 From: "H.J. Lu" To: gcc-patches@gcc.gnu.org Subject: [x32] PATCH: Check __x86_64__ instead of __LP64__ for Linux futex Message-ID: <20110218022144.GA11947@intel.com> Reply-To: "H.J. Lu" MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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 Hi, Linux/x32 uses the same futex as Linux/x86-64. We should check __x86_64__ instead of __LP64__ for Linux futex. Checked it in. Thanks. H.J. --- commit cd679cfe40eb0b41e93c084693f9f7f6058df20f Author: H.J. Lu Date: Thu Feb 17 06:56:52 2011 -0800 Check __x86_64__ instead of __LP64__ for futex. diff --git a/libgomp/ChangeLog.x32 b/libgomp/ChangeLog.x32 new file mode 100644 index 0000000..f0d2b59 --- /dev/null +++ b/libgomp/ChangeLog.x32 @@ -0,0 +1,4 @@ +2011-02-17 H.J. Lu + + * config/linux/x86/futex.h: Check __x86_64__ instead of + __LP64__. diff --git a/libgomp/config/linux/x86/futex.h b/libgomp/config/linux/x86/futex.h index cb7461d..419f4d9 100644 --- a/libgomp/config/linux/x86/futex.h +++ b/libgomp/config/linux/x86/futex.h @@ -24,7 +24,7 @@ /* Provide target-specific access to the futex system call. */ -#ifdef __LP64__ +#ifdef __x86_64__ # ifndef SYS_futex # define SYS_futex 202 # endif @@ -138,7 +138,7 @@ futex_wake (int *addr, int count) } } -#endif /* __LP64__ */ +#endif /* __x86_64__ */ static inline void cpu_relax (void)