From patchwork Fri Sep 7 14:02:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Howarth X-Patchwork-Id: 182382 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 F0DC92C008B for ; Sat, 8 Sep 2012 00:03:04 +1000 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1347631385; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=XIRbO0oOalLnLsVs+fiog1fVjxg=; b=qbrALd+xgISPCaP gGY6AhrGyM2XIzO9vB3buvXtCJcM+VgAxzJ0+2ZpQhiObRWj2Zi3LBE4R5Q2tDw5 ZKr+GOMmI8K3BPfftiVVsE8Hvtdef1JhSa8y5eL9cFBhkvBll/BpLg50rfoBnpjw MOr666JUEN7yHg599DkhtUa10OAM= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type:Content-Disposition:User-Agent:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=oPwnzFrnV5HHgN65wgTCSaXhtn05zukv2F9HwRSN3/Gs3TgdPbawan+4dwJBNm Rvj8XztieKJFGx4Z2b1v6iJCzLBfUI/sL1bWfXujdJdeK18jvLcBthlRBBQrU37q k0QbpRFNedHxEN0O6BJ+9ZtFaJSedZrFLzCbnyWSV3OjU=; Received: (qmail 22474 invoked by alias); 7 Sep 2012 14:02:57 -0000 Received: (qmail 22458 invoked by uid 22791); 7 Sep 2012 14:02:55 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from bromo.med.uc.edu (HELO bromo.med.uc.edu) (129.137.3.146) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 07 Sep 2012 14:02:42 +0000 Received: from bromo.med.uc.edu (localhost.localdomain [127.0.0.1]) by bromo.med.uc.edu (Postfix) with ESMTP id C1DDD400007; Fri, 7 Sep 2012 10:02:41 -0400 (EDT) Received: (from howarth@localhost) by bromo.med.uc.edu (8.14.3/8.14.3/Submit) id q87E2fTK004914; Fri, 7 Sep 2012 10:02:41 -0400 Date: Fri, 7 Sep 2012 10:02:41 -0400 From: Jack Howarth To: gcc-patches@gcc.gnu.org Cc: drepper@gmail.com, dominiq@lps.ens.fr, paolo.carlini@oracle.com Subject: [PATCH][revisedx4] Fix PR bootstrap/54419 Message-ID: <20120907140241.GA4912@bromo.med.uc.edu> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) 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 The attached patch eliminates the bootstrap failures in libstdc++-v3 of PR 54419 by adding a define to acinclude.m4, GLIBCXX_CHECK_X86_RDRAND, that checks for assembler support of the new rdrnd opcode, using this new define in configure.ac and also defining _GLIBCXX_X86_RDRAND in config.h if supported. Tested on x86_64-apple-darwin12 against the assembler from Xcode 4.4.1. Modified to utilize AC_MSG_CHECKING, AC_CACHE_VAL and AC_MSG_RESULT in acinclude.m4. Okay for gcc trunk? Jack ps Corrected Dominique's email address in the ChangeLog. libstdc++-v3/ 2012-09-07 Ulrich Drepper Dominique d'Humieres Jack Howarth PR bootstrap/54419 * acinclude.m4: Define GLIBCXX_CHECK_X86_RDRAND. * configure.ac: Use GLIBCXX_CHECK_X86_RDRAND to test for rdrand support in assembler. * src/c++11/random.cc: (__x86_rdrand): Depend on _GLIBCXX_X86_RDRAND. random_device::_M_init): Likewise. (random_device::_M_getval): Likewise. * configure: Regenerated. * config.h.in: Regenerated. Index: libstdc++-v3/src/c++11/random.cc =================================================================== --- libstdc++-v3/src/c++11/random.cc (revision 191071) +++ libstdc++-v3/src/c++11/random.cc (working copy) @@ -50,7 +50,7 @@ namespace std _GLIBCXX_VISIBILITY(defaul return __ret; } -#if defined __i386__ || defined __x86_64__ +#if (defined __i386__ || defined __x86_64__) && defined _GLIBCXX_X86_RDRAND unsigned int __attribute__ ((target("rdrnd"))) __x86_rdrand(void) @@ -75,7 +75,7 @@ namespace std _GLIBCXX_VISIBILITY(defaul if (token == "default") { -#if defined __i386__ || defined __x86_64__ +#if (defined __i386__ || defined __x86_64__) && defined _GLIBCXX_X86_RDRAND unsigned int eax, ebx, ecx, edx; // Check availability of cpuid and, for now at least, also the // CPU signature for Intel's @@ -118,7 +118,7 @@ namespace std _GLIBCXX_VISIBILITY(defaul random_device::result_type random_device::_M_getval() { -#if (defined __i386__ || defined __x86_64__) +#if (defined __i386__ || defined __x86_64__) && defined _GLIBCXX_X86_RDRAND if (! _M_file) return __x86_rdrand(); #endif Index: libstdc++-v3/configure.ac =================================================================== --- libstdc++-v3/configure.ac (revision 191071) +++ libstdc++-v3/configure.ac (working copy) @@ -330,6 +330,9 @@ case "$target" in esac GLIBCXX_CONDITIONAL(GLIBCXX_LDBL_COMPAT, test $ac_ldbl_compat = yes) +# Check if assembler supports rdrand opcode. +GLIBCXX_CHECK_X86_RDRAND + # This depends on GLIBCXX_ENABLE_SYMVERS and GLIBCXX_IS_NATIVE. GLIBCXX_CONFIGURE_TESTSUITE Index: libstdc++-v3/acinclude.m4 =================================================================== --- libstdc++-v3/acinclude.m4 (revision 191071) +++ libstdc++-v3/acinclude.m4 (working copy) @@ -3360,6 +3360,26 @@ AC_DEFUN([AC_LC_MESSAGES], [ ]) dnl +dnl Check whether rdrand is supported in the assembler. +AC_DEFUN([GLIBCXX_CHECK_X86_RDRAND], [ + AC_MSG_CHECKING([for rdrand support in assembler]) + AC_CACHE_VAL($ac_cv_x86_rdrand, [ + ac_cv_x86_rdrand=no + case "$target" in + i?86-*-* | \ + x86_64-*-*) + AC_TRY_COMPILE(, [asm("rdrand %eax");], + [ac_cv_x86_rdrand=yes], [ac_cv_x86_rdrand=no]) + esac + ]) + if test $ac_cv_x86_rdrand = yes; then + AC_DEFINE(_GLIBCXX_X86_RDRAND, 1, + [ Defined if as can handle rdrand. ]) + fi + AC_MSG_RESULT($ac_cv_x86_rdrand) +]) + +dnl dnl Check whether get_nprocs is available in , and define _GLIBCXX_USE_GET_NPROCS. dnl AC_DEFUN([GLIBCXX_CHECK_GET_NPROCS], [