Commit fcf64ba0 authored by Rich Salz's avatar Rich Salz
Browse files

RT3548: Remove some unsupported platforms. 



This commit removes NCR, Tandem, Cray.
Regenerates TABLE.
Removes another missing BEOS fluff.
The last platform remaining on this ticket is WIN16.

Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 9405a9a2

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 
	MPE/iX

	Sinix/ReliantUNIX RM400

	DGUX

	NCR

	Tandem

	Cray

     [Rich Salz]



  *) Experimental support for a new, fast, unbiased prime candidate generator,

Configure

+0 −36
Original line number Diff line number Diff line
@@ -474,18 +474,11 @@ my %table=( 
"nextstep",	"cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",

"nextstep3.3",	"cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",



# NCR MP-RAS UNIX ver 02.03.01

"ncr-scde","cc:-O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw::(unknown)::-lsocket -lnsl -lc89:${x86_gcc_des} ${x86_gcc_opts}:::",



# QNX

"qnx4",	"cc:-DL_ENDIAN -DTERMIO::(unknown):::${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)",



# BeOS

"beos-x86-r5",   "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so",

"beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so",



#### SCO/Caldera targets.

#

# Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.
@@ -515,32 +508,6 @@ my %table=( 
"aix-cc",   "cc:-q32 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded -D_THREAD_SAFE:AIX::BN_LLONG RC4_CHAR:$ppc32_asm:aix32:dlfcn:aix-shared::-q32 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 32",

"aix64-cc", "cc:-q64 -O -DB_ENDIAN -qmaxmem=16384 -qro -qroconst::-qthreaded -D_THREAD_SAFE:AIX::SIXTY_FOUR_BIT_LONG RC4_CHAR:$ppc64_asm:aix64:dlfcn:aix-shared::-q64 -G:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)::-X 64",



#

# Cray T90 and similar (SDSC)

# It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT

# defined.  The T90 ints and longs are 8 bytes long, and apparently the

# B_ENDIAN code assumes 4 byte ints.  Fortunately, the non-B_ENDIAN and

# non L_ENDIAN code aligns the bytes in each word correctly.

#

# The BIT_FIELD_LIMITS define is to avoid two fatal compiler errors:

#'Taking the address of a bit field is not allowed. '

#'An expression with bit field exists as the operand of "sizeof" '

# (written by Wayne Schroeder <schroede@SDSC.EDU>)

#

# j90 is considered the base machine type for unicos machines,

# so this configuration is now called "cray-j90" ...

"cray-j90", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown):CRAY::SIXTY_FOUR_BIT_LONG DES_INT:::",



#

# Cray T3E (Research Center Juelich, beckman@acl.lanl.gov)

#

# The BIT_FIELD_LIMITS define was written for the C90 (it seems).  I added

# another use.  Basically, the problem is that the T3E uses some bit fields

# for some st_addr stuff, and then sizeof and address-of fails

# I could not use the ams/alpha.o option because the Cray assembler, 'cam'

# did not like it.

"cray-t3e", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown):CRAY::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:::",



# SIEMENS BS2000/OSD: an EBCDIC-based mainframe

"BS2000-OSD","c89:-O -XLLML -XLLMK -XL -DB_ENDIAN -DTERMIOS -DCHARSET_EBCDIC::(unknown)::-lsocket -lnsl:THIRTY_TWO_BIT DES_PTR DES_UNROLL MD2_CHAR RC4_INDEX RC4_CHAR BF_PTR:::",
@@ -656,9 +623,6 @@ my %table=( 
"vxworks-simlinux","ccpentium:-B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DL_ENDIAN -DCPU=SIMLINUX -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/h -I\$(WIND_BASE)/target/h/wrn/coreip -DOPENSSL_NO_HW_PADLOCK:::VXWORKS:-r::${no_asm}::::::ranlibpentium:",

"vxworks-mips","ccmips:-mrtp -mips2 -O -G 0 -B\$(WIND_BASE)/host/\$(WIND_HOST_TYPE)/lib/gcc-lib/ -D_VSB_CONFIG_FILE=\"\$(WIND_BASE)/target/lib/h/config/vsbConfig.h\" -DCPU=MIPS32 -msoft-float -mno-branch-likely -DTOOL_FAMILY=gnu -DTOOL=gnu -fno-builtin -fno-defer-pop -DNO_STRINGS_H -I\$(WIND_BASE)/target/usr/h -I\$(WIND_BASE)/target/h/wrn/coreip::-D_REENTRANT:VXWORKS:-Wl,--defsym,__wrs_rtp_base=0xe0000000 -L \$(WIND_BASE)/target/usr/lib/mips/MIPSI32/sfcommon::${mips32_asm}:o32::::::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:::",



# uClinux

"uClinux-dist","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):BN_LLONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",

"uClinux-dist64","$ENV{'CC'}:\$(CFLAGS)::-D_REENTRANT::\$(LDFLAGS) \$(LDLIBS):SIXTY_FOUR_BIT_LONG:${no_asm}:$ENV{'LIBSSL_dlfcn'}:linux-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR):$ENV{'RANLIB'}::",

Makefile.shared

+1 −12
Original line number Diff line number Diff line
@@ -170,17 +170,6 @@ link_a.gnu: 
link_app.gnu:

	@ $(DO_GNU_APP); $(LINK_APP)



DO_BEOS_SO=	SHLIB=lib$(LIBNAME).so; \

	SHLIB_SUFFIX=; \

	ALLSYMSFLAGS='-Wl,--whole-archive'; \

	NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \

	SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SUFFIX"



link_o.beos:

	@ $(DO_BEOS_SO); $(LINK_SO_O)

link_a.beos:

	@ $(DO_BEOS_SO); $(LINK_SO_A)



link_o.bsd:

	@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \

	$(CALC_VERSIONS); \
@@ -573,7 +562,7 @@ symlink.hpux: 
	expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \

	$(SYMLINK_SO)

# The following lines means those specific architectures do no symlinks

symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:

symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:



# Compatibility targets

link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu

TABLE

+0 −204
Original line number Diff line number Diff line
@@ -1156,74 +1156,6 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** beos-x86-bone

$cc           = gcc

$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = BEOS

$lflags       = -lbe -lbind -lsocket

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$ec_obj       = 

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$cast_obj     = cast-586.o

$rc4_obj      = rc4-586.o

$rmd160_obj   = rmd-586.o

$rc5_obj      = rc5-586.o

$wp_obj       = wp_block.o wp-mmx.o

$cmll_obj     = cmll-x86.o

$modes_obj    = ghash-x86.o

$engines_obj  = e_padlock-x86.o

$perlasm_scheme = elf

$dso_scheme   = beos

$shared_target= beos-shared

$shared_cflag = -fPIC

$shared_ldflag = -shared

$shared_extension = .so

$ranlib       = 

$arflags      = 

$multilib     = 



*** beos-x86-r5

$cc           = gcc

$cflags       = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall

$unistd       = 

$thread_cflag = -D_REENTRANT

$sys_id       = BEOS

$lflags       = -lbe -lnet

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$cpuid_obj    = x86cpuid.o

$bn_obj       = bn-586.o co-586.o x86-mont.o x86-gf2m.o

$ec_obj       = 

$des_obj      = des-586.o crypt586.o

$aes_obj      = aes-586.o vpaes-x86.o aesni-x86.o

$bf_obj       = bf-586.o

$md5_obj      = md5-586.o

$sha1_obj     = sha1-586.o sha256-586.o sha512-586.o

$cast_obj     = cast-586.o

$rc4_obj      = rc4-586.o

$rmd160_obj   = rmd-586.o

$rc5_obj      = rc5-586.o

$wp_obj       = wp_block.o wp-mmx.o

$cmll_obj     = cmll-x86.o

$modes_obj    = ghash-x86.o

$engines_obj  = e_padlock-x86.o

$perlasm_scheme = elf

$dso_scheme   = beos

$shared_target= beos-shared

$shared_cflag = -fPIC -DPIC

$shared_ldflag = -shared

$shared_extension = .so

$ranlib       = 

$arflags      = 

$multilib     = 



*** bsdi-elf-gcc

$cc           = gcc

$cflags       = -DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
@@ -1292,74 +1224,6 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** cray-j90

$cc           = cc

$cflags       = -DBIT_FIELD_LIMITS -DTERMIOS

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = CRAY

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG DES_INT

$cpuid_obj    = 

$bn_obj       = 

$ec_obj       = 

$des_obj      = 

$aes_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 

$multilib     = 



*** cray-t3e

$cc           = cc

$cflags       = -DBIT_FIELD_LIMITS -DTERMIOS

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = CRAY

$lflags       = 

$bn_ops       = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT

$cpuid_obj    = 

$bn_obj       = 

$ec_obj       = 

$des_obj      = 

$aes_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 

$multilib     = 



*** darwin-i386-cc

$cc           = cc

$cflags       = -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN
@@ -5134,40 +4998,6 @@ $ranlib = 
$arflags      = 

$multilib     = 



*** ncr-scde

$cc           = cc

$cflags       = -O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = 

$lflags       = -lsocket -lnsl -lc89

$bn_ops       = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$cpuid_obj    = 

$bn_obj       = 

$ec_obj       = 

$des_obj      = 

$aes_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 

$multilib     = 



*** netware-clib

$cc           = mwccnlm

$cflags       =
@@ -6120,40 +5950,6 @@ $ranlib = 
$arflags      = 

$multilib     = /64



*** tandem-c89

$cc           = c89

$cflags       = -Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN

$unistd       = 

$thread_cflag = (unknown)

$sys_id       = 

$lflags       = 

$bn_ops       = THIRTY_TWO_BIT

$cpuid_obj    = 

$bn_obj       = 

$ec_obj       = 

$des_obj      = 

$aes_obj      = 

$bf_obj       = 

$md5_obj      = 

$sha1_obj     = 

$cast_obj     = 

$rc4_obj      = 

$rmd160_obj   = 

$rc5_obj      = 

$wp_obj       = 

$cmll_obj     = 

$modes_obj    = 

$engines_obj  = 

$perlasm_scheme = 

$dso_scheme   = 

$shared_target= 

$shared_cflag = 

$shared_ldflag = 

$shared_extension = 

$ranlib       = 

$arflags      = 

$multilib     = 



*** tru64-alpha-cc

$cc           = cc

$cflags       = -std1 -tune host -fast -readonly_strings

config

+0 −15
Original line number Diff line number Diff line
@@ -335,18 +335,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in 
	exit 0

	;;



    *"CRAY T3E")

       echo "t3e-cray-unicosmk"; exit 0;

       ;;



    *CRAY*)

       echo "j90-cray-unicos"; exit 0;

       ;;



    NONSTOP_KERNEL*)

       echo "nsr-tandem-nsk"; exit 0;

       ;;



    vxworks*)

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

       ;;
@@ -827,9 +815,6 @@ case "$GUESSOS" in 
  # these are all covered by the catchall below

  *-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;

  *-*-cygwin) OUT="Cygwin" ;;

  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" ;;

  x86-*-android|i?86-*-android) OUT="android-x86" ;;