Attachment #889782 for bug #928401

View | Details | Raw Unified | Return to bug 928401
Collapse All | Expand All




            HAVE_INT128_SUPPORT = 1
            DEFINES += -DHAVE_INT128_SUPPORT
    else ifeq (1,$(CC_IS_GCC))
        ifeq ($(CPU_ARCH),x86_64)
            SUPPORTS_VALE_CURVE25519 = 1
        endif
        ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
            HAVE_INT128_SUPPORT = 1
            DEFINES += -DHAVE_INT128_SUPPORT

    DEFINES += -DKRML_VERIFIED_UINT128
endif

ifdef SUPPORTS_VALE_CURVE25519
    VERIFIED_SRCS += Hacl_Curve25519_64.c
    DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
endif

ifndef NSS_DISABLE_CHACHAPOLY
    ifeq ($(CPU_ARCH),x86_64)
        ifndef NSS_DISABLE_AVX2




          }],
        ],
      }],
      [ 'supports_vale_curve25519==1', {
        'defines': [
          # The Makefile does version-tests on GCC, but we're not doing that here.
          'HACL_CAN_COMPILE_INLINE_ASM',
        ],
      }],
      [ 'OS=="linux" or OS=="android"', {
        'conditions': [
          [ 'target_arch=="x64"', {

  'variables': {
    'module': 'nss',
    'conditions': [
      [ 'target_arch=="x64" and cc_is_gcc==1', {
        'supports_vale_curve25519%': 1,
      }, {
        'supports_vale_curve25519%': 0,
      }],
      [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
        'have_int128_support%': 1,
      }, {

Lines 154-164 Link Here

(-)a/lib/freebl/freebl_base.gypi (-5 lines)
154	'ecl/curve25519_32.c',	154	'ecl/curve25519_32.c',
155	],	155	],
156	}],	156	}],
157	['supports_vale_curve25519==1', {
158	'sources': [
159	'verified/Hacl_Curve25519_64.c',
160	],
161	}],
162	['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {	157	['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
163	'sources': [	158	'sources': [
164	# Gyp does not support per-file cflags, so working around like this.	159	# Gyp does not support per-file cflags, so working around like this.

Return to bug 928401

Lines 568-576 Link Here

(-)a/lib/freebl/Makefile (-8 lines)
568	HAVE_INT128_SUPPORT = 1	568	HAVE_INT128_SUPPORT = 1
569	DEFINES += -DHAVE_INT128_SUPPORT	569	DEFINES += -DHAVE_INT128_SUPPORT
570	else ifeq (1,$(CC_IS_GCC))	570	else ifeq (1,$(CC_IS_GCC))
571	ifeq ($(CPU_ARCH),x86_64)
572	SUPPORTS_VALE_CURVE25519 = 1
573	endif
574	ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))	571	ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
575	HAVE_INT128_SUPPORT = 1	572	HAVE_INT128_SUPPORT = 1
576	DEFINES += -DHAVE_INT128_SUPPORT	573	DEFINES += -DHAVE_INT128_SUPPORT
Lines 595-605 Link Here
595	DEFINES += -DKRML_VERIFIED_UINT128	592	DEFINES += -DKRML_VERIFIED_UINT128
596	endif	593	endif
597		594
598	ifdef SUPPORTS_VALE_CURVE25519
599	VERIFIED_SRCS += Hacl_Curve25519_64.c
600	DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
601	endif
602
603	ifndef NSS_DISABLE_CHACHAPOLY	595	ifndef NSS_DISABLE_CHACHAPOLY
604	ifeq ($(CPU_ARCH),x86_64)	596	ifeq ($(CPU_ARCH),x86_64)
605	ifndef NSS_DISABLE_AVX2	597	ifndef NSS_DISABLE_AVX2

Lines 866-877 Link Here

(-)a/lib/freebl/freebl.gyp (-11 lines)
866	}],	866	}],
867	],	867	],
868	}],	868	}],
869	[ 'supports_vale_curve25519==1', {
870	'defines': [
871	# The Makefile does version-tests on GCC, but we're not doing that here.
872	'HACL_CAN_COMPILE_INLINE_ASM',
873	],
874	}],
875	[ 'OS=="linux" or OS=="android"', {	869	[ 'OS=="linux" or OS=="android"', {
876	'conditions': [	870	'conditions': [
877	[ 'target_arch=="x64"', {	871	[ 'target_arch=="x64"', {
Lines 934-944 Link Here
934	'variables': {	928	'variables': {
935	'module': 'nss',	929	'module': 'nss',
936	'conditions': [	930	'conditions': [
937	[ 'target_arch=="x64" and cc_is_gcc==1', {
938	'supports_vale_curve25519%': 1,
939	}, {
940	'supports_vale_curve25519%': 0,
941	}],
942	[ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {	931	[ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
943	'have_int128_support%': 1,	932	'have_int128_support%': 1,
944	}, {	933	}, {