Remove QNX support

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5756)

diff --git a/CHANGES b/CHANGES
index 7b14ee9b7e4ecf3acb8616f173743e6a25e3c584..3f6c8de32ae0129c12d2027eae2daaa8dc2ee156 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,10 @@
 
  Changes between 1.1.0g and 1.1.1 [xx XXX xxxx]
 
+  *) QNX support removed (cannot find contributors to get their approval
+     for the license change).
+     [Rich Salz]
+
   *) TLSv1.3 replay protection for early data has been implemented. See the
      SSL_read_early_data() man page for further details.
      [Matt Caswell]

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index f27691f70d451387e5821fe607d6878239e170f7..0f7bdf2687bd3c4f85b2206c1bf8290403145f3d 100644 (file)
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1040,35 +1040,6 @@ my %targets = (
         thread_scheme    => "(unknown)",
     },
 
-# QNX
-    "qnx4" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "cc",
-        CFLAGS           => "",
-        lib_cppflags     => "-DL_ENDIAN -DTERMIO",
-        thread_scheme    => "(unknown)",
-    },
-    "QNX6" => {
-        inherit_from     => [ "BASE_unix" ],
-        CC               => "gcc",
-        ex_libs          => add("-lsocket"),
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
-    },
-    "QNX6-i386" => {
-        inherit_from     => [ "BASE_unix", asm("x86_elf_asm") ],
-        CC               => "gcc",
-        CFLAGS           => "-O2 -Wall",
-        lib_cppflags     => "-DL_ENDIAN",
-        ex_libs          => add("-lsocket"),
-        dso_scheme       => "dlfcn",
-        shared_target    => "bsd-gcc-shared",
-        shared_cflag     => "-fPIC",
-        shared_extension => ".so.\$(SHLIB_VERSION_NUMBER)",
-    },
-
 #### SCO/Caldera targets.
 #
 # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.

diff --git a/config b/config
index 3bee0076c90e2ff0c89a0b0f4a6d1930e340c927..ce993021867a76368c73db5981dc3484e2d63dd1 100755 (executable)
--- a/config
+++ b/config
@@ -240,21 +240,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
        esac
        ;;
 
-    QNX:*)
-       case "$RELEASE" in
-           4*)
-               echo "${MACHINE}-whatever-qnx4"
-               ;;
-           6*)
-               echo "${MACHINE}-whatever-qnx6"
-               ;;
-           *)
-               echo "${MACHINE}-whatever-qnx"
-               ;;
-       esac
-       exit 0
-       ;;
-
     Paragon*:*:*:*)
        echo "i860-intel-osf1"; exit 0
        ;;
@@ -831,8 +816,6 @@ case "$GUESSOS" in
   # these are all covered by the catchall below
   i[3456]86-*-cygwin) OUT="Cygwin-x86" ;;
   *-*-cygwin) OUT="Cygwin-${MACHINE}" ;;
-  x86pc-*-qnx6) OUT="QNX6-i386" ;;
-  *-*-qnx6) OUT="QNX6" ;;
   x86-*-android|i?86-*-android) OUT="android-x86" ;;
   armv[7-9]*-*-android)
       OUT="android-armeabi"

diff --git a/include/internal/sockets.h b/include/internal/sockets.h
index 031156b960bd64f84ab555d52acb83c0adaf0098..a6026dad081e7561b8a941374335fd6f8c1c0233 100644 (file)
--- a/include/internal/sockets.h
+++ b/include/internal/sockets.h
@@ -93,10 +93,6 @@ struct servent *PASCAL getservbyname(const char *, const char *);
 #   include <sys/select.h>
 #  endif
 
-#  ifdef __QNX__
-#   include <sys/select.h>
-#  endif
-
 #  ifndef VMS
 #   include <sys/ioctl.h>
 #  else

diff --git a/util/shlib_wrap.sh.in b/util/shlib_wrap.sh.in
index 6c115ba7256c9400b237dd28184e4a19ca5eb549..b9e3ddf8748d5ca7918e6141b9e3b017922c09ec 100755 (executable)
--- a/util/shlib_wrap.sh.in
+++ b/util/shlib_wrap.sh.in
@@ -110,7 +110,7 @@ if [ -f "$LIBCRYPTOSO" -a -z "$preload_var" ]; then
        # it into a script makes it possible to do so on multi-ABI
        # platforms.
        case "$SYSNAME" in
-       *BSD|QNX)       LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD, QNX
+       *BSD)   LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;  # *BSD
        *)      LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;;  # SunOS, Linux, ELF HP-UX
        esac
        _RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"      # Tru64, o32 IRIX