Skip to content

Commit 8248d22

Browse files
shigekirvagg
authored andcommitted
deps: add s390 asm rules for OpenSSL-1.1.0
This is a floating patch against OpenSSL-1.1.0 to generate asm files with Makefile rules and it is to be submitted to the upstream. Fixes: #4270 PR-URL: #19794 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Rod Vagg <rod@vagg.org> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> PR-URL: #24523 Reviewed-By: Shigeki Ohtsu <ohtsu@ohtsu.org> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
1 parent 65d03f0 commit 8248d22

File tree

6 files changed

+18
-0
lines changed

6 files changed

+18
-0
lines changed

deps/openssl/openssl/crypto/aes/build.info

+3
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@ INCLUDE[aes-armv4.o]=..
4545
GENERATE[bsaes-armv7.S]=asm/bsaes-armv7.pl $(PERLASM_SCHEME)
4646
INCLUDE[bsaes-armv7.o]=..
4747

48+
GENERATE[aes-s390x.S]=asm/aes-s390x.pl $(PERLASM_SCHEME)
49+
INCLUDE[aes-s390x.o]=..
50+
4851
BEGINRAW[Makefile]
4952
##### AES assembler implementations
5053

deps/openssl/openssl/crypto/chacha/build.info

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ GENERATE[chacha-armv4.S]=asm/chacha-armv4.pl $(PERLASM_SCHEME)
88
INCLUDE[chacha-armv4.o]=..
99
GENERATE[chacha-armv8.S]=asm/chacha-armv8.pl $(PERLASM_SCHEME)
1010
INCLUDE[chacha-armv8.o]=..
11+
GENERATE[chacha-s390x.S]=asm/chacha-s390x.pl $(PERLASM_SCHEME)
12+
INCLUDE[chacha-s390x.o]=..
1113

1214
BEGINRAW[Makefile(unix)]
1315
##### CHACHA assembler implementations

deps/openssl/openssl/crypto/modes/build.info

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ GENERATE[ghash-armv4.S]=asm/ghash-armv4.pl $(PERLASM_SCHEME)
1919
INCLUDE[ghash-armv4.o]=..
2020
GENERATE[ghashv8-armx.S]=asm/ghashv8-armx.pl $(PERLASM_SCHEME)
2121
INCLUDE[ghashv8-armx.o]=..
22+
GENERATE[ghash-s390x.S]=asm/ghash-s390x.pl $(PERLASM_SCHEME)
23+
INCLUDE[ghash-s390x.o]=..
2224

2325
BEGINRAW[Makefile]
2426
# GNU make "catch all"

deps/openssl/openssl/crypto/poly1305/build.info

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ INCLUDE[poly1305-armv4.o]=..
1313
GENERATE[poly1305-armv8.S]=asm/poly1305-armv8.pl $(PERLASM_SCHEME)
1414
INCLUDE[poly1305-armv8.o]=..
1515
GENERATE[poly1305-mips.S]=asm/poly1305-mips.pl $(PERLASM_SCHEME)
16+
GENERATE[poly1305-s390x.S]=asm/poly1305-s390x.pl $(PERLASM_SCHEME)
17+
INCLUDE[poly1305-s390x.o]=..
1618

1719
BEGINRAW[Makefile(unix)]
1820
{- $builddir -}/poly1305-%.S: {- $sourcedir -}/asm/poly1305-%.pl

deps/openssl/openssl/crypto/rc4/build.info

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ GENERATE[rc4-md5-x86_64.s]=asm/rc4-md5-x86_64.pl $(PERLASM_SCHEME)
1010

1111
GENERATE[rc4-parisc.s]=asm/rc4-parisc.pl $(PERLASM_SCHEME)
1212

13+
GENERATE[rc4-s390x.s]=asm/rc4-s390x.pl $(PERLASM_SCHEME)
14+
1315
BEGINRAW[makefile(windows)]
1416
{- $builddir -}\rc4-ia64.asm: {- $sourcedir -}\asm\rc4-ia64.pl
1517
$(PERL) {- $sourcedir -}\asm\rc4-ia64.pl $@.S

deps/openssl/openssl/crypto/sha/build.info

+7
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,13 @@ INCLUDE[sha256-armv8.o]=..
5656
GENERATE[sha512-armv8.S]=asm/sha512-armv8.pl $(PERLASM_SCHEME)
5757
INCLUDE[sha512-armv8.o]=..
5858

59+
GENERATE[sha1-s390x.S]=asm/sha1-s390x.pl $(PERLASM_SCHEME)
60+
INCLUDE[sha1-s390x.o]=..
61+
GENERATE[sha256-s390x.S]=asm/sha512-s390x.pl $(PERLASM_SCHEME)
62+
INCLUDE[sha256-s390x.o]=..
63+
GENERATE[sha512-s390x.S]=asm/sha512-s390x.pl $(PERLASM_SCHEME)
64+
INCLUDE[sha512-s390x.o]=..
65+
5966
BEGINRAW[Makefile(unix)]
6067
##### SHA assembler implementations
6168

0 commit comments

Comments
 (0)