Configure: disable new trace api by default

[openssl.git] / crypto / s390xcpuid.pl

diff --git a/crypto/s390xcpuid.pl b/crypto/s390xcpuid.pl
index ec700a47d98e9277b1a00d93e42d99644d4b030b..790fbc2c80579a19303396d2661a0f496ce8d477 100755 (executable)
--- a/crypto/s390xcpuid.pl
+++ b/crypto/s390xcpuid.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/env perl
 # Copyright 2009-2018 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
@@ -38,7 +38,26 @@ OPENSSL_s390x_facilities:
        stg     %r0,S390X_STFLE+8(%r4)  # wipe capability vectors
        stg     %r0,S390X_STFLE+16(%r4)
        stg     %r0,S390X_STFLE+24(%r4)
-       stg     %r0,S390X_KIMD(%r4)
+
+       .long   0xb2b04000              # stfle 0(%r4)
+       brc     8,.Ldone
+       lghi    %r0,1
+       .long   0xb2b04000              # stfle 0(%r4)
+       brc     8,.Ldone
+       lghi    %r0,2
+       .long   0xb2b04000              # stfle 0(%r4)
+.Ldone:
+       br      $ra
+.size  OPENSSL_s390x_facilities,.-OPENSSL_s390x_facilities
+
+.globl OPENSSL_s390x_functions
+.type  OPENSSL_s390x_functions,\@function
+.align 16
+OPENSSL_s390x_functions:
+       lghi    %r0,0
+       larl    %r4,OPENSSL_s390xcap_P
+
+       stg     %r0,S390X_KIMD(%r4)     # wipe capability vectors
        stg     %r0,S390X_KIMD+8(%r4)
        stg     %r0,S390X_KLMD(%r4)
        stg     %r0,S390X_KLMD+8(%r4)
@@ -59,14 +78,6 @@ OPENSSL_s390x_facilities:
        stg     %r0,S390X_KMA(%r4)
        stg     %r0,S390X_KMA+8(%r4)
 
-       .long   0xb2b04000              # stfle 0(%r4)
-       brc     8,.Ldone
-       lghi    %r0,1
-       .long   0xb2b04000              # stfle 0(%r4)
-       brc     8,.Ldone
-       lghi    %r0,2
-       .long   0xb2b04000              # stfle 0(%r4)
-.Ldone:
        lmg     %r2,%r3,S390X_STFLE(%r4)
        tmhl    %r2,0x4000              # check for message-security-assist
        jz      .Lret
@@ -123,7 +134,7 @@ OPENSSL_s390x_facilities:
 
 .Lret:
        br      $ra
-.size  OPENSSL_s390x_facilities,.-OPENSSL_s390x_facilities
+.size  OPENSSL_s390x_functions,.-OPENSSL_s390x_functions
 
 .globl OPENSSL_rdtsc
 .type  OPENSSL_rdtsc,\@function