From 5017d9c91c853a508f25123a277dd65d60edcf3b Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sun, 5 Apr 2020 09:21:35 -0400
Subject: [PATCH] Report Altivec on PowerPC

---
 simon.cpp |  8 --------
 speck.cpp | 20 ++------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/simon.cpp b/simon.cpp
index 3d951f97..89b8e727 100644
--- a/simon.cpp
+++ b/simon.cpp
@@ -255,10 +255,6 @@ std::string SIMON64::Base::AlgorithmProvider() const
     if (HasNEON())
         return "NEON";
 # endif
-# if (CRYPTOPP_POWER7_AVAILABLE)
-    if (HasPower7())
-        return "Power7";
-# endif
 # if (CRYPTOPP_ALTIVEC_AVAILABLE)
     if (HasAltivec())
         return "Altivec";
@@ -278,10 +274,6 @@ unsigned int SIMON64::Base::OptimalDataAlignment() const
     if (HasNEON())
         return 4;
 # endif
-# if (CRYPTOPP_POWER7_AVAILABLE)
-    if (HasPower7())
-        return 4;
-# endif
 # if (CRYPTOPP_ALTIVEC_AVAILABLE)
     if (HasAltivec())
         return 16;
diff --git a/speck.cpp b/speck.cpp
index d73e1719..2f911a58 100644
--- a/speck.cpp
+++ b/speck.cpp
@@ -227,10 +227,6 @@ std::string SPECK64::Base::AlgorithmProvider() const
     if (HasNEON())
         return "NEON";
 # endif
-# if (CRYPTOPP_POWER7_AVAILABLE)
-    if (HasPower7())
-        return "Power7";
-# endif
 # if (CRYPTOPP_ALTIVEC_AVAILABLE)
     if (HasAltivec())
         return "Altivec";
@@ -250,10 +246,6 @@ unsigned int SPECK64::Base::OptimalDataAlignment() const
     if (HasNEON())
         return 4;
 # endif
-# if (CRYPTOPP_POWER7_AVAILABLE)
-    if (HasPower7())
-        return 4;
-# endif
 # if (CRYPTOPP_ALTIVEC_AVAILABLE)
     if (HasAltivec())
         return 16;
@@ -503,11 +495,7 @@ size_t SPECK64::Enc::AdvancedProcessBlocks(const byte *inBlocks, const byte *xor
         return SPECK64_Enc_AdvancedProcessBlocks_NEON(m_rkeys, (size_t)m_rounds,
             inBlocks, xorBlocks, outBlocks, length, flags);
 #endif
-#if (CRYPTOPP_POWER7_AVAILABLE)
-    if (HasPower7())
-        return SPECK64_Enc_AdvancedProcessBlocks_POWER7(m_rkeys, (size_t)m_rounds,
-            inBlocks, xorBlocks, outBlocks, length, flags);
-#elif (CRYPTOPP_ALTIVEC_AVAILABLE)
+#if (CRYPTOPP_ALTIVEC_AVAILABLE)
     if (HasAltivec())
         return SPECK64_Enc_AdvancedProcessBlocks_ALTIVEC(m_rkeys, (size_t)m_rounds,
             inBlocks, xorBlocks, outBlocks, length, flags);
@@ -528,11 +516,7 @@ size_t SPECK64::Dec::AdvancedProcessBlocks(const byte *inBlocks, const byte *xor
         return SPECK64_Dec_AdvancedProcessBlocks_NEON(m_rkeys, (size_t)m_rounds,
             inBlocks, xorBlocks, outBlocks, length, flags);
 #endif
-#if (CRYPTOPP_POWER7_AVAILABLE)
-    if (HasPower7())
-        return SPECK64_Dec_AdvancedProcessBlocks_POWER7(m_rkeys, (size_t)m_rounds,
-            inBlocks, xorBlocks, outBlocks, length, flags);
-#elif (CRYPTOPP_ALTIVEC_AVAILABLE)
+#if (CRYPTOPP_ALTIVEC_AVAILABLE)
     if (HasAltivec())
         return SPECK64_Dec_AdvancedProcessBlocks_ALTIVEC(m_rkeys, (size_t)m_rounds,
             inBlocks, xorBlocks, outBlocks, length, flags);