QNX6-armv4 support.

diff --git a/Configure b/Configure
index 0107002037bd1125e3b89f4aa6720acebca94679..9c800dbcd0c0d7c7a82339e23b224590b81edc59 100755 (executable)
--- 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 2c245e6f62a37b8eb45c0da2b6438e5ac5617643..8a659c076065ebe036b3893efaaa49af0e00c303 100755 (executable)
--- 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 6fefcceb6d28944815536195fe0446789760d5a3..dcdb0671cbc0e5473f232c5ee773a34f0c47811e 100644 (file)
--- 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