From cee4df5e65a72510fc27da332f6fe8679772c4ee Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Fri, 1 Nov 2024 12:56:39 +0000
Subject: Clean up PPC CPU capabilities and Montgomery code.

ppc64-mont.pl (which produces bn_mul_mont_fpu64()) is unused on both
powerpc and powerpc64, so remove it. ppccap.c doesn't actually contain
anything to do with CPU capabilities - it just provides a bn_mul_mont()
that calls bn_mul_mont_int() (which ppc-mont.pl generates). Change
ppc-mont.pl to generate bn_mul_mont() directly and remove ppccap.c.

ok tb@
---
 src/lib/libcrypto/arch/powerpc/Makefile.inc   | 8 ++------
 src/lib/libcrypto/arch/powerpc64/Makefile.inc | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

(limited to 'src/lib/libcrypto/arch')

diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
index 0d40e5ac3c..6957abddaf 100644
--- a/src/lib/libcrypto/arch/powerpc/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2024/03/29 07:24:09 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2024/11/01 12:56:38 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -7,8 +7,7 @@
 #SSLASM+= aes aes-ppc aes-ppc
 # bn
 SSLASM+= bn ppc bn-ppc
-SSLASM+= bn ppc-mont ppc-mont		# bn_mul_mont_int
-#SSLASM+= bn ppc64-mont ppc64-mont	# bn_mul_mont_fpu64
+SSLASM+= bn ppc-mont ppc-mont
 CFLAGS+= -DOPENSSL_BN_ASM_MONT
 # sha
 CFLAGS+= -DSHA1_ASM
@@ -23,6 +22,3 @@ ${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
 	/usr/bin/perl \
 		${LCRYPTO_SRC}/${dir}/asm/${src}.pl linux32 ${.TARGET} > ${.TARGET}
 .endfor
-
-#CFLAGS+= -DOPENSSL_CPUID_OBJ		# it's commented out in ppccap.c
-SRCS+=	ppccap.c
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
index 07c9de3d09..da81a63cdf 100644
--- a/src/lib/libcrypto/arch/powerpc64/Makefile.inc
+++ b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.14 2024/03/29 07:24:09 jsing Exp $
+# $OpenBSD: Makefile.inc,v 1.15 2024/11/01 12:56:38 jsing Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -7,8 +7,7 @@
 #SSLASM+= aes aes-ppc aes-ppc
 # bn
 #SSLASM+= bn ppc bn-ppc
-#SSLASM+= bn ppc-mont ppc-mont		# bn_mul_mont_int
-#SSLASM+= bn ppc64-mont ppc64-mont	# bn_mul_mont_fpu64
+#SSLASM+= bn ppc-mont ppc-mont
 #CFLAGS+= -DOPENSSL_BN_ASM_MONT
 # sha
 #CFLAGS+= -DSHA1_ASM
@@ -23,6 +22,3 @@ ${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
 	/usr/bin/perl \
 		${LCRYPTO_SRC}/${dir}/asm/${src}.pl linux32 ${.TARGET} > ${.TARGET}
 .endfor
-
-#CFLAGS+= -DOPENSSL_CPUID_OBJ		# it's commented out in ppccap.c
-SRCS+=	ppccap.c
-- 
cgit v1.2.3-55-g6feb