[82733] trunk/dports/devel/libgcrypt

jeremyhu at macports.org jeremyhu at macports.org
Fri Aug 19 09:21:42 PDT 2011


Revision: 82733
          http://trac.macports.org/changeset/82733
Author:   jeremyhu at macports.org
Date:     2011-08-19 09:21:42 -0700 (Fri, 19 Aug 2011)
Log Message:
-----------
libgcrypt: Fix ambiguous i386 assembly that clang errors over, patch from FreeBSD

Modified Paths:
--------------
    trunk/dports/devel/libgcrypt/Portfile

Added Paths:
-----------
    trunk/dports/devel/libgcrypt/files/clang-asm.patch

Modified: trunk/dports/devel/libgcrypt/Portfile
===================================================================
--- trunk/dports/devel/libgcrypt/Portfile	2011-08-19 15:48:42 UTC (rev 82732)
+++ trunk/dports/devel/libgcrypt/Portfile	2011-08-19 16:21:42 UTC (rev 82733)
@@ -31,6 +31,8 @@
 
 depends_lib     port:libgpg-error
 
+patchfiles      clang-asm.patch
+
 configure.args  --disable-asm
 
 # Build fix for compilers that default to c99 (clang)

Added: trunk/dports/devel/libgcrypt/files/clang-asm.patch
===================================================================
--- trunk/dports/devel/libgcrypt/files/clang-asm.patch	                        (rev 0)
+++ trunk/dports/devel/libgcrypt/files/clang-asm.patch	2011-08-19 16:21:42 UTC (rev 82733)
@@ -0,0 +1,93 @@
+--- cipher/rijndael.c.orig	2011-08-19 09:16:14.000000000 -0700
++++ cipher/rijndael.c	2011-08-19 09:19:01.000000000 -0700
+@@ -730,13 +730,13 @@ do_aesni_enc_aligned (const RIJNDAEL_con
+                 "movdqa 0x90(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
+@@ -785,13 +785,13 @@ do_aesni_dec_aligned (const RIJNDAEL_con
+                 "movdqa 0x90(%%esi), %%xmm1\n\t"
+                 aesdec_xmm1_xmm0
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Ldeclast%=\n\t"
+                 aesdec_xmm1_xmm0
+                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
+                 aesdec_xmm1_xmm0
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Ldeclast%=\n\t"
+                 aesdec_xmm1_xmm0
+                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
+@@ -844,13 +844,13 @@ do_aesni_cfb (const RIJNDAEL_context *ct
+                 "movdqa 0x90(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
+@@ -862,7 +862,7 @@ do_aesni_cfb (const RIJNDAEL_context *ct
+                 "movdqu %[src], %%xmm1\n\t"      /* Save input.  */
+                 "pxor %%xmm1, %%xmm0\n\t"        /* xmm0 = input ^ IV  */
+ 
+-                "cmp $1, %[decrypt]\n\t"
++                "cmpl $1, %[decrypt]\n\t"
+                 "jz .Ldecrypt_%=\n\t"
+                 "movdqa %%xmm0, %[iv]\n\t"       /* [encrypt] Store IV.  */
+                 "jmp .Lleave_%=\n"
+@@ -923,13 +923,13 @@ do_aesni_ctr (const RIJNDAEL_context *ct
+                 "movdqa 0x90(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xb0(%%esi), %%xmm1\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 "movdqa 0xd0(%%esi), %%xmm1\n\t"
+@@ -1050,7 +1050,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
+                 aesenc_xmm1_xmm3
+                 aesenc_xmm1_xmm4
+                 "movdqa 0xa0(%%esi), %%xmm1\n\t"
+-                "cmp $10, %[rounds]\n\t"
++                "cmpl $10, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 aesenc_xmm1_xmm2
+@@ -1062,7 +1062,7 @@ do_aesni_ctr_4 (const RIJNDAEL_context *
+                 aesenc_xmm1_xmm3
+                 aesenc_xmm1_xmm4
+                 "movdqa 0xc0(%%esi), %%xmm1\n\t"
+-                "cmp $12, %[rounds]\n\t"
++                "cmpl $12, %[rounds]\n\t"
+                 "jz .Lenclast%=\n\t"
+                 aesenc_xmm1_xmm0
+                 aesenc_xmm1_xmm2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110819/0bff2090/attachment.html>


More information about the macports-changes mailing list