Commit 64961dc3 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.7-stable

parent ed2e0e39

Configure

+2 −1
Original line number Diff line number Diff line
@@ -561,7 +561,8 @@ my %table=( 
"vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",

"vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",

"vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::",

"vxworks-ppc860","ccppc:-g -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",

"vxworks-ppc860","ccppc:-nostdinc -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",

"vxworks-mipsle","ccmips:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -DL_ENDIAN -EL -Wl,-EL -mips2 -mno-branch-likely -G 0 -fno-builtin -msoft-float -DCPU=MIPS32 -DMIPSEL -DNO_STRINGS_H -I\$(WIND_BASE)/target/h:::VXWORKS:-r::::::::::::::::ranlibmips:",



##### Compaq Non-Stop Kernel (Tandem)

"tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",

TABLE

+25 −0
Original line number Diff line number Diff line
@@ -4374,3 +4374,28 @@ $shared_ldflag = 
$shared_extension = 

$ranlib       = 

$arflags      = 



*** vxworks-ppc860

$cc           = ccppc

$cflags       = -g -msoft-float -DCPU=PPC860 -DNO_STRINGS_H -I$(WIND_BASE)/target/h

$unistd       = 

$thread_cflag = 

$sys_id       = VXWORKS

$lflags       = -r

$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 = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      =

e_os.h

+7 −4
Original line number Diff line number Diff line
@@ -174,6 +174,13 @@ extern "C" { 
#define closesocket(s)          close(s)

#define readsocket(s,b,n)       recv((s),(b),(n),0)

#define writesocket(s,b,n)      send((s),(b),(n),0)

#elif defined(OPENSSL_SYS_VXWORKS)

#define get_last_socket_error()	errno

#define clear_socket_error()	errno=0

#define ioctlsocket(a,b,c)	    ioctl((a),(b),(int)(c))

#define closesocket(s)		    close(s)

#define readsocket(s,b,n)	    read((s),(b),(n))

#define writesocket(s,b,n)	    write((s),(char *)(b),(n))

#else

#define get_last_socket_error()	errno

#define clear_socket_error()	errno=0
@@ -538,10 +545,6 @@ extern char *sys_errlist[]; extern int sys_nerr; 
#define TTY_STRUCT int



#define sleep(a) taskDelay((a) * sysClkRateGet())

#if defined(ioctlsocket)

#undef ioctlsocket

#endif

#define ioctlsocket(a,b,c)  ioctl((a),(b),*(int*)(c))



#include <vxWorks.h>

#include <sockLib.h>