From 01033f3b3f69a2c780dfdc0db37343e0980bd99c Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 2 May 2011 21:27:15 +0000 Subject: Fix building with Clang --- security/nettle/distinfo | 3 ++- .../nettle/patches/patch-x86_camellia-crypt-internal.asm | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 security/nettle/patches/patch-x86_camellia-crypt-internal.asm (limited to 'security/nettle') diff --git a/security/nettle/distinfo b/security/nettle/distinfo index 8479ca059be..bd2ed7bb33c 100644 --- a/security/nettle/distinfo +++ b/security/nettle/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2011/04/26 09:54:55 adam Exp $ +$NetBSD: distinfo,v 1.3 2011/05/02 21:27:15 adam Exp $ SHA1 (nettle-2.1.tar.gz) = 15f660ef6cfd62c1c3302f68055f194913de0dfb RMD160 (nettle-2.1.tar.gz) = 56bd66654e8320abb12812d0fa1b79733bc62094 @@ -7,3 +7,4 @@ SHA1 (patch-Makefile.in) = 15bbe1b1a33817c0d1d1db1f4510c3ebc6eb949e SHA1 (patch-config.make.in) = 0bf3d2729b97883b41374a1ea3d5286fd2554e98 SHA1 (patch-testsuite_Makefile.in) = 38498777821eba9a5d303e6d7848addf5da06700 SHA1 (patch-tools_Makefile.in) = 262d59cb6e642e6ad4c8bec2e166fc18367d91d7 +SHA1 (patch-x86_camellia-crypt-internal.asm) = 0dd04f76ccca63f0c3e7260269fa8f74d01ddda3 diff --git a/security/nettle/patches/patch-x86_camellia-crypt-internal.asm b/security/nettle/patches/patch-x86_camellia-crypt-internal.asm new file mode 100644 index 00000000000..d785f983494 --- /dev/null +++ b/security/nettle/patches/patch-x86_camellia-crypt-internal.asm @@ -0,0 +1,15 @@ +$NetBSD: patch-x86_camellia-crypt-internal.asm,v 1.1 2011/05/02 21:27:15 adam Exp $ + +Avoid ambiguous instruction. + +--- x86/camellia-crypt-internal.asm.orig 2011-05-02 18:31:15.000000000 +0000 ++++ x86/camellia-crypt-internal.asm +@@ -185,7 +185,7 @@ PROLOGUE(_nettle_camellia_crypt) + FL(L0, H0, -16) + FLINV(L1, H1, -8) + ROUND6 +- sub $8, FRAME_CNT ++ subl $8, FRAME_CNT + ja .Lround_loop + + movl FRAME_DST, TMP -- cgit v1.2.3