From: Tomas Mraz <tomas@openssl.org>
Date: Fri, 6 May 2022 14:48:49 +0000 (+0200)
Subject: Revert "Use .s extension for ia64 assembler"
X-Git-Tag: openssl-3.2.0-alpha1~2607
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=debd9210061206be1b5b6e957033c1b85ac540e1;p=thirdparty%2Fopenssl.git

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)
---

diff --git a/crypto/chacha/build.info b/crypto/chacha/build.info
index 3469bf606d7..2fc807b0658 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
 
@@ -39,4 +39,4 @@ INCLUDE[chacha-armv8-sve.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
similarity index 100%
rename from crypto/poly1305/asm/poly1305-ia64.s
rename to crypto/poly1305/asm/poly1305-ia64.S
diff --git a/crypto/poly1305/build.info b/crypto/poly1305/build.info
index 11d89f40cf3..4db401d8b28 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