diff --git a/GNUmakefile b/GNUmakefile
index ae781361..b9e64ec1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -297,11 +297,10 @@ endif
 endif
 
 ifeq ($(IS_NEON),1)
-	NEON_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -mfpu=neon -dM -E - | grep -i -c -q __SSE4_2__  && echo "-mfpu=neon")
+	NEON_FLAG = $(shell echo | $(CXX) $(CXXFLAGS) -march=armv7-a -mfloat-abi=softfp -mfpu=neon -dM -E - | grep -i -c -q __ARM_NEON && echo "-march=armv7-a -mfloat-abi=softfp -mfpu=neon")
 	GCM_FLAG = $(NEON_FLAG)
 	ARIA_FLAG = $(NEON_FLAG)
 	BLAKE2_FLAG = $(NEON_FLAG)
-	NEON_FLAG = $(NEON_FLAG)
 endif
 
 ifeq ($(IS_ARMV8),1)
diff --git a/blake2-simd.cpp b/blake2-simd.cpp
index ebba9323..1d025356 100644
--- a/blake2-simd.cpp
+++ b/blake2-simd.cpp
@@ -1580,8 +1580,6 @@ void BLAKE2_Compress64_SSE4(const byte* input, BLAKE2_State<word64, true>& state
 #if CRYPTOPP_BOOL_ARM32 && CRYPTOPP_ARM_NEON_AVAILABLE
 void BLAKE2_Compress32_NEON(const byte* input, BLAKE2_State<word32, false>& state)
 {
-	XXX
-	
     #define BLAKE2S_LOAD_MSG_0_1(buf) \
     do { uint32x2_t t0, t1; \
     t0 = vzip_u32(vget_low_u32(m0), vget_high_u32(m0)).val[0]; \