summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2011-02-12 16:13:59 +0000
committerAndy Polyakov <appro@openssl.org>2011-02-12 16:13:59 +0000
commit874b0bd9687604803c60f297b7bed3d606972681 (patch)
tree7a6cdce24ccaa0584160d10642d1d7ca203e9c9b
parenta6d915e0efca1e9fcd074bc6c3d800d7d0bd2712 (diff)
Configure: engage assembler in Android target.
-rwxr-xr-xConfigure4
-rw-r--r--TABLE8
2 files changed, 6 insertions, 6 deletions
diff --git a/Configure b/Configure
index 2cb5a67e7f..2ee7d4d3d9 100755
--- a/Configure
+++ b/Configure
@@ -398,8 +398,8 @@ my %table=(
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
-# Android: Linux but without -DTERMIO and 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: linux-armv4 but without -DTERMIO and 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:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### *BSD [do see comment about ${BSDthreads} above!]
"BSD-generic32","gcc:-DTERMIOS -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 --git a/TABLE b/TABLE
index 0334a37399..79510dee7f 100644
--- a/TABLE
+++ b/TABLE
@@ -1001,19 +1001,19 @@ $sys_id =
$lflags = -ldl
$bn_ops = BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR
$cpuid_obj =
-$bn_obj =
+$bn_obj = bn_asm.o armv4-mont.o
$des_obj =
-$aes_obj =
+$aes_obj = aes_cbc.o aes-armv4.o
$bf_obj =
$md5_obj =
-$sha1_obj =
+$sha1_obj = sha1-armv4-large.o sha256-armv4.o sha512-armv4.o
$cast_obj =
$rc4_obj =
$rmd160_obj =
$rc5_obj =
$wp_obj =
$cmll_obj =
-$modes_obj =
+$modes_obj = ghash-armv4.o
$perlasm_scheme = void
$dso_scheme = dlfcn
$shared_target= linux-shared