From patchwork Thu Sep 6 20:32:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jack Howarth X-Patchwork-Id: 182287 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 899572C00BA for ; Fri, 7 Sep 2012 07:32:44 +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=1347571998; h=Comment: DomainKey-Signature:Received:Received:Received:Received:To: Subject:Cc:Message-Id:Date:From:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=JoeWjh/Tnbr4XTbcZGVimzcyJLw=; b=bjEIBm36Tl4Z22M pRPAxYCwEZ2Pv25BHgVansLYISVlKyLCWVUz3/TIYTn4+k5NNzb5hFf556wIA5z2 Q8/mhvIqYC2k9JQ0puR+eVWgJ0lKyOP0NKF4Zh+qdm3GfGBgJ7yHU+Me2bHFOwsC xEn2AdC2Us4Qzilf9z7RyaqKVSPQ= 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:To:Subject:Cc:Message-Id:Date:From:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=WzigRx6Q3BsBkfcAByISmb1FXHFIMHSa2tRv+xcGRGtaR1S1pghUHQTI9mzANT xapxSo7QMQntg8BQwOIdbSt+ZPxNABEeYo9dl6NqfpweHYv1yLFYvJFfVbpsLshN uPBqniW0DFJKdduIrPU9VvQVryD2gtaN7v+cnHQwgmYNg=; Received: (qmail 23295 invoked by alias); 6 Sep 2012 20:32:42 -0000 Received: (qmail 23280 invoked by uid 22791); 6 Sep 2012 20:32:39 -0000 X-SWARE-Spam-Status: No, hits=4.8 required=5.0 tests=BAYES_00, BOTNET, DKIM_ADSP_NXDOMAIN, NO_DNS_FOR_FROM, RCVD_IN_SORBS_DUL, RDNS_NONE X-Spam-Check-By: sourceware.org Received: from Unknown (HELO frodo.msbb.uc.edu) (129.137.218.143) by sourceware.org (qpsmtpd/0.43rc1) with SMTP; Thu, 06 Sep 2012 20:32:26 +0000 Received: by frodo.msbb.uc.edu (Postfix, from userid 504) id 383BC436D65F; Thu, 6 Sep 2012 16:32:15 -0400 (EDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH][revisedx2] Fix PR bootstrap/54419 Cc: dominiq@lps.ens.ft, drepper@gmail.com Message-Id: <20120906203216.383BC436D65F@frodo.msbb.uc.edu> Date: Thu, 6 Sep 2012 16:32:15 -0400 (EDT) From: howarth@frodo.msbb.uc.edu (Jack Howarth) 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. Okay for gcc trunk? Jack libstdc++-v3/ 2012-09-06 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 191041) +++ 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 191041) +++ 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 191041) +++ libstdc++-v3/acinclude.m4 (working copy) @@ -3360,6 +3360,22 @@ AC_DEFUN([AC_LC_MESSAGES], [ ]) dnl +dnl Check whether rdrand is supported in the assembler. +AC_DEFUN([GLIBCXX_CHECK_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 +]) + +dnl dnl Check whether get_nprocs is available in , and define _GLIBCXX_USE_GET_NPROCS. dnl AC_DEFUN([GLIBCXX_CHECK_GET_NPROCS], [