Module Name: src
Committed By: riastradh
Date: Fri Aug 21 06:37:30 UTC 2020
Modified Files:
src/sys/external/isc/libsodium/conf: files.libsodium
src/sys/rump/kern/lib/libcrypto: Makefile
Log Message:
Disable libsodium HAVE_TI_MODE for now.
This may reduce performance by not taking advantage of 64x64->128
multiplications on some platforms, but let's worry about that later
and fix the build on the other platforms instead.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/isc/libsodium/conf/files.libsodium
cvs rdiff -u -r1.18 -r1.19 src/sys/rump/kern/lib/libcrypto/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/isc/libsodium/conf/files.libsodium
diff -u src/sys/external/isc/libsodium/conf/files.libsodium:1.3 src/sys/external/isc/libsodium/conf/files.libsodium:1.4
--- src/sys/external/isc/libsodium/conf/files.libsodium:1.3 Fri Aug 21 06:30:46 2020
+++ src/sys/external/isc/libsodium/conf/files.libsodium Fri Aug 21 06:37:30 2020
@@ -1,11 +1,11 @@
-# $NetBSD: files.libsodium,v 1.3 2020/08/21 06:30:46 riastradh Exp $
+# $NetBSD: files.libsodium,v 1.4 2020/08/21 06:37:30 riastradh Exp $
define libsodium
makeoptions libsodium SODIUM_CPPFLAGS+="-I$S/external/isc/libsodium/include"
makeoptions libsodium SODIUM_CPPFLAGS+="-I$S/external/isc/libsodium/dist/src/libsodium/include/sodium"
-makeoptions libsodium SODIUM_CPPFLAGS+="-DHAVE_TI_MODE"
+#makeoptions libsodium SODIUM_CPPFLAGS+="-DHAVE_TI_MODE"
makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-shadow"
makeoptions libsodium SODIUM_CPPFLAGS+="-Wno-unused-function"
Index: src/sys/rump/kern/lib/libcrypto/Makefile
diff -u src/sys/rump/kern/lib/libcrypto/Makefile:1.18 src/sys/rump/kern/lib/libcrypto/Makefile:1.19
--- src/sys/rump/kern/lib/libcrypto/Makefile:1.18 Fri Aug 21 06:30:46 2020
+++ src/sys/rump/kern/lib/libcrypto/Makefile Fri Aug 21 06:37:30 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2020/08/21 06:30:46 riastradh Exp $
+# $NetBSD: Makefile,v 1.19 2020/08/21 06:37:30 riastradh Exp $
#
SODIUM_IMPORTDIR=${.CURDIR}/../../../../external/isc/libsodium
@@ -65,7 +65,7 @@ SODIUM_CPPFLAGS=
SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/include
SODIUM_CPPFLAGS+= -I${SODIUM_IMPORTDIR}/dist/src/libsodium/include/sodium
-SODIUM_CPPFLAGS+= -DHAVE_TI_MODE
+#SODIUM_CPPFLAGS+= -DHAVE_TI_MODE
SODIUM_CPPFLAGS+= -Wno-shadow
SODIUM_CPPFLAGS+= -Wno-unused-function