svn commit: r435049 - in head/security/libgcrypt: . files

[Jan Beich]

"Carlos J. Puga Medina" <cpm at FreeBSD.org> writes:

> Modified: head/security/libgcrypt/Makefile
> ==============================================================================
> --- head/security/libgcrypt/Makefile	Tue Feb 28 12:06:09 2017	(r435048)
> +++ head/security/libgcrypt/Makefile	Tue Feb 28 12:21:13 2017	(r435049)
> @@ -33,6 +33,10 @@ OPTIONS_DEFINE=	DOCS
>  
>  .include <bsd.port.options.mk>
>  
> +.if ${ARCH} == "armv6" || ${ARCH} == "aarch64"
> +EXTRA_PATCHES+=		${FILESDIR}/extra-patch-aarch64
> +.endif

Why do you need aarch64-specific patch on armv6? I don't think FreeBSD
runtime detection of SIMD features on armv6.

> +
>  .if ${ARCH} == "powerpc"
>  CONFIGURE_ARGS+=	--disable-asm
>  .endif
>
> Added: head/security/libgcrypt/files/extra-patch-aarch64
> ==============================================================================
>
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/security/libgcrypt/files/extra-patch-aarch64	Tue Feb 28 12:21:13 2017	(r435049)
> @@ -0,0 +1,68 @@
> +--- cipher/cipher-gcm-armv8-aarch64-ce.S.orig	2016-11-12 10:39:35 UTC
> ++++ cipher/cipher-gcm-armv8-aarch64-ce.S
> +@@ -23,7 +23,7 @@
> +     defined(HAVE_COMPATIBLE_GCC_AARCH64_PLATFORM_AS) && \
> +     defined(HAVE_GCC_INLINE_ASM_AARCH64_CRYPTO)
> + 
> +-.arch armv8-a+crypto
> ++.cpu generic+simd+crypto

Interesting. I've fixed a similar issue in r431494 via -no-integrated-as.
11.1 is going to have clang 4.0, so the workaround can be dropped 3 months
after release.