[vlc-commits] contrib: gcrypt: Fix relocation truncated errors

[Hugo Beauzée-Luyssen]

vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Thu Aug 25 18:19:30 2016 +0200| [6c086f82ca2ad98f4eb13d7e9bdd82d1b86518c1] | committer: Hugo Beauzée-Luyssen

contrib: gcrypt: Fix relocation truncated errors

This fixes our 64bits builds.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6c086f82ca2ad98f4eb13d7e9bdd82d1b86518c1
---

 contrib/src/gcrypt/64bits-relocation.patch | 20 ++++++++++++++++++++
 contrib/src/gcrypt/rules.mak               |  3 +++
 2 files changed, 23 insertions(+)

diff --git a/contrib/src/gcrypt/64bits-relocation.patch b/contrib/src/gcrypt/64bits-relocation.patch
new file mode 100644
index 0000000..4d995a0
--- /dev/null
+++ b/contrib/src/gcrypt/64bits-relocation.patch
@@ -0,0 +1,20 @@
+--- libgcrypt/cipher/rijndael.c.orig	2016-08-25 17:54:33.755153207 +0200
++++ libgcrypt/cipher/rijndael.c	2016-08-25 17:54:36.655151003 +0200
+@@ -744,7 +744,7 @@
+   const void *key = ctx->keyschenc;
+   uintptr_t rounds = ctx->rounds;
+   uintptr_t ret;
+-  asm volatile ("movq %[encT], %%r8\n\t"
++  asm volatile ("movabs %[encT], %%r8\n\t"
+                 "callq *%[ret]\n\t"
+                 : [ret] "=a" (ret),
+                   "+D" (key),
+@@ -1127,7 +1127,7 @@
+   const void *key = ctx->keyschdec;
+   uintptr_t rounds = ctx->rounds;
+   uintptr_t ret;
+-  asm volatile ("movq %[dectabs], %%r8\n\t"
++  asm volatile ("movabs %[dectabs], %%r8\n\t"
+                 "callq *%[ret]\n\t"
+                 : [ret] "=a" (ret),
+                   "+D" (key),
diff --git a/contrib/src/gcrypt/rules.mak b/contrib/src/gcrypt/rules.mak
index 23ec964..5239cb2 100644
--- a/contrib/src/gcrypt/rules.mak
+++ b/contrib/src/gcrypt/rules.mak
@@ -15,6 +15,9 @@ libgcrypt: libgcrypt-$(GCRYPT_VERSION).tar.bz2 .sum-gcrypt
 ifdef HAVE_WINSTORE
 	$(APPLY) $(SRC)/gcrypt/winrt.patch
 endif
+ifdef HAVE_WIN64
+	$(APPLY) $(SRC)/gcrypt/64bits-relocation.patch
+endif
 	$(MOVE)
 
 DEPS_gcrypt = gpg-error