Commit 19d2a20a authored by Richard Levitte's avatar Richard Levitte
Browse files

Change from main development line, 2001-03-18 15:24 levitte 

New cofiguration for Unixwre and SCO,with slightly better granularity.
Contributed by Tim Rice <tim@multitalents.net>
parent 0bf5d407

Configure

+12 −3
Original line number Diff line number Diff line
@@ -317,9 +317,14 @@ my %table=( 
# Linux on ARM

"linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",



# UnixWare 2.0

"unixware-2.0","cc:-O -DFILIO_H::(unknown):-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:::",

"unixware-2.0-pentium","cc:-O -DFILIO_H -Kpentium -Kthread::(unknown):-lsocket -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",

# UnixWare 2.0x fails destest with -O

"unixware-2.0","cc:-DFILIO_H::-Kthread:-lsocket -lnsl -lx:${x86_gcc_des} ${x86_gcc_opts}:::",

"unixware-2.0-pentium","cc:-DFILIO_H -Kpentium:-Kthread:-lsocket -lnsl -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",



# UnixWare 2.1

"unixware-2.1","cc:-O -DFILIO_H::-Kthread:-lsocket -lnsl -lx:${x86_gcc_des} ${x86_gcc_opts}:::",

"unixware-2.1-pentium","cc:-O -DFILIO_H -Kpentium::-Kthread:-lsocket -lnsl -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",

"unixware-2.1-p6","cc:-O -DFILIO_H -Kp6::-Kthread:-lsocket -lnsl -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",



# UnixWare 7

"unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread:-lsocket -lnsl:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
@@ -358,9 +363,13 @@ my %table=( 
"dgux-R4-gcc",	"gcc:-O3 -fomit-frame-pointer::(unknown):-lnsl -lsocket:RC4_INDEX:RC4_INDEX DES_UNROLL:::",

"dgux-R4-x86-gcc",	"gcc:-O3 -fomit-frame-pointer -DL_ENDIAN::(unknown):-lnsl -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",



# SCO 3 - Tim Rice <tim@multitalents.net>

"sco3-gcc",  "gcc:-O3 -fomit-frame-pointer -Dssize_t=int -DNO_SYS_UN_H::(unknown)::-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ...



# SCO 5 - Ben Laurie <ben@algroup.co.uk> says the -O breaks the

# SCO cc.

"sco5-cc",  "cc:::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?

"sco5-cc-pentium",  "cc:-Kpentium::(unknown):-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?

"sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown):-lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", # the SCO assembler doesn't seem to like our assembler files ...



# Sinix/ReliantUNIX RM400

config

+15 −4
Original line number Diff line number Diff line
@@ -49,10 +49,18 @@ if [ "x$XREL" != "x" ]; then 
		echo "whatever-whatever-sco5"; exit 0

		;;

	    4.2MP)

		if [ "x$VERSION" = "x2.1.1" ]; then

		if [ "x$VERSION" = "x2.01" ]; then

		    echo "${MACHINE}-whatever-unixware201"; exit 0

		elif [ "x$VERSION" = "x2.02" ]; then

		    echo "${MACHINE}-whatever-unixware202"; exit 0

		elif [ "x$VERSION" = "x2.03" ]; then

		    echo "${MACHINE}-whatever-unixware203"; exit 0

		elif [ "x$VERSION" = "x2.1.1" ]; then

		    echo "${MACHINE}-whatever-unixware211"; exit 0

		elif [ "x$VERSION" = "x2.1.2" ]; then

		    echo "${MACHINE}-whatever-unixware212"; exit 0

		elif [ "x$VERSION" = "x2.1.3" ]; then

		    echo "${MACHINE}-whatever-unixware213"; exit 0

		else

		    echo "${MACHINE}-whatever-unixware2"; exit 0

		fi
@@ -473,9 +481,12 @@ case "$GUESSOS" in 
  *-*-unixware7) OUT="unixware-7" ;;

  *-*-UnixWare7) OUT="unixware-7" ;;

  *-*-Unixware7) OUT="unixware-7" ;;

  *-*-unixware[1-2]*) OUT="unixware-2.0" ;;

  *-*-UnixWare[1-2]*) OUT="unixware-2.0" ;;

  *-*-Unixware[1-2]*) OUT="unixware-2.0" ;;

  *-*-unixware20*) OUT="unixware-2.0" ;;

  *-*-unixware21*) OUT="unixware-2.1" ;;

  *-*-UnixWare20*) OUT="unixware-2.0" ;;

  *-*-UnixWare21*) OUT="unixware-2.1" ;;

  *-*-Unixware20*) OUT="unixware-2.0" ;;

  *-*-Unixware21*) OUT="unixware-2.1" ;;

  BS2000-siemens-sysv4) OUT="BS2000-OSD" ;;

  RM*-siemens-sysv4) OUT="ReliantUNIX" ;;

  *-siemens-sysv4) OUT="SINIX" ;;

crypto/rand/rand_egd.c

+7 −0
Original line number Diff line number Diff line
@@ -74,7 +74,14 @@ int RAND_egd_bytes(const char *path,int bytes) 
#include OPENSSL_UNISTD

#include <sys/types.h>

#include <sys/socket.h>

#ifndef NO_SYS_UN_H

#include <sys/un.h>

#else

struct	sockaddr_un {

	short	sun_family;		/* AF_UNIX */

	char	sun_path[108];		/* path name (gag) */

};

#endif /* NO_SYS_UN_H */

#include <string.h>



#ifndef offsetof