diff --git a/src/include.am b/src/include.am
index 44cec2030..de5ce74e5 100644
--- a/src/include.am
+++ b/src/include.am
@@ -281,13 +281,12 @@ endif
 if BUILD_POLY1305
 if BUILD_ARMASM
 src_libwolfssl_la_SOURCES += wolfcrypt/src/port/arm/armv8-poly1305.c
-else
+endif
 src_libwolfssl_la_SOURCES += wolfcrypt/src/poly1305.c
 if BUILD_INTELASM
 src_libwolfssl_la_SOURCES += wolfcrypt/src/poly1305_asm.S
 endif
 endif
-endif
 
 if BUILD_RC4
 src_libwolfssl_la_SOURCES += wolfcrypt/src/arc4.c
diff --git a/wolfcrypt/src/poly1305.c b/wolfcrypt/src/poly1305.c
index cdc1a6684..b3a4752b8 100644
--- a/wolfcrypt/src/poly1305.c
+++ b/wolfcrypt/src/poly1305.c
@@ -191,7 +191,7 @@ extern void poly1305_final_avx2(Poly1305* ctx, byte* mac);
 #endif
 
 #elif defined(POLY130564)
-
+#ifndef WOLFSSL_ARMASM
     static word64 U8TO64(const byte* p)
     {
         return
@@ -215,7 +215,7 @@ extern void poly1305_final_avx2(Poly1305* ctx, byte* mac);
         p[6] = (v >> 48) & 0xff;
         p[7] = (v >> 56) & 0xff;
     }
-
+#endif/* WOLFSSL_ARMASM */
 #else /* if not 64 bit then use 32 bit */
 
     static word32 U8TO32(const byte *p)