Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(588)

Side by Side Diff: lib/freebl/Makefile

Issue 277040044: Bug 917571 - Add ChaCha20+Poly1305 cipher (Closed)
Patch Set: Created 8 years, 4 months ago
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments. Please Sign in to add in-line comments.
Jump to:
View unified diff | Download patch
OLDNEW
1 #! gmake 1 #! gmake
2 # 2 #
3 # This Source Code Form is subject to the terms of the Mozilla Public 3 # This Source Code Form is subject to the terms of the Mozilla Public
4 # License, v. 2.0. If a copy of the MPL was not distributed with this 4 # License, v. 2.0. If a copy of the MPL was not distributed with this
5 # file, You can obtain one at http://mozilla.org/MPL/2.0/. 5 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
6 6
7 ####################################################################### 7 #######################################################################
8 # (1) Include initial platform-independent assignments (MANDATORY). # 8 # (1) Include initial platform-independent assignments (MANDATORY). #
9 ####################################################################### 9 #######################################################################
10 10
(...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 472
473 ifndef NSS_DISABLE_ECC 473 ifndef NSS_DISABLE_ECC
474 ifdef ECL_USE_FP 474 ifdef ECL_USE_FP
475 #enable floating point ECC code· 475 #enable floating point ECC code·
476 DEFINES += -DECL_USE_FP 476 DEFINES += -DECL_USE_FP
477 ECL_SRCS += ecp_fp160.c ecp_fp192.c ecp_fp224.c ecp_fp.c 477 ECL_SRCS += ecp_fp160.c ecp_fp192.c ecp_fp224.c ecp_fp.c
478 ECL_HDRS += ecp_fp.h 478 ECL_HDRS += ecp_fp.h
479 endif 479 endif
480 endif 480 endif
481 481
482 # poly1305-donna-x64-sse2-incremental-source.c requires __int128 support
483 # in GCC 4.6.0.
484 ifeq ($(CC_NAME),clang)
485 have_int128_support = 1
486 else
487 ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(CC_VERSION)).$(word 2,$(CC_VERSI ON))))
488 have_int128_support = 1
489 endif
490 ifeq (,$(filter 0 1 2 3 4,$(word 1,$(CC_VERSION))))
mt 2015/12/05 09:25:22 This test isn't going to work for MSVC (i.e., it w
491 have_int128_support = 1
492 endif
493 ifndef have_int128_support
494 have_int128_support = 0
495 endif
496 endif
497
498 ifeq ($(CPU_ARCH),x86_64)
499 ifeq ($(have_int128_support),1)
500 EXTRA_SRCS += poly1305/poly1305-donna-x64-sse2-incremental-source.c
501 else
502 EXTRA_SRCS += poly1305/poly1305.c
503 endif
504 EXTRA_SRCS += chacha20/chacha20_vec.c
505 else
506 EXTRA_SRCS += poly1305/poly1305.c
507 EXTRA_SRCS += chacha20/chacha20.c
508 endif # x86_64
509
482 ####################################################################### 510 #######################################################################
483 # (5) Execute "global" rules. (OPTIONAL) # 511 # (5) Execute "global" rules. (OPTIONAL) #
484 ####################################################################### 512 #######################################################################
485 513
486 include $(CORE_DEPTH)/coreconf/rules.mk 514 include $(CORE_DEPTH)/coreconf/rules.mk
487 515
488 ####################################################################### 516 #######################################################################
489 # (6) Execute "component" rules. (OPTIONAL) # 517 # (6) Execute "component" rules. (OPTIONAL) #
490 ####################################################################### 518 #######################################################################
491 519
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as 699 $(OBJDIR)/$(PROG_PREFIX)intel-gcm$(OBJ_SUFFIX): ASFLAGS += -no-integrated-as
672 endif 700 endif
673 endif 701 endif
674 702
675 ifdef INTEL_GCM_CLANG_CL 703 ifdef INTEL_GCM_CLANG_CL
676 # 704 #
677 # clang-cl needs -mssse3 705 # clang-cl needs -mssse3
678 # 706 #
679 $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(OBJ_SUFFIX): CFLAGS += -mssse3 707 $(OBJDIR)/$(PROG_PREFIX)intel-gcm-wrap$(OBJ_SUFFIX): CFLAGS += -mssse3
680 endif 708 endif
OLDNEW

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b