1 files changed, 42 insertions, 6 deletions

diff --git a/src/lib/libcrypto/ppccpuid.pl b/src/lib/libcrypto/ppccpuid.pl
index 369e1d0df9..4ba736a1d1 100755
--- a/src/lib/libcrypto/ppccpuid.pl
+++ b/src/lib/libcrypto/ppccpuid.pl
@@ -23,36 +23,67 @@ $code=<<___;
 .machine        "any"
 .text
 
-.globl  .OPENSSL_cpuid_setup
+.globl  .OPENSSL_ppc64_probe
 .align  4
-.OPENSSL_cpuid_setup:
+.OPENSSL_ppc64_probe:
+        fcfid   f1,f1
+        extrdi  r0,r0,32,0
         blr
+        .long   0
+        .byte   0,12,0x14,0,0,0,0,0
+
+.globl  .OPENSSL_altivec_probe
+.align  4
+.OPENSSL_altivec_probe:
+        .long   0x10000484      # vor   v0,v0,v0
+        blr
+        .long   0
+        .byte   0,12,0x14,0,0,0,0,0
 
 .globl  .OPENSSL_wipe_cpu
 .align  4
 .OPENSSL_wipe_cpu:
         xor     r0,r0,r0
+        fmr     f0,f31
+        fmr     f1,f31
+        fmr     f2,f31
         mr      r3,r1
+        fmr     f3,f31
         xor     r4,r4,r4
+        fmr     f4,f31
         xor     r5,r5,r5
+        fmr     f5,f31
         xor     r6,r6,r6
+        fmr     f6,f31
         xor     r7,r7,r7
+        fmr     f7,f31
         xor     r8,r8,r8
+        fmr     f8,f31
         xor     r9,r9,r9
+        fmr     f9,f31
         xor     r10,r10,r10
+        fmr     f10,f31
         xor     r11,r11,r11
+        fmr     f11,f31
         xor     r12,r12,r12
+        fmr     f12,f31
+        fmr     f13,f31
         blr
+        .long   0
+        .byte   0,12,0x14,0,0,0,0,0
 
 .globl  .OPENSSL_atomic_add
 .align  4
 .OPENSSL_atomic_add:
-Loop:   lwarx   r5,0,r3
+Ladd:   lwarx   r5,0,r3
         add     r0,r4,r5
         stwcx.  r0,0,r3
-        bne-    Loop
+        bne-    Ladd
         $SIGNX  r3,r0
         blr
+        .long   0
+        .byte   0,12,0x14,0,0,0,2,0
+        .long   0
 
 .globl  .OPENSSL_rdtsc
 .align  4
@@ -60,6 +91,8 @@ Loop:	lwarx	r5,0,r3
         mftb    r3
         mftbu   r4
         blr
+        .long   0
+        .byte   0,12,0x14,0,0,0,0,0
 
 .globl  .OPENSSL_cleanse
 .align  4
@@ -72,7 +105,7 @@ Loop:	lwarx	r5,0,r3
 Little: mtctr   r4
         stb     r0,0(r3)
         addi    r3,r3,1
-        bdnz-   \$-8
+        bdnz    \$-8
         blr
 Lot:    andi.   r5,r3,3
         beq     Laligned
@@ -85,10 +118,13 @@ Laligned:
         mtctr   r5
         stw     r0,0(r3)
         addi    r3,r3,4
-        bdnz-   \$-8
+        bdnz    \$-8
         andi.   r4,r4,3
         bne     Little
         blr
+        .long   0
+        .byte   0,12,0x14,0,0,0,2,0
+        .long   0
 ___
 
 $code =~ s/\`([^\`]*)\`/eval $1/gem;