From a3963619f64377e5de7418c09bece61f8389b3fc Mon Sep 17 00:00:00 2001
From: Andy Polyakov <appro@openssl.org>
Date: Mon, 30 Jul 2007 08:47:32 +0000
Subject: [PATCH] Make ppccpuid AIX friendly.

---
 crypto/Makefile    | 4 +++-
 crypto/ppccpuid.pl | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/crypto/Makefile b/crypto/Makefile
index a19f4d9917..e5b5b0781b 100644
--- a/crypto/Makefile
+++ b/crypto/Makefile
@@ -77,7 +77,9 @@ x86_64cpuid.s: x86_64cpuid.pl
 	$(PERL) x86_64cpuid.pl $@
 ia64cpuid.s: ia64cpuid.S
 	$(CC) $(CFLAGS) -E ia64cpuid.S > $@
-ppccpuid_%.s:	ppccpuid.pl;	$(PERL) $< $@
+ppccpuid_%.s:		ppccpuid.pl;	$(PERL) $< $@
+ppccpuid_aix32.s:	ppccpuid.pl;	$(PERL) ppccpuid.pl $@
+ppccpuid_aix64.s:	ppccpuid.pl;	$(PERL) ppccpuid.pl $@
 
 testapps:
 	[ -z "$(THIS)" ] || (	if echo ${SDIRS} | fgrep ' des '; \
diff --git a/crypto/ppccpuid.pl b/crypto/ppccpuid.pl
index 50d989e193..dad5703b0e 100755
--- a/crypto/ppccpuid.pl
+++ b/crypto/ppccpuid.pl
@@ -70,7 +70,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
@@ -83,7 +83,7 @@ Laligned:
 	mtctr	r5
 	stw	r0,0(r3)
 	addi	r3,r3,4
-	bdnz-	.-8
+	bdnz-	$-8
 	andi.	r4,r4,3
 	bne	Little
 	blr