Commit 19503ca6 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

PR: 1939 

Submitted by: Sean Boudreau <seanb@qnx.com>
Reviewed by: steve@openssl.org

Better QNX6 support.
parent 14089b1d

Configure

+2 −1
Original line number Diff line number Diff line
@@ -390,7 +390,8 @@ my %table=( 


# QNX

"qnx4",	"cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",

"qnx6",	"cc:-DL_ENDIAN -DTERMIOS::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:",

"QNX6",       "gcc:-DTERMIOS::::-lsocket::${no_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)",



#### SCO/Caldera targets.

#

config

+2 −0
Original line number Diff line number Diff line
@@ -769,6 +769,8 @@ case "$GUESSOS" in 
  t3e-cray-unicosmk) OUT="cray-t3e" ;;

  j90-cray-unicos) OUT="cray-j90" ;;

  nsr-tandem-nsk) OUT="tandem-c89" ;;

  x86pc-*-qnx6) OUT="QNX6-i386" ;;

  *-*-qnx6) OUT="QNX6" ;;

  *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;

esac

util/shlib_wrap.sh

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,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)	LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;	# *BSD

	*BSD|QNX)	LD_PRELOAD="$LIBCRYPTOSO:$LIBSSLSO" ;;	# *BSD, QNX

	*)	LD_PRELOAD="$LIBCRYPTOSO $LIBSSLSO" ;;	# SunOS, Linux, ELF HP-UX

	esac

	_RLD_LIST="$LIBCRYPTOSO:$LIBSSLSO:DEFAULT"	# Tru64, o32 IRIX