From 03975ac51a58b382f4949c1659187b88cc6bbb32 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 29 Jul 2020 12:21:42 -0400
Subject: [PATCH] Fix Android cross-compile due to missing flags on
 gcm_simd.cpp and gf2n_simd.cpp

---
 GNUmakefile-cross | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/GNUmakefile-cross b/GNUmakefile-cross
index 3bfb79f4..b4d47812 100755
--- a/GNUmakefile-cross
+++ b/GNUmakefile-cross
@@ -479,7 +479,7 @@ ifeq ($(DETECT_FEATURES),1)
     TPROG = TestPrograms/test_arm_pmull.cxx
     TOPT = $(PMULL_FLAG)
     HAVE_OPT = $(shell $(CXX) $(TCXXFLAGS) $(ACLE_FLAG) $(ZOPT) $(TOPT) $(TPROG) -o $(TOUT) 2>&1 | tr ' ' '\n' | wc -l)
-    ifeq ($(strip $(HAVE_OPT)),0)
+    ifneq ($(strip $(HAVE_OPT)),0)
       GCM_FLAG =
       GF2N_FLAG =
       CXXFLAGS += -DCRYPTOPP_ARM_PMULL_AVAILABLE=0
@@ -894,6 +894,10 @@ crc_simd.o : crc_simd.cpp
 gcm_simd.o : gcm_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(GCM_FLAG) -c) $<
 
+# Carryless multiply
+gf2n_simd.o : gf2n_simd.cpp
+	$(CXX) $(strip $(CXXFLAGS) $(GF2N_FLAG) -c) $<
+
 # SSSE3 available
 lea_simd.o : lea_simd.cpp
 	$(CXX) $(strip $(CXXFLAGS) $(LEA_FLAG) -c) $<