5 files changed, 6 insertions, 124 deletions

diff --git a/src/lib/libcrypto/arch/alpha/Makefile.inc b/src/lib/libcrypto/arch/alpha/Makefile.inc
index 3b693c2ad2..9d1eab835c 100644
--- a/src/lib/libcrypto/arch/alpha/Makefile.inc
+++ b/src/lib/libcrypto/arch/alpha/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.4 2019/05/11 13:05:24 tb Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2023/01/17 15:04:27 miod Exp $
 
 # alpha-specific libcrypto build rules
 
@@ -32,10 +32,3 @@ ${f}.S: ${LCRYPTO_SRC}/${dir}/asm/${f}.pl
         /usr/bin/perl \
                 ${LCRYPTO_SRC}/${dir}/asm/${f}.pl > ${.TARGET}
 .endfor
-
-CFLAGS+= -DOPENSSL_CPUID_OBJ
-SRCS+=  alphacpuid.S
-GENERATED+=alphacpuid.S
-alphacpuid.S: ${LCRYPTO_SRC}/alphacpuid.pl
-        /usr/bin/perl \
-                ${LCRYPTO_SRC}/alphacpuid.pl > ${.TARGET}
diff --git a/src/lib/libcrypto/arch/arm/armv4cpuid.S b/src/lib/libcrypto/arch/arm/armv4cpuid.S
index bb9abafebe..db0b54e496 100644
--- a/src/lib/libcrypto/arch/arm/armv4cpuid.S
+++ b/src/lib/libcrypto/arch/arm/armv4cpuid.S
@@ -9,43 +9,6 @@
 #undef  __thumb2__
 #endif
 
-.align  5
-.globl  OPENSSL_atomic_add
-.type   OPENSSL_atomic_add,%function
-OPENSSL_atomic_add:
-#if __ARM_ARCH__>=6
-.Ladd:  ldrex   r2,[r0]
-        add     r3,r2,r1
-        strex   r2,r3,[r0]
-        cmp     r2,#0
-        bne     .Ladd
-        mov     r0,r3
-        bx      lr
-#else
-        stmdb   sp!,{r4,r5,r6,lr}
-        ldr     r2,.Lspinlock
-        adr     r3,.Lspinlock
-        mov     r4,r0
-        mov     r5,r1
-        add     r6,r3,r2        @ &spinlock
-        b       .+8
-.Lspin: bl      sched_yield
-        mov     r0,#-1
-        swp     r0,r0,[r6]
-        cmp     r0,#0
-        bne     .Lspin
-
-        ldr     r2,[r4]
-        add     r2,r2,r5
-        str     r2,[r4]
-        str     r0,[r6]         @ release spinlock
-        ldmia   sp!,{r4,r5,r6,lr}
-        tst     lr,#1
-        moveq   pc,lr
-.word   0xe12fff1e      @ bx    lr
-#endif
-.size   OPENSSL_atomic_add,.-OPENSSL_atomic_add
-
 #if __ARM_ARCH__>=7
 .arch   armv7-a
 .fpu    neon
@@ -102,64 +65,5 @@ _armv8_pmull_probe:
 .size   _armv8_pmull_probe,.-_armv8_pmull_probe
 #endif
 
-.globl  OPENSSL_wipe_cpu
-.type   OPENSSL_wipe_cpu,%function
-OPENSSL_wipe_cpu:
-#if __ARM_ARCH__>=7
-        ldr     r0,.LOPENSSL_armcap
-        adr     r1,.LOPENSSL_armcap
-        ldr     r0,[r1,r0]
-#ifdef  __APPLE__
-        ldr     r0,[r0]
-#endif
-#endif
-        eor     r2,r2,r2
-        eor     r3,r3,r3
-        eor     ip,ip,ip
-#if __ARM_ARCH__>=7
-        tst     r0,#1
-        beq     .Lwipe_done
-        veor    q0, q0, q0
-        veor    q1, q1, q1
-        veor    q2, q2, q2
-        veor    q3, q3, q3
-        veor    q8, q8, q8
-        veor    q9, q9, q9
-        veor    q10, q10, q10
-        veor    q11, q11, q11
-        veor    q12, q12, q12
-        veor    q13, q13, q13
-        veor    q14, q14, q14
-        veor    q15, q15, q15
-.Lwipe_done:
-#endif
-        mov     r0,sp
-#if __ARM_ARCH__>=5
-        bx      lr
-#else
-        tst     lr,#1
-        moveq   pc,lr
-.word   0xe12fff1e      @ bx    lr
-#endif
-.size   OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
-
-.align  5
-#if __ARM_ARCH__>=7
-.LOPENSSL_armcap:
-.word   OPENSSL_armcap_P-.
-#endif
-#if __ARM_ARCH__>=6
-.align  5
-#else
-.Lspinlock:
-.word   atomic_add_spinlock-.Lspinlock
-.align  5
-
-.data
-.align  2
-atomic_add_spinlock:
-.word   0
-#endif
-
 .comm   OPENSSL_armcap_P,4,4
 .hidden OPENSSL_armcap_P
diff --git a/src/lib/libcrypto/arch/hppa/Makefile.inc b/src/lib/libcrypto/arch/hppa/Makefile.inc
index eb15810f38..76affc391d 100644
--- a/src/lib/libcrypto/arch/hppa/Makefile.inc
+++ b/src/lib/libcrypto/arch/hppa/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.12 2023/01/13 17:11:41 miod Exp $
+# $OpenBSD: Makefile.inc,v 1.13 2023/01/17 15:04:27 miod Exp $
 
 # hppa-specific libcrypto build rules
 
@@ -40,10 +40,3 @@ ${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
         /usr/bin/perl \
                 ${LCRYPTO_SRC}/${dir}/asm/${src}.pl 32 ${.TARGET} > ${.TARGET}
 .endfor
-
-CFLAGS+= -DOPENSSL_CPUID_OBJ
-SRCS+=  pariscid.S
-GENERATED+=pariscid.S
-pariscid.S: ${LCRYPTO_SRC}/pariscid.pl
-        /usr/bin/perl \
-                ${LCRYPTO_SRC}/pariscid.pl 32 > ${.TARGET}
diff --git a/src/lib/libcrypto/arch/powerpc/Makefile.inc b/src/lib/libcrypto/arch/powerpc/Makefile.inc
index 2682fc9e21..6c168c7989 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.3 2019/05/11 13:05:25 tb Exp $
+# $OpenBSD: Makefile.inc,v 1.4 2023/01/17 15:04:27 miod Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -37,8 +37,4 @@ ${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
 .endfor
 
 #CFLAGS+= -DOPENSSL_CPUID_OBJ           # it's commented out in ppccap.c
-SRCS+=  ppccpuid.S ppccap.c
-GENERATED+=ppccpuid.S
-ppccpuid.S: ${LCRYPTO_SRC}/ppccpuid.pl
-        /usr/bin/perl \
-                ${LCRYPTO_SRC}/ppccpuid.pl linux32 > ${.TARGET}
+SRCS+=  ppccap.c
diff --git a/src/lib/libcrypto/arch/powerpc64/Makefile.inc b/src/lib/libcrypto/arch/powerpc64/Makefile.inc
index 0713b8cd94..51e1c569dc 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.4 2020/06/29 15:32:44 kettenis Exp $
+# $OpenBSD: Makefile.inc,v 1.5 2023/01/17 15:04:27 miod Exp $
 
 # powerpc-specific libcrypto build rules
 
@@ -38,8 +38,4 @@ ${dst}.S: ${LCRYPTO_SRC}/${dir}/asm/${src}.pl
 .endfor
 
 #CFLAGS+= -DOPENSSL_CPUID_OBJ           # it's commented out in ppccap.c
-SRCS+=  ppccpuid.S ppccap.c
-GENERATED+=ppccpuid.S
-ppccpuid.S: ${LCRYPTO_SRC}/ppccpuid.pl
-        /usr/bin/perl \
-                ${LCRYPTO_SRC}/ppccpuid.pl linux32 > ${.TARGET}
+SRCS+=  ppccap.c