diff options
author | Maamoun TK <maamoun.tk@googlemail.com> | 2022-10-13 11:46:50 +0200 |
---|---|---|
committer | Maamoun TK <maamoun.tk@googlemail.com> | 2022-10-13 11:46:50 +0200 |
commit | 57bda85518591a47be47fbd3dca5f9b41426a936 (patch) | |
tree | 226918d8a1ddb72bca0ba3d329d8646cd78536fe | |
parent | a94abb62fb0a6daed828bceeab042e39b258a013 (diff) | |
download | nettle-57bda85518591a47be47fbd3dca5f9b41426a936.tar.gz |
Undo workaround for unsupported vmsumudm on ppc
-rw-r--r-- | .gitlab-ci.yml | 4 | ||||
-rw-r--r-- | fat-ppc.c | 5 | ||||
-rw-r--r-- | fat-setup.h | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b206873e..ed15456f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -158,8 +158,8 @@ Debian.cross.x86: - ./.bootstrap - ./configure --disable-static --disable-documentation $EXTRA_CONFIGURE_FLAGS --build=$build --host=$host - make -j$(nproc) - - NETTLE_TEST_SEED=0 NETTLE_FAT_DISABLE_POWER9=1 make -j$(nproc) check - - NETTLE_TEST_SEED=0 NETTLE_FAT_DISABLE_POWER9=1 make -j$(nproc) check-fat + - NETTLE_TEST_SEED=0 make -j$(nproc) check + - NETTLE_TEST_SEED=0 make -j$(nproc) check-fat tags: - shared - linux @@ -153,11 +153,6 @@ get_ppc_features (struct ppc_features *features) == (PPC_FEATURE_HAS_ALTIVEC | PPC_FEATURE_HAS_VSX)); #endif } - /* NETTLE_FAT_DISABLE_POWER9 can be set to disable code that fails - in qemu, due to - https://gitlab.com/qemu-project/qemu/-/issues/1156. */ - if (secure_getenv (ENV_DISABLE_POWER9)) - features->have_power9 = 0; } DECLARE_FAT_FUNC(_nettle_aes_encrypt, aes_crypt_internal_func) diff --git a/fat-setup.h b/fat-setup.h index eeec629e..f9c35451 100644 --- a/fat-setup.h +++ b/fat-setup.h @@ -92,7 +92,6 @@ #define ENV_VERBOSE "NETTLE_FAT_VERBOSE" #define ENV_OVERRIDE "NETTLE_FAT_OVERRIDE" -#define ENV_DISABLE_POWER9 "NETTLE_FAT_DISABLE_POWER9" struct chacha_ctx; struct salsa20_ctx; |