Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 16 Jul 2018 15:39:33 +0000 (UTC)
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r336348 - in head/sys: conf crypto/armv8 modules/armv8crypto
Message-ID:  <201807161539.w6GFdXrN068666@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: andrew
Date: Mon Jul 16 15:39:33 2018
New Revision: 336348
URL: https://svnweb.freebsd.org/changeset/base/336348

Log:
  Create an empty stdint.h for arm_neon.h to include.
  
  The armv8crypto module includes arm_neon.h for the compiler intrinsic
  functions. This includes the userland stdint.h file that doesn't exist in
  the kernel. Fix this by providing an empty stdint.h to be used when we
  include arm_neon.h.
  
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D16254

Added:
  head/sys/crypto/armv8/stdint.h   (contents, props changed)
Modified:
  head/sys/conf/files.arm64
  head/sys/modules/armv8crypto/Makefile

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Mon Jul 16 15:29:32 2018	(r336347)
+++ head/sys/conf/files.arm64	Mon Jul 16 15:39:33 2018	(r336348)
@@ -177,7 +177,7 @@ contrib/vchiq/interface/vchiq_arm/vchiq_util.c	optiona
 crypto/armv8/armv8_crypto.c	optional	armv8crypto
 armv8_crypto_wrap.o		optional	armv8crypto		\
 	dependency	"$S/crypto/armv8/armv8_crypto_wrap.c"		\
-	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \
+	compile-with	"${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \
 	no-implicit-rule						\
 	clean		"armv8_crypto_wrap.o"
 crypto/blowfish/bf_enc.c	optional	crypto | ipsec | ipsec_support

Added: head/sys/crypto/armv8/stdint.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/sys/crypto/armv8/stdint.h	Mon Jul 16 15:39:33 2018	(r336348)
@@ -0,0 +1,5 @@
+/*
+ * This is here as arm_neon.h includes <stdint.h>. It can be empty as
+ * we already include the needed headers.
+ */
+/* $FreeBSD$ */

Modified: head/sys/modules/armv8crypto/Makefile
==============================================================================
--- head/sys/modules/armv8crypto/Makefile	Mon Jul 16 15:29:32 2018	(r336347)
+++ head/sys/modules/armv8crypto/Makefile	Mon Jul 16 15:39:33 2018	(r336348)
@@ -11,6 +11,7 @@ OBJS+=	armv8_crypto_wrap.o
 # Remove -nostdinc so we can get the intrinsics.
 armv8_crypto_wrap.o: armv8_crypto_wrap.c
 	${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} \
+	    -I${SRCTOP}/sys/crypto/armv8 \
 	    ${WERROR} ${PROF} \
 	     -march=armv8-a+crypto ${.IMPSRC}
 	${CTFCONVERT_CMD}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807161539.w6GFdXrN068666>