remove arm perlasm tendrils

6 files changed, 0 insertions, 56 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8437e02..c2a3e93 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -407,8 +407,6 @@ if(ENABLE_ASM)
         if(CMAKE_C_COMPILER_ABI STREQUAL "ELF")
                 if(HOST_X86_64)
                         set(HOST_ASM_ELF_X86_64 true)
-                elseif(HOST_ARM)
-                        set(HOST_ASM_ELF_ARMV4 true)
                 elseif(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND HOST_I386)
                         set(HOST_ASM_ELF_X86_64 true)
                 endif()
diff --git a/configure.ac b/configure.ac
index 7a88f27..fad8406 100644
--- a/configure.ac
+++ b/configure.ac
@@ -114,8 +114,6 @@ AC_ARG_ENABLE([asm], AS_HELP_STRING([--disable-asm], [Disable assembly]))
 AM_CONDITIONAL([OPENSSL_NO_ASM], [test "x$enable_asm" = "xno"])
 
 # Conditionally enable assembly by default
-AM_CONDITIONAL([HOST_ASM_ELF_ARM],
-    [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "arm" -a "x$enable_asm" != "xno"])
 AM_CONDITIONAL([HOST_ASM_ELF_MIPS],
     [test "x$HOST_ABI" = "xelf" -a "$host_cpu" = "mips" -a "x$enable_asm" != "xno"])
 AM_CONDITIONAL([HOST_ASM_ELF_MIPS64],
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
diff --git a/update.sh b/update.sh
index 941a679..f29cdeb 100755
--- a/update.sh
+++ b/update.sh
@@ -261,17 +261,6 @@ gen_asm_mips 64 sha sha1-mips   sha1-mips64
 gen_asm_mips 64 sha sha512-mips sha256-mips64
 gen_asm_mips 64 sha sha512-mips sha512-mips64
 
-echo generating arm ASM source for elf
-gen_asm_stdout elf aes/asm/aes-armv4.pl        aes/aes-elf-armv4.S
-gen_asm_stdout elf bn/asm/armv4-mont.pl        bn/mont-elf-armv4.S
-gen_asm_stdout elf sha/asm/sha1-armv4-large.pl sha/sha1-elf-armv4.S
-gen_asm_stdout elf sha/asm/sha256-armv4.pl     sha/sha256-elf-armv4.S
-gen_asm_stdout elf sha/asm/sha512-armv4.pl     sha/sha512-elf-armv4.S
-gen_asm_stdout elf modes/asm/ghash-armv4.pl    modes/ghash-elf-armv4.S
-$CP $libcrypto_src/arch/arm/armv4cpuid.S crypto
-$CP $libcrypto_src/arch/arm/armcap.c crypto
-$CP $libcrypto_src/arch/arm/arm_arch.h crypto
-
 for abi in elf macosx masm mingw64; do
         echo generating x86_64 ASM source for $abi