From owner-svn-src-projects@FreeBSD.ORG  Sun Oct  6 12:35:30 2013
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 1B6B9FDE;
 Sun,  6 Oct 2013 12:35:30 +0000 (UTC)
 (envelope-from markm@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 08EE127FF;
 Sun,  6 Oct 2013 12:35:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r96CZTdb031696;
 Sun, 6 Oct 2013 12:35:29 GMT (envelope-from markm@svn.freebsd.org)
Received: (from markm@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r96CZTIv031694;
 Sun, 6 Oct 2013 12:35:29 GMT (envelope-from markm@svn.freebsd.org)
Message-Id: <201310061235.r96CZTIv031694@svn.freebsd.org>
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 6 Oct 2013 12:35:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r256084 - projects/random_number_generator/sys/dev/random
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
 tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
 <mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Oct 2013 12:35:30 -0000

Author: markm
Date: Sun Oct  6 12:35:29 2013
New Revision: 256084
URL: http://svnweb.freebsd.org/changeset/base/256084

Log:
  Don't use the "real" assembler mnemonics; older compilers may not
  understand them (like when building CURRENT on 9.x).
  
  Submitted by:	Konstantin Belousov <kostikbel@gmail.com>

Modified:
  projects/random_number_generator/sys/dev/random/ivy.c
  projects/random_number_generator/sys/dev/random/nehemiah.c

Modified: projects/random_number_generator/sys/dev/random/ivy.c
==============================================================================
--- projects/random_number_generator/sys/dev/random/ivy.c	Sun Oct  6 12:31:24 2013	(r256083)
+++ projects/random_number_generator/sys/dev/random/ivy.c	Sun Oct  6 12:35:29 2013	(r256084)
@@ -65,12 +65,12 @@ ivy_rng_store(uint64_t *tmp)
 
 	__asm __volatile(
 #ifdef __amd64__
-	    "rdrand\t%%rax\n\t"
+	    ".byte\t0x48,0x0f,0xc7,0xf0\n\t" /* rdrand %rax */
 	    "jnc\t1f\n\t"
 	    "movq\t%%rax,%1\n\t"
 	    "movl\t$8,%%eax\n"
 #else /* i386 */
-	    "rdrand\t%%eax\n\t"
+	    ".byte\t0x0f,0xc7,0xf0\n\t" /* rdrand %eax */
 	    "jnc\t1f\n\t"
 	    "movl\t%%eax,%1\n\t"
 	    "movl\t$4,%%eax\n"

Modified: projects/random_number_generator/sys/dev/random/nehemiah.c
==============================================================================
--- projects/random_number_generator/sys/dev/random/nehemiah.c	Sun Oct  6 12:31:24 2013	(r256083)
+++ projects/random_number_generator/sys/dev/random/nehemiah.c	Sun Oct  6 12:35:29 2013	(r256084)
@@ -71,7 +71,7 @@ VIA_RNG_store(void *buf)
 #ifdef __GNUCLIKE_ASM
 	__asm __volatile(
 		"movl	$0,%%edx\n\t"
-		"xstore"
+		".byte	0x0f, 0xa7, 0xc0" /* xstore */
 			: "=a" (retval), "+d" (rate), "+D" (buf)
 			:
 			: "memory"