Date: Sat, 5 Jul 2014 23:19:06 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360837 - in head/security/libgcrypt: . files Message-ID: <201407052319.s65NJ671033425@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno (src committer) Date: Sat Jul 5 23:19:05 2014 New Revision: 360837 URL: http://svnweb.freebsd.org/changeset/ports/360837 QAT: https://qat.redports.org/buildarchive/r360837/ Log: Added needed ASM instructions for armv6 architecture support. PR: 190848 Submitted by: andrew@freebsd.org Reviewed by: mat@freebsd.org Modified: head/security/libgcrypt/Makefile head/security/libgcrypt/files/patch-mpi-longlong.h Modified: head/security/libgcrypt/Makefile ============================================================================== --- head/security/libgcrypt/Makefile Sat Jul 5 23:12:12 2014 (r360836) +++ head/security/libgcrypt/Makefile Sat Jul 5 23:19:05 2014 (r360837) @@ -3,7 +3,7 @@ PORTNAME= libgcrypt PORTVERSION= 1.5.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_GNUPG} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -33,9 +33,6 @@ PORTDOCS= * .if ${ARCH} == "powerpc" CONFIGURE_ARGS+= --disable-asm -.elif ${ARCH} == "armv6" -USE_GCC= any - .elif ${ARCH} == "i386" .if (${OSVERSION} < 900033) CONFIGURE_ARGS+= --disable-aesni-support Modified: head/security/libgcrypt/files/patch-mpi-longlong.h ============================================================================== --- head/security/libgcrypt/files/patch-mpi-longlong.h Sat Jul 5 23:12:12 2014 (r360836) +++ head/security/libgcrypt/files/patch-mpi-longlong.h Sat Jul 5 23:19:05 2014 (r360837) @@ -1,5 +1,42 @@ ---- ./mpi/longlong.h.orig 2010-02-22 19:04:43.000000000 +0900 -+++ ./mpi/longlong.h 2010-11-01 18:25:34.000000000 +0900 +--- ./mpi/longlong.h.orig 2013-07-25 09:10:04.000000000 +0000 ++++ ./mpi/longlong.h 2014-06-09 18:53:59.000000000 +0000 +@@ -188,8 +188,8 @@ + #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ + __asm__ ("adds %1, %4, %5\n" \ + "adc %0, %2, %3" \ +- : "=r" ((USItype)(sh)), \ +- "=&r" ((USItype)(sl)) \ ++ : "=r" ((sh)), \ ++ "=&r" ((sl)) \ + : "%r" ((USItype)(ah)), \ + "rI" ((USItype)(bh)), \ + "%r" ((USItype)(al)), \ +@@ -197,8 +197,8 @@ + #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ + __asm__ ("subs %1, %4, %5\n" \ + "sbc %0, %2, %3" \ +- : "=r" ((USItype)(sh)), \ +- "=&r" ((USItype)(sl)) \ ++ : "=r" ((sh)), \ ++ "=&r" ((sl)) \ + : "r" ((USItype)(ah)), \ + "rI" ((USItype)(bh)), \ + "r" ((USItype)(al)), \ +@@ -225,10 +225,10 @@ + : "r0", "r1", "r2") + #else + #define umul_ppmm(xh, xl, a, b) \ +- __asm__ ("%@ Inlined umul_ppmm\n" \ +- "umull %r1, %r0, %r2, %r3" \ +- : "=&r" ((USItype)(xh)), \ +- "=r" ((USItype)(xl)) \ ++ __asm__ ( \ ++ "umull %1, %0, %2, %3" \ ++ : "=&r" ((xh)), \ ++ "=r" ((xl)) \ + : "r" ((USItype)(a)), \ + "r" ((USItype)(b)) \ + : "r0", "r1") @@ -437,8 +437,8 @@ #define add_ssaaaa(sh, sl, ah, al, bh, bl) \ __asm__ ("addl %5,%1\n" \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407052319.s65NJ671033425>