summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2013-12-16 21:41:07 +0000
committerDr. Stephen Henson <steve@openssl.org>2013-12-16 21:41:07 +0000
commit2659a2aa7ca8cf17cae05d119fc3caee0480ddd6 (patch)
treeacb75ddd9ba8f689ec7e53eff08150f03d909381
parent200f249b8c3b6439e0200d01caadc24806f1a983 (diff)
QNX6-armv4 support.OpenSSL-fips-2_0_6
-rwxr-xr-xConfigure1
-rwxr-xr-xconfig1
-rw-r--r--fips/fips_canister.c3
3 files changed, 4 insertions, 1 deletions
diff --git a/Configure b/Configure
index 0107002037..9c800dbcd0 100755
--- a/Configure
+++ b/Configure
@@ -433,6 +433,7 @@ my %table=(
# QNX
"qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",
"QNX6", "gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"QNX6-armv4", "gcc:-DTERMIOS -O2 -Wall:::::BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"QNX6-i386", "gcc:-DL_ENDIAN -DTERMIOS -O2 -Wall::::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
# BeOS
diff --git a/config b/config
index 2c245e6f62..8a659c0760 100755
--- a/config
+++ b/config
@@ -853,6 +853,7 @@ case "$GUESSOS" in
j90-cray-unicos) OUT="cray-j90" ;;
nsr-tandem-nsk) OUT="tandem-c89" ;;
beos-*) OUT="$GUESSOS" ;;
+ armv4-*-qnx6) OUT="QNX6-armv4" ;;
x86pc-*-qnx6) OUT="QNX6-i386" ;;
*-*-qnx6) OUT="QNX6" ;;
x86-*-android|i?86-*-android) OUT="android-x86" ;;
diff --git a/fips/fips_canister.c b/fips/fips_canister.c
index 6fefcceb6d..dcdb0671cb 100644
--- a/fips/fips_canister.c
+++ b/fips/fips_canister.c
@@ -39,7 +39,8 @@ const void *FIPS_text_end(void);
(defined(__APPLE__) /* verified on all MacOS X & iOS flavors */)|| \
(defined(_TMS320C6X)) || \
(defined(__ECOS__)) || \
- (defined(_WIN32) && defined(_MSC_VER))
+ (defined(_WIN32) && defined(_MSC_VER)) || \
+ (defined(__QNX__) && defined(__ARM__))
# define FIPS_REF_POINT_IS_CROSS_COMPILER_AWARE
# endif
#endif