Commit 6d0a5219 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Add support for Android platform and specifically Droid II.

parent 63fc9883

Configure

+3 −0
Original line number Original line Diff line number Diff line
@@ -358,6 +358,9 @@ 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:${no_asm}",

"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:${no_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:${no_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:${no_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)",



#### *BSD [do see comment about ${BSDthreads} above!]

#### *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)",

"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)",

"BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

"BSD-x86",	"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:dlfcn:bsd-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

fips/fips_canister.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
	(defined(__linux) && (defined(__arm) || defined(__arm__)))	|| \

	(defined(__linux) && (defined(__arm) || defined(__arm__)))	|| \

	(defined(__i386) || defined(__i386__))				|| \

	(defined(__i386) || defined(__i386__))				|| \

	(defined(__x86_64) || defined(__x86_64__))			|| \

	(defined(__x86_64) || defined(__x86_64__))			|| \

	defined(__ANDROID__)						|| \

	(defined(vax) || defined(__vax__))

	(defined(vax) || defined(__vax__))

#  define POINTER_TO_FUNCTION_IS_POINTER_TO_1ST_INSTRUCTION

#  define POINTER_TO_FUNCTION_IS_POINTER_TO_1ST_INSTRUCTION

# endif

# endif