diff options
author | Tomas Mraz <tomas@openssl.org> | 2022-05-06 16:48:49 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2022-05-27 08:11:57 +0200 |
commit | 7b0b5c2a50cc2c16591604f691238b5ffdeb2dae (patch) | |
tree | c7e1ffe345d7b24714cbf29f6ac3044740039294 /crypto | |
parent | 28447123a57b8dc2679a56e7f1513beab7158228 (diff) |
Revert "Use .s extension for ia64 assembler"
This reverts commit 6009997abd2594d5a7c0606176f404190922b74d.
The .s extension is incorrect as the assembler files contain
preprocessor directives.
Fixes #18259
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18263)
(cherry picked from commit debd9210061206be1b5b6e957033c1b85ac540e1)
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/chacha/build.info | 4 | ||||
-rw-r--r-- | crypto/poly1305/asm/poly1305-ia64.S (renamed from crypto/poly1305/asm/poly1305-ia64.s) | 0 | ||||
-rw-r--r-- | crypto/poly1305/build.info | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info index b156b41f81..e2984d7d40 100644 --- a/crypto/chacha/build.info +++ b/crypto/chacha/build.info @@ -5,7 +5,7 @@ IF[{- !$disabled{asm} -}] $CHACHAASM_x86=chacha-x86.S $CHACHAASM_x86_64=chacha-x86_64.s - $CHACHAASM_ia64=chacha-ia64.s + $CHACHAASM_ia64=chacha-ia64.S $CHACHAASM_s390x=chacha-s390x.S @@ -36,4 +36,4 @@ INCLUDE[chacha-armv8.o]=.. INCLUDE[chacha-s390x.o]=.. GENERATE[chacha-c64xplus.S]=asm/chacha-c64xplus.pl GENERATE[chacha-s390x.S]=asm/chacha-s390x.pl -GENERATE[chacha-ia64.s]=asm/chacha-ia64.pl +GENERATE[chacha-ia64.S]=asm/chacha-ia64.pl diff --git a/crypto/poly1305/asm/poly1305-ia64.s b/crypto/poly1305/asm/poly1305-ia64.S index 54d6454f03..54d6454f03 100644 --- a/crypto/poly1305/asm/poly1305-ia64.s +++ b/crypto/poly1305/asm/poly1305-ia64.S diff --git a/crypto/poly1305/build.info b/crypto/poly1305/build.info index 11d89f40cf..4db401d8b2 100644 --- a/crypto/poly1305/build.info +++ b/crypto/poly1305/build.info @@ -5,7 +5,7 @@ IF[{- !$disabled{asm} -}] $POLY1305ASM_x86=poly1305-x86.S $POLY1305ASM_x86_64=poly1305-x86_64.s - $POLY1305ASM_ia64=asm/poly1305-ia64.s + $POLY1305ASM_ia64=asm/poly1305-ia64.S $POLY1305ASM_sparcv9=poly1305-sparcv9.S |