From: Maamoun TK <maamoun.tk@googlemail.com>
Date: Thu, 13 Oct 2022 09:46:50 +0000 (+0200)
Subject: Undo workaround for unsupported vmsumudm on ppc
X-Git-Tag: nettle_3.9_release_20230514~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ced0033a414080b67b5bbda60da1f2f50f0b493;p=thirdparty%2Fnettle.git

Undo workaround for unsupported vmsumudm on ppc
---

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;