From c1c3e19995f3a0acd047a9c30f845e638cbdd9ca Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 6 Aug 2014 22:20:13 +0000
Subject: [PATCH] libgcrypt: add x86_gcc2 and x86_64

* uses bytes for the instruction unsupported by gcc2
---
 dev-libs/libgcrypt/libgcrypt-1.6.1.recipe     | 14 +++++------
 .../patches/libgcrypt-1.6.1.patchset          | 25 ++++++++++++++++++-
 2 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe b/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe
index 42e170428..a520e9f33 100644
--- a/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe
+++ b/dev-libs/libgcrypt/libgcrypt-1.6.1.recipe
@@ -8,8 +8,8 @@ COPYRIGHT="2000-2013 Free Software Foundation, Inc."
 HOMEPAGE="http://directory.fsf.org/project/libgcrypt/" 
 SRC_URI="ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$portVersion.tar.bz2"
 CHECKSUM_SHA256="a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070"
-REVISION="1"
-ARCHITECTURES="x86"
+REVISION="2"
+ARCHITECTURES="x86_gcc2 x86 x86_64"
 
 PATCHES="libgcrypt-$portVersion.patchset"
 
@@ -53,11 +53,11 @@ INSTALL()
 
 PROVIDES_devel="
 	libgcrypt${secondaryArchSuffix}_devel = $portVersion compat >= 1.6
-	devel:libgcrypt = 20.0.1 compat >= 20
-	cmd:dumpsexp = $portVersion compat >= 1.6
-	cmd:libgcrypt_config = $portVersion compat >= 1.6
-	cmd:hmac256 = $portVersion compat >= 1.6
-	cmd:mpicalc = $portVersion compat >= 1.6
+	devel:libgcrypt$secondaryArchSuffix = 20.0.1 compat >= 20
+	cmd:dumpsexp$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:libgcrypt_config$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:hmac256$secondaryArchSuffix = $portVersion compat >= 1.6
+	cmd:mpicalc$secondaryArchSuffix = $portVersion compat >= 1.6
 	"
 
 REQUIRES_devel="
diff --git a/dev-libs/libgcrypt/patches/libgcrypt-1.6.1.patchset b/dev-libs/libgcrypt/patches/libgcrypt-1.6.1.patchset
index 63ea8e0ba..bb1ca0ac0 100644
--- a/dev-libs/libgcrypt/patches/libgcrypt-1.6.1.patchset
+++ b/dev-libs/libgcrypt/patches/libgcrypt-1.6.1.patchset
@@ -1,4 +1,4 @@
-From bb32b84d069050b042902ba107eea7f7f17c6759 Mon Sep 17 00:00:00 2001
+From a7b5180b15b148a2601eaeef786f106a9137104a Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Tue, 5 Aug 2014 16:50:29 +0000
 Subject: haiku patch
@@ -41,3 +41,26 @@ index dfbccb7..ff6b7d1 100644
 -- 
 1.8.3.4
 
+
+From 15e722f9905d5caf4b563aca9304ec26c5851541 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Wed, 6 Aug 2014 22:08:04 +0000
+Subject: gcc2 patch
+
+
+diff --git a/src/hwf-x86.c b/src/hwf-x86.c
+index 0591b4f..7521080 100644
+--- a/src/hwf-x86.c
++++ b/src/hwf-x86.c
+@@ -102,7 +102,7 @@ get_xgetbv(void)
+   unsigned int t_eax;
+ 
+   asm volatile
+-    ("xgetbv\n\t"
++    (".byte 0x0f, 0x01, 0xd0\n\t"
+      : "=a" (t_eax)
+      : "c" (0)
+     );
+-- 
+1.8.3.4
+