Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer
authorDaiki Ueno <dueno@redhat.com>
Tue, 23 Jan 2018 13:29:34 +0100
changeset 14231 1668fafc1db4f739d5d15fbc94283858f842deb5
parent 14230 c3702e37a048e386f88e7c50a228d27669332725
child 14232 f8079be37bdd2c72355c5b96763e2502e602be36
push id2973
push userdueno@redhat.com
push dateTue, 23 Jan 2018 13:16:17 +0000
reviewersfkiefer
bugs1432455
Bug 1432455, Build Hacl_Poly1305_64.o on AArch64 even with make, r=fkiefer
lib/freebl/Makefile
--- a/lib/freebl/Makefile
+++ b/lib/freebl/Makefile
@@ -522,17 +522,22 @@ ifndef NSS_DISABLE_CHACHAPOLY
 
         ifneq (1,$(CC_IS_GCC))
             EXTRA_SRCS += chacha20.c
             VERIFIED_SRCS += Hacl_Chacha20.c
         else
             EXTRA_SRCS += chacha20_vec.c
         endif
     else
-        EXTRA_SRCS += poly1305.c
+        ifeq ($(CPU_ARCH),aarch64)
+            EXTRA_SRCS += Hacl_Poly1305_64.c
+        else
+            EXTRA_SRCS += poly1305.c
+        endif
+
         EXTRA_SRCS += chacha20.c
         VERIFIED_SRCS += Hacl_Chacha20.c
     endif # x86_64
 endif # NSS_DISABLE_CHACHAPOLY
 
 ifeq (,$(filter-out i386 x386 x86 x86_64 aarch64,$(CPU_ARCH)))
     # All intel architectures get the 64 bit version
     # With custom uint128 if necessary (faster than generic 32 bit version).