external/nss/nss-win-arm64.patch

   1 --- a/a/nspr/configure
   2 +++ a/a/nspr/configure
   3 @@ -821,6 +821,7 @@
   4          linux*)       OS_ARCH=Linux ;;
   5          solaris*)     OS_ARCH=SunOS OS_RELEASE=5 ;;
   6          mingw*)       OS_ARCH=WINNT CPU_ARCH=x86 ;;
   7 +        cygwin*)      OS_ARCH=WINNT ;;
   8          darwin*)      OS_ARCH=Darwin ;;
   9          riscos*)      OS_ARCH=RISCOS ;;
  10      esac
  11 --- a/a/nss/lib/freebl/Makefile.orig
  12 +++ a/a/nss/lib/freebl/Makefile
  13 @@ -119,8 +119,23 @@
  14  endif
  15  endif
  16  ifeq ($(CPU_ARCH),aarch64)
  17 -    DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
  18 -    EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
  19 +    ifdef CC_IS_CLANG
  20 +        DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
  21 +        EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
  22 +    else ifeq (1,$(CC_IS_GCC))
  23 +        # GCC versions older than 4.9 don't support ARM AES. The check
  24 +        # is done in two parts, first allows "major.minor" == "4.9",
  25 +        # and then rejects any major versions prior to 5. Note that
  26 +        # there has been no GCC 4.10, as it is renamed to GCC 5.
  27 +        ifneq (,$(filter 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
  28 +            DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
  29 +            EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
  30 +        endif
  31 +        ifeq (,$(filter 0 1 2 3 4,$(word 1,$(GCC_VERSION))))
  32 +            DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
  33 +            EXTRA_SRCS += aes-armv8.c gcm-aarch64.c sha256-armv8.c
  34 +        endif
  35 +    endif
  36  endif
  37  ifeq ($(CPU_ARCH),arm)
  38  ifndef NSS_DISABLE_ARM32_NEON
  39 @@ -133,7 +146,10 @@
  40          DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
  41          EXTRA_SRCS += aes-armv8.c sha256-armv8.c
  42      else ifeq (1,$(CC_IS_GCC))
  43 -        # Old compiler doesn't support ARM AES.
  44 +        # GCC versions older than 4.9 don't support ARM AES. The check
  45 +        # is done in two parts, first allows "major.minor" == "4.9",
  46 +        # and then rejects any major versions prior to 5. Note that
  47 +        # there has been no GCC 4.10, as it is renamed to GCC 5.
  48          ifneq (,$(filter 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
  49              DEFINES += -DUSE_HW_AES -DUSE_HW_SHA2
  50              EXTRA_SRCS += aes-armv8.c sha256-armv8.c
  51 @@ -198,6 +200,7 @@
  52      ifdef BUILD_OPT
  53         OPTIMIZER += -Ox  # maximum optimization for freebl
  54      endif
  55 +ifeq ($(CPU_ARCH),x86_64)
  56      ASFILES  = arcfour-amd64-masm.asm mpi_amd64_masm.asm mp_comba_amd64_masm.asm
  57      DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
  58      DEFINES += -DNSS_USE_COMBA
  59 @@ -215,6 +218,7 @@
  60  endif
  61  endif
  62  endif
  63 +endif
  64
  65  ifeq ($(OS_TARGET),IRIX)
  66  ifeq ($(USE_N32),1)