1 files changed, 12 insertions, 5 deletions

diff --git a/src/lib/libcrypto/s390xcpuid.S b/src/lib/libcrypto/s390xcpuid.S
index b053c6a281..06815347e6 100644
--- a/src/lib/libcrypto/s390xcpuid.S
+++ b/src/lib/libcrypto/s390xcpuid.S
@@ -5,10 +5,14 @@
 .align  16
 OPENSSL_s390x_facilities:
         lghi    %r0,0
-        .long   0xb2b0f010      # stfle 16(%r15)
-        lg      %r2,16(%r15)
-        larl    %r1,OPENSSL_s390xcap_P
-        stg     %r2,0(%r1)
+        larl    %r2,OPENSSL_s390xcap_P
+        stg     %r0,8(%r2)
+        .long   0xb2b02000      # stfle 0(%r2)
+        brc     8,.Ldone
+        lghi    %r0,1
+        .long   0xb2b02000      # stfle 0(%r2)
+.Ldone:
+        lg      %r2,0(%r2)
         br      %r14
 .size   OPENSSL_s390x_facilities,.-OPENSSL_s390x_facilities
 
@@ -58,6 +62,9 @@ OPENSSL_wipe_cpu:
 .type   OPENSSL_cleanse,@function
 .align  16
 OPENSSL_cleanse:
+#if !defined(__s390x__) && !defined(__s390x)
+        llgfr   %r3,%r3
+#endif
         lghi    %r4,15
         lghi    %r0,0
         clgr    %r3,%r4
@@ -89,4 +96,4 @@ OPENSSL_cleanse:
 .section        .init
         brasl   %r14,OPENSSL_cpuid_setup
 
-.comm   OPENSSL_s390xcap_P,8,8
+.comm   OPENSSL_s390xcap_P,16,8