summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaamoun TK <maamoun.tk@googlemail.com>2022-10-13 11:46:50 +0200
committerNiels Möller <nisse@lysator.liu.se>2022-10-13 21:41:35 +0200
commit0ced0033a414080b67b5bbda60da1f2f50f0b493 (patch)
tree8e21df5e798ac6d893c477f3d46fd23d150b455c
parentab7cebe08aafffa6ccf2c2a437a175834a293715 (diff)
downloadnettle-0ced0033a414080b67b5bbda60da1f2f50f0b493.tar.gz
Undo workaround for unsupported vmsumudm on ppc
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--fat-ppc.c5
-rw-r--r--fat-setup.h1
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
diff --git a/fat-ppc.c b/fat-ppc.c
index b0412e5a..7569e44d 100644
--- a/fat-ppc.c
+++ b/fat-ppc.c
@@ -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;