4 files + 27 − 1 Side-by-side Compare changes Side-by-side Inline Show whitespace changes Files 4 .gitlab-ci.yml +3 −1 Original line number Original line Diff line number Diff line Loading @@ -15,7 +15,8 @@ build/x86-64: script: script: - ./.bootstrap && - ./.bootstrap && ./configure --disable-static --enable-fat --disable-documentation && make -j4 && ./configure --disable-static --enable-fat --disable-documentation && make -j4 && make check -j4 make check -j4 && make check-fat tags: tags: - shared - shared - linux - linux Loading Loading @@ -156,6 +157,7 @@ Debian.cross.x86: - ./configure --disable-static --enable-fat --disable-documentation --build=$build --host=$host - ./configure --disable-static --enable-fat --disable-documentation --build=$build --host=$host - make -j$(nproc) - make -j$(nproc) - make -j$(nproc) check - make -j$(nproc) check - make -j$(nproc) check-fat tags: tags: - shared - shared - linux - linux Loading ChangeLog +6 −0 Original line number Original line Diff line number Diff line 2020-07-28 Niels Möller <nisse@lysator.liu.se> * configure.ac (FAT_TEST_LIST): New substituted variable. Set for fat builds, otherwise empty. * Makefile.in (check-fat): New target, using $(FAT_TEST_LIST). 2020-07-13 Niels Möller <nisse@lysator.liu.se> 2020-07-13 Niels Möller <nisse@lysator.liu.se> * chacha-crypt.c (chacha_crypt) [HAVE_NATIVE_chacha_3core]: Use * chacha-crypt.c (chacha_crypt) [HAVE_NATIVE_chacha_3core]: Use Loading Makefile.in +12 −0 Original line number Original line Diff line number Diff line Loading @@ -17,6 +17,8 @@ OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@ OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@ OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@ FAT_TEST_LIST = @FAT_TEST_LIST@ SUBDIRS = tools testsuite examples SUBDIRS = tools testsuite examples include config.make include config.make Loading Loading @@ -55,6 +57,16 @@ clean distclean mostlyclean maintainer-clean tags: check-here: check-here: true true # Tries different settings of NETTLE_FAT_OVERRIDE. Note that this # requires that corresponding processor features are available on the # test machine. check-fat: [ -z "$(FAT_TEST_LIST)" ] || \ set -e; cd testsuite && for f in $(FAT_TEST_LIST) ; do \ echo NETTLE_FAT_OVERRIDE=$$f ; \ NETTLE_FAT_OVERRIDE=$$f $(MAKE) check ; \ done # FIXME: Remove. These targets aren't supported, but they are expected by the # FIXME: Remove. These targets aren't supported, but they are expected by the # automake generated Makefiles in the lsh build. # automake generated Makefiles in the lsh build. dvi installcheck uninstallcheck: dvi installcheck uninstallcheck: Loading configure.ac +6 −0 Original line number Original line Diff line number Diff line Loading @@ -383,6 +383,7 @@ if test "x$ABI" != xstandard ; then fi fi OPT_NETTLE_SOURCES="" OPT_NETTLE_SOURCES="" FAT_TEST_LIST="" # Select assembler code # Select assembler code asm_path= asm_path= Loading @@ -397,6 +398,9 @@ if test "x$enable_assembler" = xyes ; then if test "x$enable_fat" = xyes ; then if test "x$enable_fat" = xyes ; then asm_path="x86_64/fat $asm_path" asm_path="x86_64/fat $asm_path" OPT_NETTLE_SOURCES="fat-x86_64.c $OPT_NETTLE_SOURCES" OPT_NETTLE_SOURCES="fat-x86_64.c $OPT_NETTLE_SOURCES" # For now, not enabling aesni or sha_ni, since at least # the latter appears unavailable on te gitlab test machines. FAT_TEST_LIST="vendor:intel vendor:amd" else else if test "x$enable_x86_aesni" = xyes ; then if test "x$enable_x86_aesni" = xyes ; then asm_path="x86_64/aesni $asm_path" asm_path="x86_64/aesni $asm_path" Loading @@ -421,6 +425,7 @@ if test "x$enable_assembler" = xyes ; then if test "x$enable_fat" = xyes ; then if test "x$enable_fat" = xyes ; then asm_path="arm/fat $asm_path" asm_path="arm/fat $asm_path" OPT_NETTLE_SOURCES="fat-arm.c $OPT_NETTLE_SOURCES" OPT_NETTLE_SOURCES="fat-arm.c $OPT_NETTLE_SOURCES" FAT_TEST_LIST="arch:5 arch:6,neon" else else case "$host_cpu" in case "$host_cpu" in armv6* | armv7*) armv6* | armv7*) Loading Loading @@ -547,6 +552,7 @@ fi AC_SUBST([OPT_NETTLE_OBJS]) AC_SUBST([OPT_NETTLE_OBJS]) AC_SUBST([OPT_HOGWEED_OBJS]) AC_SUBST([OPT_HOGWEED_OBJS]) AC_SUBST([OPT_NETTLE_SOURCES]) AC_SUBST([OPT_NETTLE_SOURCES]) AC_SUBST([FAT_TEST_LIST]) AC_SUBST([ASM_RODATA]) AC_SUBST([ASM_RODATA]) if test "x$enable_assembler" = xyes ; then if test "x$enable_assembler" = xyes ; then IF_ASM='' IF_ASM='' Loading
.gitlab-ci.yml +3 −1 Original line number Original line Diff line number Diff line Loading @@ -15,7 +15,8 @@ build/x86-64: script: script: - ./.bootstrap && - ./.bootstrap && ./configure --disable-static --enable-fat --disable-documentation && make -j4 && ./configure --disable-static --enable-fat --disable-documentation && make -j4 && make check -j4 make check -j4 && make check-fat tags: tags: - shared - shared - linux - linux Loading Loading @@ -156,6 +157,7 @@ Debian.cross.x86: - ./configure --disable-static --enable-fat --disable-documentation --build=$build --host=$host - ./configure --disable-static --enable-fat --disable-documentation --build=$build --host=$host - make -j$(nproc) - make -j$(nproc) - make -j$(nproc) check - make -j$(nproc) check - make -j$(nproc) check-fat tags: tags: - shared - shared - linux - linux Loading
ChangeLog +6 −0 Original line number Original line Diff line number Diff line 2020-07-28 Niels Möller <nisse@lysator.liu.se> * configure.ac (FAT_TEST_LIST): New substituted variable. Set for fat builds, otherwise empty. * Makefile.in (check-fat): New target, using $(FAT_TEST_LIST). 2020-07-13 Niels Möller <nisse@lysator.liu.se> 2020-07-13 Niels Möller <nisse@lysator.liu.se> * chacha-crypt.c (chacha_crypt) [HAVE_NATIVE_chacha_3core]: Use * chacha-crypt.c (chacha_crypt) [HAVE_NATIVE_chacha_3core]: Use Loading
Makefile.in +12 −0 Original line number Original line Diff line number Diff line Loading @@ -17,6 +17,8 @@ OPT_HOGWEED_OBJS = @OPT_HOGWEED_OBJS@ OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@ OPT_NETTLE_SOURCES = @OPT_NETTLE_SOURCES@ FAT_TEST_LIST = @FAT_TEST_LIST@ SUBDIRS = tools testsuite examples SUBDIRS = tools testsuite examples include config.make include config.make Loading Loading @@ -55,6 +57,16 @@ clean distclean mostlyclean maintainer-clean tags: check-here: check-here: true true # Tries different settings of NETTLE_FAT_OVERRIDE. Note that this # requires that corresponding processor features are available on the # test machine. check-fat: [ -z "$(FAT_TEST_LIST)" ] || \ set -e; cd testsuite && for f in $(FAT_TEST_LIST) ; do \ echo NETTLE_FAT_OVERRIDE=$$f ; \ NETTLE_FAT_OVERRIDE=$$f $(MAKE) check ; \ done # FIXME: Remove. These targets aren't supported, but they are expected by the # FIXME: Remove. These targets aren't supported, but they are expected by the # automake generated Makefiles in the lsh build. # automake generated Makefiles in the lsh build. dvi installcheck uninstallcheck: dvi installcheck uninstallcheck: Loading
configure.ac +6 −0 Original line number Original line Diff line number Diff line Loading @@ -383,6 +383,7 @@ if test "x$ABI" != xstandard ; then fi fi OPT_NETTLE_SOURCES="" OPT_NETTLE_SOURCES="" FAT_TEST_LIST="" # Select assembler code # Select assembler code asm_path= asm_path= Loading @@ -397,6 +398,9 @@ if test "x$enable_assembler" = xyes ; then if test "x$enable_fat" = xyes ; then if test "x$enable_fat" = xyes ; then asm_path="x86_64/fat $asm_path" asm_path="x86_64/fat $asm_path" OPT_NETTLE_SOURCES="fat-x86_64.c $OPT_NETTLE_SOURCES" OPT_NETTLE_SOURCES="fat-x86_64.c $OPT_NETTLE_SOURCES" # For now, not enabling aesni or sha_ni, since at least # the latter appears unavailable on te gitlab test machines. FAT_TEST_LIST="vendor:intel vendor:amd" else else if test "x$enable_x86_aesni" = xyes ; then if test "x$enable_x86_aesni" = xyes ; then asm_path="x86_64/aesni $asm_path" asm_path="x86_64/aesni $asm_path" Loading @@ -421,6 +425,7 @@ if test "x$enable_assembler" = xyes ; then if test "x$enable_fat" = xyes ; then if test "x$enable_fat" = xyes ; then asm_path="arm/fat $asm_path" asm_path="arm/fat $asm_path" OPT_NETTLE_SOURCES="fat-arm.c $OPT_NETTLE_SOURCES" OPT_NETTLE_SOURCES="fat-arm.c $OPT_NETTLE_SOURCES" FAT_TEST_LIST="arch:5 arch:6,neon" else else case "$host_cpu" in case "$host_cpu" in armv6* | armv7*) armv6* | armv7*) Loading Loading @@ -547,6 +552,7 @@ fi AC_SUBST([OPT_NETTLE_OBJS]) AC_SUBST([OPT_NETTLE_OBJS]) AC_SUBST([OPT_HOGWEED_OBJS]) AC_SUBST([OPT_HOGWEED_OBJS]) AC_SUBST([OPT_NETTLE_SOURCES]) AC_SUBST([OPT_NETTLE_SOURCES]) AC_SUBST([FAT_TEST_LIST]) AC_SUBST([ASM_RODATA]) AC_SUBST([ASM_RODATA]) if test "x$enable_assembler" = xyes ; then if test "x$enable_assembler" = xyes ; then IF_ASM='' IF_ASM='' Loading
