From 056426615135f82daafdba2af73399d592f945d2 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sat, 17 Nov 2018 15:28:30 -0500
Subject: [PATCH] Cleanup makefile

---
 GNUmakefile | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index b9a9d0b6..1f2f9d83 100755
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -35,7 +35,7 @@ INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL) -m 644
 
 # Solaris provides a non-Posix grep at /usr/bin
-ifneq ($(wildcard /usr/xpg4/bin),)
+ifneq ($(wildcard /usr/xpg4/bin/grep),)
   GREP ?= /usr/xpg4/bin/grep
 else
   GREP ?= grep
@@ -60,14 +60,17 @@ IS_ARMV8 := $(shell echo "$(HOSTX)" | $(GREP) -i -c -E 'aarch32|aarch64')
 
 IS_NEON := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null | $(GREP) -i -c -E 'armv7|armhf|arm7l|eabihf|armv8|aarch32|aarch64')
 
+# Attempt to determine platform
 SYSTEMX := $(shell $(CXX) $(CXXFLAGS) -dumpmachine 2>/dev/null)
+ifeq ($(SYSTEMX),)
+  SYSTEMX := $(shell uname -s 2>/dev/null)
+endif
+
 IS_LINUX := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Linux")
 IS_MINGW := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "MinGW")
 IS_CYGWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Cygwin")
 IS_DARWIN := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "Darwin")
 IS_NETBSD := $(shell echo "$(SYSTEMX)" | $(GREP) -i -c "NetBSD")
-
-UNAMEX := $(shell uname -s 2>&1)
 IS_AIX := $(shell echo "$(UNAMEX)" | $(GREP) -i -c "aix")
 IS_SUN := $(shell echo "$(UNAMEX)" | $(GREP) -i -c "SunOS")
 
@@ -97,15 +100,8 @@ ifeq ($(wildcard adhoc.cpp),)
 $(shell cp adhoc.cpp.proto adhoc.cpp)
 endif
 
-# Fixup AIX
-ifeq ($(IS_AIX),1)
-  BITNESS=$(shell getconf KERNEL_BITMODE)
-  ifeq ($(BITNESS),64)
-    IS_PPC64=1
-  else
-    IS_PPC32=1
-  endif
-endif
+# For feature tests
+BAD_RESULT="fatal|error|unknown|unrecognized|illegal|ignored|incorrect|not found|not exist|cannot find|not supported|not compatible|no such instruction|invalid mnemonic"
 
 # Hack to skip CPU feature tests for some recipes
 DETECT_FEATURES ?= 1
@@ -119,6 +115,17 @@ else ifeq ($(findstring distclean,$(MAKECMDGOALS)),trim)
   DETECT_FEATURES := 0
 endif
 
+# Fixup AIX
+ifeq ($(IS_AIX),1)
+  TPROG = TestPrograms/test_64bit.cxx
+  HAVE_OPT = $(shell $(CXX) $(CXXFLAGS) $(ZOPT) $(TPROG) -o $(TOUT) 2>&1 | $(GREP) -i -c -E $(BAD_RESULT))
+  ifeq ($(HAVE_OPT),0)
+    IS_PPC64=1
+  else
+    IS_PPC32=1
+  endif
+endif
+
 ###########################################################
 #####                General Variables                #####
 ###########################################################
@@ -194,9 +201,6 @@ endif # _WIN32_WINDOWS
 endif # _WIN32_WINNT
 endif # IS_MINGW
 
-# For feature tests
-BAD_RESULT="fatal|error|unknown|unrecognized|illegal|ignored|incorrect|not found|not exist|cannot find|not supported|not compatible|no such instruction|invalid mnemonic"
-
 ###########################################################
 #####               X86/X32/X64 Options               #####
 ###########################################################
@@ -703,22 +707,18 @@ ifeq ($(DETECT_FEATURES),1)
     POWER4_FLAG =
   endif
 
-  # Drop GCM to Power7 if Power8 is not available.
+  # Drop to Power7 if Power8 is not available.
   ifeq ($(POWER8_FLAG),)
     GCM_FLAG = $(POWER7_FLAG)
   endif
 
-  # Drop SIMON64 and SPECK64 to Power4 if Power7 not available
-  ifeq ($(SIMON64_FLAG)$(SPECK64_FLAG)$(ALTIVEC_FLAG),$(ALTIVEC_FLAG))
+  # Drop to Power4 if Power7 not available
+  ifeq ($(POWER7_FLAG),)
+    CHACHA_FLAG = $(ALTIVEC_FLAG)
     SIMON64_FLAG = $(ALTIVEC_FLAG)
     SPECK64_FLAG = $(ALTIVEC_FLAG)
   endif
 
-  # Drop ChaCha to Power4 if Power7 and Power8 not available
-  ifeq ($(CHACHA_FLAG)$(ALTIVEC_FLAG),$(ALTIVEC_FLAG))
-    CHACHA_FLAG = $(ALTIVEC_FLAG)
-  endif
-
   ifeq ($(ALTIVEC_FLAG),)
     CXXFLAGS += -DCRYPTOPP_DISABLE_ALTIVEC
   else ifeq ($(POWER9_FLAG)$(POWER8_FLAG)$(POWER7_FLAG),)