From 5011fa2a0a08dd764a5f3fc6dca3069b40f27b75 Mon Sep 17 00:00:00 2001
From: Theo Buehler <tb@openbsd.org>
Date: Sat, 24 May 2025 21:24:26 -0600
Subject: remove arm perlasm tendrils

---
 crypto/CMakeLists.txt      | 19 -------------------
 crypto/Makefile.am         |  4 ----
 crypto/Makefile.am.elf-arm | 18 ------------------
 3 files changed, 41 deletions(-)
 delete mode 100644 crypto/Makefile.am.elf-arm

(limited to 'crypto')

diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 4f3f338..d949bcd 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -1,24 +1,5 @@
 add_definitions(-DLIBRESSL_CRYPTO_INTERNAL)
 
-if(HOST_ASM_ELF_ARMV4)
-	set(
-		ASM_ARMV4_ELF_SRC
-		aes/aes-elf-armv4.S
-		bn/mont-elf-armv4.S
-		sha/sha1-elf-armv4.S
-		sha/sha512-elf-armv4.S
-		sha/sha256-elf-armv4.S
-		modes/ghash-elf-armv4.S
-		armv4cpuid.S
-		armcap.c
-	)
-	add_definitions(-DAES_ASM)
-	add_definitions(-DOPENSSL_BN_ASM_MONT)
-	add_definitions(-DGHASH_ASM)
-	add_definitions(-DOPENSSL_CPUID_OBJ)
-	set(CRYPTO_SRC ${CRYPTO_SRC} ${ASM_ARMV4_ELF_SRC})
-endif()
-
 if(HOST_ASM_ELF_X86_64)
 	set(
 		ASM_X86_64_ELF_SRC
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 25e6363..df5560e 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -185,7 +185,6 @@ include Makefile.am.arc4random
 libcrypto_la_SOURCES =
 EXTRA_libcrypto_la_SOURCES =
 
-include Makefile.am.elf-arm
 include Makefile.am.elf-mips
 include Makefile.am.elf-mips64
 include Makefile.am.elf-x86_64
@@ -193,7 +192,6 @@ include Makefile.am.macosx-x86_64
 include Makefile.am.masm-x86_64
 include Makefile.am.mingw64-x86_64
 
-if !HOST_ASM_ELF_ARM
 if !HOST_ASM_ELF_MIPS
 if !HOST_ASM_ELF_MIPS64
 if !HOST_ASM_ELF_X86_64
@@ -207,7 +205,6 @@ endif
 endif
 endif
 endif
-endif
 
 if HOST_AARCH64
 if HOST_DARWIN
@@ -242,7 +239,6 @@ else
 libcrypto_la_SOURCES += compat/crypto_lock_win.c
 endif
 libcrypto_la_SOURCES += crypto_memory.c
-noinst_HEADERS += arm_arch.h
 noinst_HEADERS += constant_time.h
 noinst_HEADERS += crypto_internal.h
 noinst_HEADERS += crypto_local.h
diff --git a/crypto/Makefile.am.elf-arm b/crypto/Makefile.am.elf-arm
deleted file mode 100644
index 6a9fa50..0000000
--- a/crypto/Makefile.am.elf-arm
+++ /dev/null
@@ -1,18 +0,0 @@
-ASM_ARM_ELF = aes/aes-elf-armv4.S
-ASM_ARM_ELF += bn/mont-elf-armv4.S
-ASM_ARM_ELF += sha/sha1-elf-armv4.S
-ASM_ARM_ELF += sha/sha512-elf-armv4.S
-ASM_ARM_ELF += sha/sha256-elf-armv4.S
-ASM_ARM_ELF += modes/ghash-elf-armv4.S
-ASM_ARM_ELF += armv4cpuid.S
-ASM_ARM_ELF += armcap.c
-
-EXTRA_DIST += $(ASM_ARM_ELF)
-
-if HOST_ASM_ELF_ARM
-libcrypto_la_CPPFLAGS += -DAES_ASM
-libcrypto_la_CPPFLAGS += -DOPENSSL_BN_ASM_MONT
-libcrypto_la_CPPFLAGS += -DGHASH_ASM
-libcrypto_la_CPPFLAGS += -DOPENSSL_CPUID_OBJ
-libcrypto_la_SOURCES += $(ASM_ARM_ELF)
-endif
-- 
cgit v1.2.3-55-g6feb