diff options
| author | Shigeki Ohtsu <ohtsu@ohtsu.org> | 2018-11-08 15:45:29 +0900 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2019-01-22 13:33:37 -0800 |
| commit | 576d0c620683057b69fc1167b409fa60b03af513 (patch) | |
| tree | f0f1b21de618963fb0a797c7058e10ccff386de2 /deps/openssl/config/Makefile | |
| parent | 0d9a86c7cb3566b22becc656691282402f5026c0 (diff) | |
| download | android-node-v8-576d0c620683057b69fc1167b409fa60b03af513.tar.gz android-node-v8-576d0c620683057b69fc1167b409fa60b03af513.tar.bz2 android-node-v8-576d0c620683057b69fc1167b409fa60b03af513.zip | |
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.
PR-URL: https://github.com/nodejs/node/pull/25381
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org>
Diffstat (limited to 'deps/openssl/config/Makefile')
| -rw-r--r-- | deps/openssl/config/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/deps/openssl/config/Makefile b/deps/openssl/config/Makefile index a86f392ef2..300ab009d8 100644 --- a/deps/openssl/config/Makefile +++ b/deps/openssl/config/Makefile @@ -16,6 +16,8 @@ linux-ppc64 linux-ppc64le linux32-s390x linux64-s390x \ solaris-x86-gcc solaris64-x86_64-gcc VC-WIN64A VC-WIN32 CC = gcc +FAKE_GCC = ../config/fake_gcc.pl + CONFIGURE = ./Configure # no-comp: against CRIME attack # no-shared: openssl-cli needs static link @@ -45,12 +47,12 @@ all: $(ARCHS) replace $(ARCHS): # Remove openssl .gitignore to follow nodejs .gitignore if [ -e $(GITIGNORE) ]; then rm $(GITIGNORE); fi - if [ "$(findstring darwin, $@)" = "" ]; then \ - cd $(OPSSL_SRC); $(NO_WARN_ENV) ARC=$@ CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@; \ - else \ - cd $(OPSSL_SRC); $(NO_WARN_ENV) ARC=$@ CC=./fake_gcc.pl $(PERL) $(CONFIGURE) $(COPTS) $@; \ - fi + cd $(OPSSL_SRC); $(NO_WARN_ENV) CC=$(CC) $(PERL) $(CONFIGURE) $(COPTS) $@; $(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm $@ +# Confgure asm_avx2 and generate upto avx2 support + cd $(OPSSL_SRC); $(NO_WARN_ENV) CC=$(FAKE_GCC) $(PERL) $(CONFIGURE) \ + $(COPTS) $@; + $(PERL) -w -I$(OPSSL_SRC) $(GENERATE) asm_avx2 $@ # Confgure no-asm and generate no-asm sources cd $(OPSSL_SRC); $(NO_WARN_ENV) $(PERL) $(CONFIGURE) $(COPTS) \ no-asm $@; |