Ensure there's only one copy of OPENSSL_armcap_P in libcrypto.a

[openssl.git] / crypto / chacha / asm / chacha-armv4.pl

diff --git a/crypto/chacha/asm/chacha-armv4.pl b/crypto/chacha/asm/chacha-armv4.pl
index b5e21e4938e06f4f691e11c1c538e0318de271e3..3fdecf2d2832cfc103223f9bfe916cba41a2bf79 100755 (executable)
--- a/crypto/chacha/asm/chacha-armv4.pl
+++ b/crypto/chacha/asm/chacha-armv4.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
-# Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+# Copyright 2016-2020 The OpenSSL Project Authors. All Rights Reserved.
 #
-# Licensed under the OpenSSL license (the "License").  You may not use
+# Licensed under the Apache License 2.0 (the "License").  You may not use
 # this file except in compliance with the License.  You can obtain a copy
 # in the file LICENSE in the source distribution or at
 # https://www.openssl.org/source/license.html
@@ -15,7 +15,7 @@
 # ====================================================================
 #
 # December 2014
-# 
+#
 # ChaCha20 for ARMv4.
 #
 # Performance in cycles per byte out of large buffer.
@@ -34,9 +34,10 @@
 #      but then Snapdragon S4 and Cortex-A8 results get
 #      20-25% worse;
 
-$flavour = shift;
-if ($flavour=~/\w[\w\-]*\.\w+$/) { $output=$flavour; undef $flavour; }
-else { while (($output=shift) && ($output!~/\w[\w\-]*\.\w+$/)) {} }
+# $output is the last argument if it looks like a file (it has an extension)
+# $flavour is the first argument if it doesn't look like a file
+$output = $#ARGV >= 0 && $ARGV[$#ARGV] =~ m|\.\w+$| ? pop : undef;
+$flavour = $#ARGV >= 0 && $ARGV[0] !~ m|\.| ? shift : undef;
 
 if ($flavour && $flavour ne "void") {
     $0 =~ m/(.*[\/\\])[^\/\\]+$/; $dir=$1;
@@ -44,9 +45,10 @@ if ($flavour && $flavour ne "void") {
     ( $xlate="${dir}../../perlasm/arm-xlate.pl" and -f $xlate) or
     die "can't locate arm-xlate.pl";
 
-    open STDOUT,"| \"$^X\" $xlate $flavour $output";
+    open STDOUT,"| \"$^X\" $xlate $flavour $output"
+        or die "can't call $xlate: $!";
 } else {
-    open STDOUT,">$output";
+    $output and open STDOUT,">$output";
 }
 
 sub AUTOLOAD()         # thunk [simplified] x86-style perlasm
@@ -171,9 +173,10 @@ my @ret;
 $code.=<<___;
 #include "arm_arch.h"
 
-.text
-#if defined(__thumb2__)
+#if defined(__thumb2__) || defined(__clang__)
 .syntax        unified
+#endif
+#if defined(__thumb2__)
 .thumb
 #else
 .code  32
@@ -183,6 +186,8 @@ $code.=<<___;
 #define ldrhsb ldrbhs
 #endif
 
+.text
+
 .align 5
 .Lsigma:
 .long  0x61707865,0x3320646e,0x79622d32,0x6b206574     @ endian-neutral
@@ -190,7 +195,11 @@ $code.=<<___;
 .long  1,0,0,0
 #if __ARM_MAX_ARCH__>=7
 .LOPENSSL_armcap:
+# ifdef        _WIN32
+.word  OPENSSL_armcap_P
+# else
 .word   OPENSSL_armcap_P-.LChaCha20_ctr32
+# endif
 #else
 .word  -1
 #endif
@@ -217,8 +226,10 @@ ChaCha20_ctr32:
        cmp     r2,#192                 @ test len
        bls     .Lshort
        ldr     r4,[r14,#-32]
+# if !defined(_WIN32)
        ldr     r4,[r14,r4]
-# ifdef        __APPLE__
+# endif
+# if defined(__APPLE__) || defined(_WIN32)
        ldr     r4,[r4]
 # endif
        tst     r4,#ARMV7_NEON
@@ -720,7 +731,7 @@ ChaCha20_neon:
        vadd.i32        $d2,$d1,$t0             @ counter+2
        str             @t[3], [sp,#4*(16+15)]
        mov             @t[3],#10
-       add             @x[12],@x[12],#3        @ counter+3 
+       add             @x[12],@x[12],#3        @ counter+3
        b               .Loop_neon
 
 .align 4
@@ -1143,7 +1154,7 @@ $code.=<<___;
        add             sp,sp,#4*(16+3)
        ldmia           sp!,{r4-r11,pc}
 .size  ChaCha20_neon,.-ChaCha20_neon
-.comm  OPENSSL_armcap_P,4,4
+.extern        OPENSSL_armcap_P
 #endif
 ___
 }}}
@@ -1155,4 +1166,4 @@ foreach (split("\n",$code)) {
 
        print $_,"\n";
 }
-close STDOUT;
+close STDOUT or die "error closing STDOUT: $!";