Overhaul the build process for OpenSSL dependency on Android

Build_android/configure.sh

@@ -107,9 +107,9 @@ then
 (
     if [ ! -d "openssl" ]; then mkdir openssl; fi
     cd openssl
-    cp "${DIR}/openssl/Makefile" .
-    export ANDROID_NDK_ROOT="${NDK_DIR}"
-    make all
+    cp -af "${DIR}/openssl/." .
+    make all ANDROID_NDK="${NDK_DIR}" ANDROID_ABI=armeabi-v7a OPENSSL_PREFIX=armeabi-v7a
+    make all ANDROID_NDK="${NDK_DIR}" ANDROID_ABI=x86 OPENSSL_PREFIX=x86
 )
 fi
 

Build_android/openssl/Makefile

@@ -1,60 +1,178 @@
-SHELL := /bin/bash
-OPENSSL_VER = openssl-1.0.2k
+# Configuration parameters
+ANDROID_NDK = /opt/android-ndk-r10e
+ANDROID_API = 18
+ANDROID_ABI = armeabi-v7a
+ANDROID_HOST = linux-x86_64
+ANDROID_TOOLCHAIN = gcc
+ANDROID_GCC_VERSION = 4.8
+OPENSSL_VERSION = 1.0.2k
+OPENSSL_PACKAGE = openssl-$(OPENSSL_VERSION)
+OPENSSL_PATCH = $(OPENSSL_PACKAGE).patch
+OPENSSL_TARBALL = $(OPENSSL_PACKAGE).tar.gz
+OPENSSL_URL = https://www.openssl.org/source/$(OPENSSL_TARBALL)
+OPENSSL_OPTIONS = -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine
+OPENSSL_PREFIX = android-$(ANDROID_API)-$(ANDROID_ABI)-$(ANDROID_TOOLCHAIN)
+OPENSSL_SOURCE = $(OPENSSL_PACKAGE)-$(ANDROID_ABI)
+OPENSSL_CFLAGS =
 
-all: armeabi-v7a/lib/libssl.a x86/lib/libssl.a
+# Setup target parameters from ABI
+ifneq ($(findstring armeabi,$(ANDROID_ABI)),)
+ANDROID_ARCH := arm
+ANDROID_TRIPLE := arm-linux-androideabi
+ANDROID_TOOLARCH := $(ANDROID_TRIPLE)
+OPENSSL_MACHINE := armv7
+OPENSSL_SYSTEM := android
+OPENSSL_TARGET := android-armeabi
+endif
 
-clean:
-	rm -rf $(OPENSSL_VER)
-	rm -rf $(OPENSSL_VER)-armeabi-v7a
-	rm -rf armeabi-v7a
-	rm -rf setenv-android-x86.sh
-
-setenv-android.sh:
-	wget https://wiki.openssl.org/images/7/70/Setenv-android.sh
-	mv Setenv-android.sh setenv-android.sh
-	chmod a+x setenv-android.sh
-
-setenv-android-x86.sh: setenv-android.sh
-	cp setenv-android.sh setenv-android-x86.sh.tmp
-	sed -i -e 's/_ANDROID_EABI="arm-linux-androideabi-4.8"/_ANDROID_EABI="x86-4.8"/g' setenv-android-x86.sh.tmp
-	sed -i -e 's/_ANDROID_ARCH=arch-arm/_ANDROID_ARCH=arch-x86/g' setenv-android-x86.sh.tmp
-	mv setenv-android-x86.sh.tmp setenv-android-x86.sh
-
-$(OPENSSL_VER).tar.gz:
-	wget https://www.openssl.org/source/$(OPENSSL_VER).tar.gz
-
-armeabi-v7a/lib/libssl.a: setenv-android.sh $(OPENSSL_VER).tar.gz
-	[ -d "$(ANDROID_NDK_ROOT)" ]
-	export ANDROID_NDK_ROOT="$(ANDROID_NDK_ROOT)"; \
-	. ./setenv-android.sh; \
+ifneq ($(findstring aarch64,$(ANDROID_ABI)),)
+ANDROID_ARCH := arm64
+ANDROID_TRIPLE := aarch64-linux-android
+ANDROID_TOOLARCH := $(ANDROID_TRIPLE)
+OPENSSL_MACHINE := aarch64
+OPENSSL_SYSTEM := android64
+OPENSSL_TARGET := android64-aarch64
+endif
+
+ifneq ($(findstring x86,$(ANDROID_ABI)),)
+ANDROID_ARCH := x86
+ANDROID_TRIPLE := i686-linux-android
+ANDROID_TOOLARCH := $(ANDROID_ARCH)
+OPENSSL_MACHINE := i686
+OPENSSL_SYSTEM := android
+OPENSSL_TARGET := android-x86
+endif
+
+# Validate Android NDK directory paths and use fallback directories where applicable
+define direxists =
+$(if $(wildcard $(1)),$(strip $(1)),"")
+endef
+
+define findfirstdir =
+$(call direxists,$(firstword $(filter-out "",$(foreach val,$(3),$(call direxists,$(subst $(2),$(strip $(val)),$(1)))))))
+endef
+
+ifeq ($(call direxists,$(ANDROID_NDK)),"")
+$(error invalid Android NDK root directory)
+endif
+
+ANDROID_LINK_SYSROOT := $(ANDROID_NDK)/platforms/android-$(ANDROID_API)/arch-$(ANDROID_ARCH)
+ifeq ($(call direxists,$(ANDROID_LINK_SYSROOT)),"")
+$(error invalid Android ABI or API level, could not locate Android NDK sysroot directory)
+endif
+
+ANDROID_SYSROOT := $(ANDROID_NDK)/sysroot
+ifeq ($(call direxists,$(ANDROID_SYSROOT)),"")
+ANDROID_SYSROOT := $(ANDROID_LINK_SYSROOT)
+endif
+
+ANDROID_GCC_VERSIONS := $(ANDROID_GCC_VERSION) 4.9 4.8
+ANDROID_GCC_PREBUILT_template := $(ANDROID_NDK)/toolchains/$(ANDROID_TOOLARCH)-<<VERSION>>/prebuilt
+ANDROID_GCC_PREBUILT := $(call findfirstdir,$(ANDROID_GCC_PREBUILT_template),<<VERSION>>,$(ANDROID_GCC_VERSIONS))
+ifeq ($(ANDROID_GCC_PREBUILT),"")
+$(error could not determine Android NDK GCC toolchain prebuilt directory)
+endif
+
+ANDROID_HOSTS := $(ANDROID_HOST) linux-x86_64 linux-x86 darwin-x86_64 darwin-x86
+ANDROID_GCC_TOOLCHAIN_template := $(ANDROID_GCC_PREBUILT)/<<HOST>>
+ANDROID_GCC_TOOLCHAIN := $(call findfirstdir,$(ANDROID_GCC_TOOLCHAIN_template),<<HOST>>,$(ANDROID_HOSTS))
+ifeq ($(ANDROID_GCC_TOOLCHAIN),"")
+$(error could not determine Android NDK GCC toolchain host directory)
+endif
+
+ANDROID_LLVM_VERSIONS := llvm llvm-3.6 llvm-3.5 llvm-3.4
+ANDROID_LLVM_TOOLCHAIN_template := $(ANDROID_NDK)/toolchains/<<LLVM>>/prebuilt/$(notdir $(ANDROID_GCC_TOOLCHAIN))
+ANDROID_LLVM_TOOLCHAIN := $(call findfirstdir,$(ANDROID_LLVM_TOOLCHAIN_template),<<LLVM>>,$(ANDROID_LLVM_VERSIONS))
+ifeq ($(ANDROID_LLVM_TOOLCHAIN),"")
+$(error could not determine Android NDK LLVM toolchain directory)
+endif
+
+# Configure toolchain
+OPENSSL_CROSS_COMPILE :=
+OPENSSL_CC :=
+OPENSSL_RANLIB := $(ANDROID_GCC_TOOLCHAIN)/bin/$(ANDROID_TRIPLE)-ranlib
+
+ifneq ($(findstring clang,$(ANDROID_TOOLCHAIN)),)
+OPENSSL_TARGET := $(OPENSSL_TARGET)-clang
+OPENSSL_CC := $(ANDROID_LLVM_TOOLCHAIN)/bin/clang
+endif
+
+ifneq ($(findstring gcc,$(ANDROID_TOOLCHAIN)),)
+OPENSSL_CROSS_COMPILE := $(ANDROID_TRIPLE)-
+OPENSSL_CC := $(ANDROID_GCC_TOOLCHAIN)/bin/$(ANDROID_TRIPLE)-gcc
+endif
+
+ifeq ($(OPENSSL_CC),)
+$(error invalid toolchain specified for ANDROID_TOOLCHAIN)
+endif
+
+all: info $(OPENSSL_PREFIX)/lib/libssl.a
+
+$(OPENSSL_TARBALL):
+	@echo "Downloading OpenSSL tarball"
+	wget $(OPENSSL_URL)
+
+$(OPENSSL_PREFIX)/lib/libssl.a: $(OPENSSL_TARBALL)
+	@echo "Decompressing OpenSSL package" && \
 	( \
 		set -e; \
-		rm -rf $(OPENSSL_VER)/; \
-		tar xzf $(OPENSSL_VER).tar.gz; \
-		rm -rf $(OPENSSL_VER)-armeabi-v7a/ \
+		rm -rf $(OPENSSL_SOURCE); \
+		rm -rf $(OPENSSL_PACKAGE); \
+		tar xzf $(OPENSSL_TARBALL); \
 	) && \
-	mv $(OPENSSL_VER) $(OPENSSL_VER)-armeabi-v7a && \
-	cd $(OPENSSL_VER)-armeabi-v7a && \
-	perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org && \
-	./config shared -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine --openssldir="`pwd`/../armeabi-v7a" && \
-	make depend && \
-	make all && \
-	make install CC=$${ANDROID_TOOLCHAIN}/arm-linux-androideabi-gcc RANLIB=$${ANDROID_TOOLCHAIN}/arm-linux-androideabi-ranlib
-
-x86/lib/libssl.a: setenv-android-x86.sh $(OPENSSL_VER).tar.gz
-	[ -d "$(ANDROID_NDK_ROOT)" ]
-	export ANDROID_NDK_ROOT="$(ANDROID_NDK_ROOT)"; \
-	. ./setenv-android-x86.sh; \
+	mv $(OPENSSL_PACKAGE) $(OPENSSL_SOURCE)
+	@if test -f $(OPENSSL_PATCH); then \
+		echo "Patching OpenSSL source tree"; \
+		( cd $(OPENSSL_SOURCE) && patch -p1 < ../$(OPENSSL_PATCH) ); \
+	fi
+	@echo "Building OpenSSL" && \
+	export ANDROID_NDK="$(ANDROID_NDK)" && \
+	export ANDROID_API="$(ANDROID_API)" && \
+	export ANDROID_ARCH="$(ANDROID_ARCH)" && \
+	export ANDROID_TRIPLE="$(ANDROID_TRIPLE)" && \
+	export ANDROID_SYSROOT="$(ANDROID_SYSROOT)" && \
+	export ANDROID_LINK_SYSROOT="$(ANDROID_LINK_SYSROOT)" && \
+	export ANDROID_GCC_TOOLCHAIN="$(ANDROID_GCC_TOOLCHAIN)" && \
+	export CROSS_SYSROOT="$(ANDROID_SYSROOT)" && \
+	export SYSROOT="$(ANDROID_SYSROOT)" && \
+	export ARCH="$(ANDROID_ARCH)" && \
+	export MACHINE="$(OPENSSL_MACHINE)" && \
+	export SYSTEM="$(OPENSSL_SYSTEM)" && \
+	export CROSS_COMPILE="$(OPENSSL_CROSS_COMPILE)" && \
+	export HOSTCC="$(ANDROID_TOOLCHAIN)" && \
+	export PATH="$(ANDROID_GCC_TOOLCHAIN)/bin:$(ANDROID_LLVM_TOOLCHAIN)/bin:$(PATH)" && \
 	( \
-		set -e; \
-		rm -rf $(OPENSSL_VER)/; \
-		tar xzf $(OPENSSL_VER).tar.gz; \
-		rm -rf $(OPENSSL_VER)-x86/ \
-	) && \
-	mv $(OPENSSL_VER) $(OPENSSL_VER)-x86 && \
-	cd $(OPENSSL_VER)-x86 && \
-	perl -pi -e 's/install: all install_docs install_sw/install: install_docs install_sw/g' Makefile.org && \
-	./config shared -no-ssl2 -no-ssl3 -no-comp -no-hw -no-engine --openssldir="`pwd`/../x86" && \
-	make depend && \
-	make all && \
-	make install CC=$${ANDROID_TOOLCHAIN}/i686-linux-android-gcc RANLIB=$${ANDROID_TOOLCHAIN}/i686-linux-android-ranlib
+		cd $(OPENSSL_SOURCE); \
+		perl Configure $(OPENSSL_TARGET) shared $(OPENSSL_OPTIONS) --prefix="`pwd`/../$(OPENSSL_PREFIX)" $(OPENSSL_CFLAGS) && \
+		make depend && \
+		make all && \
+		make install CC=$(OPENSSL_CC) RANLIB=$(OPENSSL_RANLIB); \
+	)
+
+clean:
+	@echo "Cleaning"
+	rm -rf $(OPENSSL_SOURCE)
+	rm -rf $(OPENSSL_PACKAGE)
+	rm -rf $(OPENSSL_PREFIX)
+
+info:
+	@echo "OpenSSL build options"
+	@echo "ANDROID_NDK = $(ANDROID_NDK)"
+	@echo "ANDROID_API = $(ANDROID_API)"
+	@echo "ANDROID_ABI = $(ANDROID_ABI)"
+	@echo "ANDROID_HOST = $(ANDROID_HOST)"
+	@echo "ANDROID_TOOLCHAIN = $(ANDROID_TOOLCHAIN)"
+	@echo "ANDROID_TRIPLE = $(ANDROID_TRIPLE)"
+	@echo "ANDROID_SYSROOT = $(ANDROID_SYSROOT)"
+	@echo "ANDROID_LINK_SYSROOT = $(ANDROID_LINK_SYSROOT)"
+	@echo "ANDROID_GCC_TOOLCHAIN = $(ANDROID_GCC_TOOLCHAIN)"
+	@echo "ANDROID_LLVM_TOOLCHAIN = $(ANDROID_LLVM_TOOLCHAIN)"
+	@echo "OPENSSL_VERSION = $(OPENSSL_VERSION)"
+	@echo "OPENSSL_URL = $(OPENSSL_URL)"
+	@echo "OPENSSL_OPTIONS = $(OPENSSL_OPTIONS)"
+	@echo "OPENSSL_PREFIX = $(OPENSSL_PREFIX)"
+	@echo "OPENSSL_CFLAGS = $(OPENSSL_CFLAGS)"
+	@echo "OPENSSL_CC = $(OPENSSL_CC)"
+	@echo "OPENSSL_RANLIB = $(OPENSSL_RANLIB)"
+
+.PHONY: all clean info

Build_android/openssl/openssl-1.0.2k.patch

@@ -0,0 +1,108 @@
+This patch applies several changes that enable OpenSSL 1.0.2k to be built
+for Android using either Clang or GCC toolchains.
+
+An alias for the android-armv7 target, named android-armeabi, is added for
+compatability with the OpenSSL 1.1.0 configuration target names. Support for
+the AArch64 archicture is also added, as well as targets using the Clang
+compiler.
+
+Clang does not recognize some of the ARM assembly nmenonics that are used in
+OpenSSL. In particular, the 'adrl' pseudo instruction is not supported. To
+further complicate matters, Clang doesn't support immediate fixup values so
+the alternative adr/sub sequence used for the Thumb2 code path cannot be
+used either. Instead it is replaced with a sequence of instructions that
+computes the offset at runtime. It utilizes register r4 for computing the
+intermediate result, which is first saved to and later restored from the
+stack. The upstream bug in LLVM can be found here:
+https://llvm.org/bugs/show_bug.cgi?id=24350
+
+diff -Naur org/Configure mod/Configure
+--- org/Configure	2017-01-26 05:22:03.000000000 -0800
++++ mod/Configure	2018-01-17 14:25:44.712943600 -0800
+@@ -471,10 +471,17 @@
+ "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+
+ # Android: linux-* but without pointers to headers and libs.
+-"android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android","gcc:-mandroid --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-x86","gcc:-mandroid --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-armv7","gcc:-march=armv7-a -mandroid --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-armeabi","gcc:-march=armv7-a -mandroid --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android64-aarch64","gcc:-march=armv8-a -mandroid --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-mips","gcc:-mandroid --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-x86-clang","clang:-target i686-none-linux-android --gcc-toolchain=\$(ANDROID_GCC_TOOLCHAIN) --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-armv7-clang","clang:-target armv7-none-linux-androideabi --gcc-toolchain=\$(ANDROID_GCC_TOOLCHAIN) --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-armeabi-clang","clang:-target armv7-none-linux-androideabi --gcc-toolchain=\$(ANDROID_GCC_TOOLCHAIN) --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android64-aarch64-clang","clang:-target aarch64-none-linux-android --gcc-toolchain=\$(ANDROID_GCC_TOOLCHAIN) --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${aarch64_asm}:linux64:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-mips-clang","clang:-target mipsel-none-linux-android --gcc-toolchain=\$(ANDROID_GCC_TOOLCHAIN) --sysroot \$(ANDROID_LINK_SYSROOT) -isystem \$(ANDROID_SYSROOT)/usr/include -isystem \$(ANDROID_SYSROOT)/usr/include/\$(ANDROID_TRIPLE) -B\$(ANDROID_LINK_SYSROOT)/lib -D__ANDROID_API__=\$(ANDROID_API) -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
+ #### *BSD [do see comment about ${BSDthreads} above!]
+ "BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+diff -Naur org/crypto/bn/asm/armv4-gf2m.pl mod/crypto/bn/asm/armv4-gf2m.pl
+--- org/crypto/bn/asm/armv4-gf2m.pl	2017-01-26 05:22:03.000000000 -0800
++++ mod/crypto/bn/asm/armv4-gf2m.pl	2018-01-17 11:38:57.297482700 -0800
+@@ -213,8 +213,8 @@
+ .align	5
+ .LNEON:
+ 	ldr		r12, [sp]		@ 5th argument
+-	vmov.32		$a, r2, r1
+-	vmov.32		$b, r12, r3
++	vmov		$a, r2, r1
++	vmov		$b, r12, r3
+ 	vmov.i64	$k48, #0x0000ffffffffffff
+ 	vmov.i64	$k32, #0x00000000ffffffff
+ 	vmov.i64	$k16, #0x000000000000ffff
+diff -Naur org/crypto/sha/asm/sha256-armv4.pl mod/crypto/sha/asm/sha256-armv4.pl
+--- org/crypto/sha/asm/sha256-armv4.pl	2017-01-26 05:22:03.000000000 -0800
++++ mod/crypto/sha/asm/sha256-armv4.pl	2018-01-17 11:38:57.306342000 -0800
+@@ -576,6 +576,7 @@
+ my @MSG=map("q$_",(8..11));
+ my ($W0,$W1,$ABCD_SAVE,$EFGH_SAVE)=map("q$_",(12..15));
+ my $Ktbl="r3";
++my $Temp="r4";
+
+ $code.=<<___;
+ #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
+@@ -591,7 +592,13 @@
+ sha256_block_data_order_armv8:
+ .LARMv8:
+ 	vld1.32	{$ABCD,$EFGH},[$ctx]
+-# ifdef __thumb2__
++# if defined(__clang__)
++	stmdb	sp!,{r4,lr}
++	adr	$Ktbl,.LARMv8
++	ldr	$Temp,=K256
++	sub	$Temp,$Ktbl,$Temp
++	sub	$Ktbl,$Ktbl,$Temp
++# elif defined(__thumb2__)
+ 	adr	$Ktbl,.LARMv8
+ 	sub	$Ktbl,$Ktbl,#.LARMv8-K256
+ # else
+@@ -655,7 +662,12 @@
+
+ 	vst1.32		{$ABCD,$EFGH},[$ctx]
+
++# ifdef __clang__
++	ldmia		sp!,{r4,pc}
++# else
+ 	ret		@ bx lr
++# endif
++
+ .size	sha256_block_data_order_armv8,.-sha256_block_data_order_armv8
+ #endif
+ ___
+diff -Naur org/Makefile.org mod/Makefile.org
+--- org/Makefile.org	2017-01-26 05:22:03.000000000 -0800
++++ mod/Makefile.org	2018-01-17 14:26:20.623418300 -0800
+@@ -532,7 +532,7 @@
+ 	@$(MAKE) SDIRS='$(SDIRS)' clean
+ 	@$(MAKE) TAR='$(TAR)' TARFLAGS='$(TARFLAGS)' $(DISTTARVARS) tar
+
+-install: all install_docs install_sw
++install: install_docs install_sw
+
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \