From 3f3eeaffc0d0eb83199669d69126dcd1fb5a329c Mon Sep 17 00:00:00 2001

From: Alexey Gladkov <legion@altlinux.org>

Date: Fri, 16 Jun 2023 11:19:26 +0300

Subject: FEDORA: Fix: add condition for architecture specific assebly feature

Upstream bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1836781

Additional bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1836925

Signed-off-by: Frantisek Krenzelok <krenzelok.frantisek@gmail.com>

---

 lib/freebl/Makefile         |  1 -

 lib/freebl/freebl.gyp       | 11 -----------

 lib/freebl/freebl_base.gypi |  5 -----

 3 files changed, 17 deletions(-)

diff --git a/lib/freebl/Makefile b/lib/freebl/Makefile

index 74e8e654..89957521 100644

--- a/lib/freebl/Makefile

+++ b/lib/freebl/Makefile

@@ -568,7 +568,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)

             HAVE_INT128_SUPPORT = 1

             DEFINES += -DHAVE_INT128_SUPPORT

     else ifeq (1,$(CC_IS_GCC))

-        SUPPORTS_VALE_CURVE25519 = 1

         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

diff --git a/lib/freebl/freebl.gyp b/lib/freebl/freebl.gyp

index 65f9a801..23940ef7 100644

--- a/lib/freebl/freebl.gyp

+++ b/lib/freebl/freebl.gyp

@@ -866,12 +866,6 @@

           }],

         ],

       }],

-      [ '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"', {

@@ -934,11 +928,6 @@

   '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,

       }, {

diff --git a/lib/freebl/freebl_base.gypi b/lib/freebl/freebl_base.gypi

index d198c442..34b6b3c8 100644

--- a/lib/freebl/freebl_base.gypi

+++ b/lib/freebl/freebl_base.gypi

@@ -151,11 +151,6 @@

         'ecl/curve25519_32.c',

       ],

     }],

-    ['supports_vale_curve25519==1', {

-      'sources': [

-        'verified/Hacl_Curve25519_64.c',

-      ],

-    }],

     ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {

       'sources': [

         # Gyp does not support per-file cflags, so working around like this.

-- 

2.25.4