From b5fca263e57406f2b9d0d44818adefd80df98999 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sat, 28 Dec 2013 02:33:15 +0000
Subject: [PATCH] Use preprocessor symbols where possible.

---
 sys/arch/amd64/stand/libsa/random_i386.S | 5 +++--
 sys/arch/i386/stand/libsa/random_i386.S  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sys/arch/amd64/stand/libsa/random_i386.S b/sys/arch/amd64/stand/libsa/random_i386.S
index 2c7bbd04a2b..e53e548e729 100644
--- a/sys/arch/amd64/stand/libsa/random_i386.S
+++ b/sys/arch/amd64/stand/libsa/random_i386.S
@@ -17,8 +17,9 @@
 #include <machine/param.h>
 #include <machine/asm.h>
 #include <machine/psl.h>
+#include <machine/specialreg.h>
 
-ENTRY(md_random)
+ENTRY(mdrandom)
 	// See if we have CPU identification.
 	pushfl
 	popl	%eax
@@ -55,7 +56,7 @@ ENTRY(md_random)
 	shll	$2, %edx
 	xorl	%edi, %edi
 
-	andl	$0x40000000, %ecx	// See if we have rdrand.
+	andl	$CPUIDECX_RDRAND, %ecx	// See if we have rdrand.
 	jnz	userand
 
 	movl	%edx, %ecx
diff --git a/sys/arch/i386/stand/libsa/random_i386.S b/sys/arch/i386/stand/libsa/random_i386.S
index 2c7bbd04a2b..e53e548e729 100644
--- a/sys/arch/i386/stand/libsa/random_i386.S
+++ b/sys/arch/i386/stand/libsa/random_i386.S
@@ -17,8 +17,9 @@
 #include <machine/param.h>
 #include <machine/asm.h>
 #include <machine/psl.h>
+#include <machine/specialreg.h>
 
-ENTRY(md_random)
+ENTRY(mdrandom)
 	// See if we have CPU identification.
 	pushfl
 	popl	%eax
@@ -55,7 +56,7 @@ ENTRY(md_random)
 	shll	$2, %edx
 	xorl	%edi, %edi
 
-	andl	$0x40000000, %ecx	// See if we have rdrand.
+	andl	$CPUIDECX_RDRAND, %ecx	// See if we have rdrand.
 	jnz	userand
 
 	movl	%edx, %ecx
-- 
2.20.1