-
Notifications
You must be signed in to change notification settings - Fork 30.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
deps: add only avx2 configs for OpenSSL-1.1.1
OpenSSL-1.1.1 has new support of AVX-512 but AVX-2 asm files still need to be generated for the older assembler support to keep backward compatibilities. Backport-PR-URL: #26270 PR-URL: #25381 Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com> Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
- Loading branch information
1 parent
f5369da
commit 639b1d2
Showing
6 changed files
with
153 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,12 @@ | ||
| #! /usr/bin/env perl | ||
| use 5.10.0; | ||
| use strict; | ||
| my $arch = $ENV{ARC}; | ||
| my $args = join(' ', @ARGV); | ||
|
|
||
| my $ret; | ||
| if ($arch =~ /^darwin/) { | ||
| $ret = "Apple LLVM version 10.0.0 (clang-1000.11.45.2)\n"; | ||
| if ($args eq '-Wa,-v -c -o /dev/null -x assembler /dev/null') { | ||
| $ret = "GNU assembler version 2.23.52.0.1 (x86_64-redhat-linux) using BFD version version 2.23.52.0.1-30.el7_1.2 20130226\n"; | ||
| } else { | ||
| $ret = `gcc -Wa,-v -c -o /dev/null -x assembler /dev/null 2>&1`; | ||
| $ret = `gcc $args`; | ||
| } | ||
| print STDOUT $ret; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| { | ||
| 'conditions': [ | ||
| ['target_arch=="ppc" and OS=="aix"', { | ||
| 'includes': ['config/archs/aix-gcc/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ppc" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-ppc/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ppc64" and OS=="aix"', { | ||
| 'includes': ['config/archs/aix64-gcc/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { | ||
| 'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ppc64" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-ppc64/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="s390" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux32-s390x/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="s390x" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux64-s390x/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="arm" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-armv4/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="arm64" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-aarch64/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ia32" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-elf/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ia32" and OS=="mac"', { | ||
| 'includes': ['config/archs/darwin-i386-cc/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ia32" and OS=="solaris"', { | ||
| 'includes': ['config/archs/solaris-x86-gcc/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ia32" and OS=="win"', { | ||
| 'includes': ['config/archs/VC-WIN32/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="ia32"', { | ||
| # noasm linux-elf for other ia32 platforms | ||
| 'includes': ['config/archs/linux-elf/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="freebsd"', { | ||
| 'includes': ['config/archs/BSD-x86_64/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="mac"', { | ||
| 'includes': ['config/archs/darwin64-x86_64-cc/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="solaris"', { | ||
| 'includes': ['config/archs/solaris64-x86_64-gcc/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="win"', { | ||
| 'includes': ['config/archs/VC-WIN64A/asm_avx2/openssl-cl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi'], | ||
| }, { | ||
| # Other architectures don't use assembly | ||
| 'includes': ['config/archs/linux-x86_64/asm_avx2/openssl-cl.gypi'], | ||
| }], | ||
| ], | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| { | ||
| 'conditions': [ | ||
| ['target_arch=="ppc" and OS=="aix"', { | ||
| 'includes': ['config/archs/aix-gcc/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="ppc" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-ppc/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="ppc64" and OS=="aix"', { | ||
| 'includes': ['config/archs/aix64-gcc/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="ppc64" and OS=="linux" and node_byteorder =="little"', { | ||
| 'includes': ['config/archs/linux-ppc64le/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="ppc64" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-ppc64/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="s390" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux32-s390x/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="s390x" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux64-s390x/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="arm" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-armv4/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="arm64" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-aarch64/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="ia32" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-elf/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="ia32" and OS=="mac"', { | ||
| 'includes': ['config/archs/darwin-i386-cc/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="ia32" and OS=="solaris"', { | ||
| 'includes': ['config/archs/solaris-x86-gcc/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="ia32" and OS=="win"', { | ||
| 'includes': ['config/archs/VC-WIN32/asm_avx2/openssl.gypi'], | ||
| 'rules': [ | ||
| { | ||
| 'rule_name': 'Assemble', | ||
| 'extension': 'asm', | ||
| 'inputs': [], | ||
| 'outputs': [ | ||
| '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', | ||
| ], | ||
| 'action': [ | ||
| 'nasm.exe', | ||
| '-f win32', | ||
| '-o', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', | ||
| '<(RULE_INPUT_PATH)', | ||
| ], | ||
| } | ||
| ], | ||
| }, 'target_arch=="ia32"', { | ||
| 'includes': ['config/archs/linux-elf/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="freebsd"', { | ||
| 'includes': ['config/archs/BSD-x86_64/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="mac"', { | ||
| 'includes': ['config/archs/darwin64-x86_64-cc/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="solaris"', { | ||
| 'includes': ['config/archs/solaris64-x86_64-gcc/asm_avx2/openssl.gypi'], | ||
| }, 'target_arch=="x64" and OS=="win"', { | ||
| 'includes': ['config/archs/VC-WIN64A/asm_avx2/openssl.gypi'], | ||
| 'rules': [ | ||
| { | ||
| 'rule_name': 'Assemble', | ||
| 'extension': 'asm', | ||
| 'inputs': [], | ||
| 'outputs': [ | ||
| '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', | ||
| ], | ||
| 'action': [ | ||
| 'nasm.exe', | ||
| '-f win64', | ||
| '-DNEAR', | ||
| '-Ox', | ||
| '-g', | ||
| '-o', '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', | ||
| '<(RULE_INPUT_PATH)', | ||
| ], | ||
| } | ||
| ], | ||
| }, 'target_arch=="x64" and OS=="linux"', { | ||
| 'includes': ['config/archs/linux-x86_64/asm_avx2/openssl.gypi'], | ||
| }, { | ||
| # Other architectures don't use assembly | ||
| 'includes': ['config/archs/linux-x86_64/asm_avx2/openssl.gypi'], | ||
| }], | ||
| ], | ||
| } |