mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-01-18 07:53:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

IRIX fixes.

Browse Source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
This commit is contained in:
Andy Polyakov 2016-05-04 23:40:47 +02:00
parent 59a56c4cf0
commit c21c7830ac
5 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@ -4,6 +4,9 @@
Changes between 1.0.2g and 1.1.0 [xx XXX xxxx]
*) Remove support for MIPS o32 ABI on IRIX (and IRIX only).
[Andy Polyakov]
*) Triple-DES ciphers have been moved from HIGH to MEDIUM.
[Rich Salz]

35
Configurations/10-main.conf
View File

@ -303,44 +303,16 @@ sub vms_info {
multilib => "/64",
},
#### IRIX 5.x configs
# -mips2 flag is added by ./config when appropriate.
"irix-gcc" => {
inherit_from => [ "BASE_unix", asm("mips32_asm") ],
cc => "gcc",
cflags => picker(default => "-DB_ENDIAN",
debug => "-g -O0",
release => "-O3"),
bn_ops => "BN_LLONG RC4_CHAR",
thread_scheme => "(unknown)",
perlasm_scheme => "o32",
dso_scheme => "dlfcn",
shared_target => "irix-shared",
shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
},
"irix-cc" => {
inherit_from => [ "BASE_unix", asm("mips32_asm") ],
cc => "cc",
cflags => picker(default => "-use_readonly_const -DB_ENDIAN",
debug => "-g -O0",
release => "-O2"),
bn_ops => "BN_LLONG RC4_CHAR",
thread_scheme => "(unknown)",
perlasm_scheme => "o32",
dso_scheme => "dlfcn",
shared_target => "irix-shared",
shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
},
#### IRIX 6.x configs
# Only N32 and N64 ABIs are supported. If you need O32 ABI build, invoke
# './Configure irix-cc -o32' manually.
# Only N32 and N64 ABIs are supported.
"irix-mips3-gcc" => {
inherit_from => [ "BASE_unix", asm("mips64_asm") ],
cc => "gcc",
cflags => combine(picker(default => "-mabi=n32 -DB_ENDIAN -DBN_DIV3W",
debug => "-g -O0",
release => "-O3"),
threads("-D_SGI_MP_SOURCE -pthread")),
threads("-D_SGI_MP_SOURCE")),
ex_libs => add(threads("-lpthread")),
bn_ops => "RC4_CHAR SIXTY_FOUR_BIT",
thread_scheme => "pthreads",
perlasm_scheme => "n32",
@ -375,6 +347,7 @@ sub vms_info {
debug => "-g -O0",
release => "-O3"),
threads("-D_SGI_MP_SOURCE")),
ex_libs => add(threads("-lpthread")),
bn_ops => "RC4_CHAR SIXTY_FOUR_BIT_LONG",
thread_scheme => "pthreads",
perlasm_scheme => "64",

3
apps/apps.h
View File

@ -112,6 +112,9 @@
# define HEADER_APPS_H
# include "e_os.h"
# if defined(__unix) || defined(__unix__)
# include <sys/time.h> /* struct timeval for DTLS */
# endif
# include <assert.h>
# include <openssl/e_os2.h>

12
config
View File

@ -134,10 +134,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
esac
;;
IRIX:5.*)
echo "mips2-sgi-irix"; exit 0
;;
IRIX:6.*)
echo "mips3-sgi-irix"; exit 0
;;
@ -461,14 +457,6 @@ case "$GUESSOS" in
uClinux*)
OUT=uClinux-dist
;;
mips2-sgi-irix)
CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
CPU=${CPU:-0}
if [ $CPU -ge 4000 ]; then
options="$options -mips2"
fi
OUT="irix-$CC"
;;
mips3-sgi-irix)
#CPU=`(hinv -t cpu) 2>/dev/null | head -1 | sed 's/^CPU:[^R]*R\([0-9]*\).*/\1/'`
#CPU=${CPU:-0}

3
ssl/ssl_locl.h
View File

@ -147,6 +147,9 @@
# include <errno.h>
# include "e_os.h"
# if defined(__unix) || defined(__unix__)
# include <sys/time.h> /* struct timeval for DTLS */
# endif
# include <openssl/buffer.h>
# include <openssl/comp.h>