From: Martin Willi <martin@revosec.ch>
Date: Fri, 4 Jan 2013 15:34:56 +0000 (+0100)
Subject: Use raw opcodes for rdrand to build with older binutils
X-Git-Tag: 5.0.2dr4~11
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2cd6c5115bc6d19e7303ab83a4dbacdb9135d05f;p=thirdparty%2Fstrongswan.git

Use raw opcodes for rdrand to build with older binutils
---

diff --git a/src/libstrongswan/plugins/rdrand/rdrand_rng.c b/src/libstrongswan/plugins/rdrand/rdrand_rng.c
index 8c219b4263..d032cbe31d 100644
--- a/src/libstrongswan/plugins/rdrand/rdrand_rng.c
+++ b/src/libstrongswan/plugins/rdrand/rdrand_rng.c
@@ -61,9 +61,9 @@ static bool rdrand16(u_int16_t *out)
 
 	for (i = 0; i < MAX_TRIES; i++)
 	{
-		asm("rdrand %0;"
+		asm(".byte 0x66;.byte 0x0f;.byte 0xc7;.byte 0xf0; " /* rdrand */
 			"setc %1;"
-			: "=r"(*out), "=qm"(res));
+			: "=a"(*out), "=qm"(res));
 
 		if (res)
 		{
@@ -83,9 +83,9 @@ static bool rdrand32(u_int32_t *out)
 
 	for (i = 0; i < MAX_TRIES; i++)
 	{
-		asm("rdrand %0;"
+		asm(".byte 0x0f;.byte 0xc7;.byte 0xf0;" /* rdrand */
 			"setc %1;"
-			: "=r"(*out), "=qm"(res));
+			: "=a"(*out), "=qm"(res));
 
 		if (res)
 		{
@@ -106,9 +106,9 @@ static bool rdrand64(u_int64_t *out)
 
 	for (i = 0; i < MAX_TRIES; i++)
 	{
-		asm("rdrand %0;"
+		asm(".byte 0x48;.byte 0x0f;.byte 0xc7;.byte 0xf0;" /* rdrand */
 			"setc %1;"
-			: "=r"(*out), "=qm"(res));
+			: "=a"(*out), "=qm"(res));
 
 		if (res)
 		{