summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGES4
-rw-r--r--Configurations/10-main.conf29
-rwxr-xr-xconfig17
-rw-r--r--include/internal/sockets.h4
-rwxr-xr-xutil/shlib_wrap.sh.in2
5 files changed, 5 insertions, 51 deletions
diff --git a/CHANGES b/CHANGES
index 7b14ee9b7e..3f6c8de32a 100644
--- 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 f27691f70d..0f7bdf2687 100644
--- 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 3bee0076c9..ce99302186 100755
--- 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 031156b960..a6026dad08 100644
--- 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 6c115ba725..b9e3ddf874 100755
--- 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