Changes for QNX: there is no thread support, and the previous

configuration only worked with no-asm.

diff --git a/Configure b/Configure
index 32b95d842e1d8915b4c0f5e3061b3ab2e45e8991..8bb1652838f9dce51f36fe5b3dd2ea6be0eba8b3 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -89,14 +89,16 @@ my $x86_elf_asm="asm/bn86-elf.o asm/co86-elf.o:asm/dx86-elf.o asm/yx86-elf.o:asm
 my $x86_out_asm="asm/bn86-out.o asm/co86-out.o:asm/dx86-out.o asm/yx86-out.o:asm/bx86-out.o:asm/mx86-out.o:asm/sx86-out.o:asm/cx86-out.o:asm/rx86-out.o:asm/rm86-out.o:asm/r586-out.o";
 my $x86_bsdi_asm="asm/bn86bsdi.o asm/co86bsdi.o:asm/dx86bsdi.o asm/yx86bsdi.o:asm/bx86bsdi.o:asm/mx86bsdi.o:asm/sx86bsdi.o:asm/cx86bsdi.o:asm/rx86bsdi.o:asm/rm86bsdi.o:asm/r586bsdi.o";
 
-my $x86_omf_asm="asm/bn86-omf.o asm/co86-omf.o:asm/dx86-omf.o asm/yx86-omf.o:asm/bx86-omf.o:asm/mx86-omf.o:asm/sx86-omf.o:asm/cx86-omf.o:asm/rx86-omf.o:asm/rm86-omf.o:asm/r586-omf.o";
-
 # -DB_ENDIAN slows things down on a sparc for md5, but helps sha1.
 # So the md5_locl.h file has an undef B_ENDIAN if sun is defined
 
 #config-string $cc : $cflags : $unistd : $thread_cflag : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag
 
 my %table=(
+# File 'TABLE' (created by 'make TABLE') contains the data from this list,
+# formatted for better readability.
+
+
 #"b",          "${tcc}:${tflags}::${tlib}:${bits1}:${tbn_mul}::",
 #"bl-4c-2c",   "${tcc}:${tflags}::${tlib}:${bits1}BN_LLONG RC4_CHAR MD2_CHAR:${tbn_mul}::",
 #"bl-4c-ri",   "${tcc}:${tflags}::${tlib}:${bits1}BN_LLONG RC4_CHAR RC4_INDEX:${tbn_mul}::",
@@ -297,7 +299,7 @@ my %table=(
 "ncr-scde","cc:-O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw::(unknown):-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:::",
 
 # QNX 4
-"qnx4",        "cc:-DL_ENDIAN -DTERMIO::::${x86_gcc_des} ${x86_gcc_opts}:${x86_omf_asm}",
+"qnx4",        "cc:-DL_ENDIAN -DTERMIO::(unknown)::${x86_gcc_des} ${x86_gcc_opts}:",
 
 # Linux on ARM
 "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC",

diff --git a/config b/config
index af0686dff0cb911c52b0e542088e46eb6c501ad1..9f9e50217469bbffc923b932cae4448d1a502532 100755 (executable)
--- a/config
+++ b/config
@@ -181,14 +181,11 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
 
     QNX:*)
        case "$VERSION" in
-           425)
-               echo "${MACHINE}-qssl-qnx4"
-               ;;
-           423)
-               echo "${MACHINE}-qssl-qnx32"
+           4*)
+               echo "${MACHINE}-whatever-qnx4"
                ;;
            *)
-               echo "${MACHINE}-qssl-qnx"
+               echo "${MACHINE}-whatever-qnx"
                ;;
        esac
        exit 0