Skip to content

Commit fcf64ba

Browse files
author
Rich Salz
committed
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: Richard Levitte <[email protected]>
1 parent 9405a9a commit fcf64ba

File tree

17 files changed

+10
-362
lines changed

17 files changed

+10
-362
lines changed

‎CHANGES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
MPE/iX
3535
Sinix/ReliantUNIX RM400
3636
DGUX
37+
NCR
38+
Tandem
39+
Cray
3740
[Rich Salz]
3841

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

‎Configure

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -474,18 +474,11 @@ my %table=(
474474
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
475475
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
476476

477-
# NCR MP-RAS UNIX ver 02.03.01
478-
"ncr-scde","cc:-O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw::(unknown)::-lsocket -lnsl -lc89:${x86_gcc_des} ${x86_gcc_opts}:::",
479-
480477
# QNX
481478
"qnx4", "cc:-DL_ENDIAN -DTERMIO::(unknown):::${x86_gcc_des} ${x86_gcc_opts}:",
482479
"QNX6", "gcc:-DTERMIOS::::-lsocket::${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
483480
"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)",
484481

485-
# BeOS
486-
"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",
487-
"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",
488-
489482
#### SCO/Caldera targets.
490483
#
491484
# Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc.
@@ -515,32 +508,6 @@ my %table=(
515508
"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",
516509
"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",
517510

518-
#
519-
# Cray T90 and similar (SDSC)
520-
# It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT
521-
# defined. The T90 ints and longs are 8 bytes long, and apparently the
522-
# B_ENDIAN code assumes 4 byte ints. Fortunately, the non-B_ENDIAN and
523-
# non L_ENDIAN code aligns the bytes in each word correctly.
524-
#
525-
# The BIT_FIELD_LIMITS define is to avoid two fatal compiler errors:
526-
#'Taking the address of a bit field is not allowed. '
527-
#'An expression with bit field exists as the operand of "sizeof" '
528-
# (written by Wayne Schroeder <[email protected]>)
529-
#
530-
# j90 is considered the base machine type for unicos machines,
531-
# so this configuration is now called "cray-j90" ...
532-
"cray-j90", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown):CRAY::SIXTY_FOUR_BIT_LONG DES_INT:::",
533-
534-
#
535-
# Cray T3E (Research Center Juelich, [email protected])
536-
#
537-
# The BIT_FIELD_LIMITS define was written for the C90 (it seems). I added
538-
# another use. Basically, the problem is that the T3E uses some bit fields
539-
# for some st_addr stuff, and then sizeof and address-of fails
540-
# I could not use the ams/alpha.o option because the Cray assembler, 'cam'
541-
# did not like it.
542-
"cray-t3e", "cc: -DBIT_FIELD_LIMITS -DTERMIOS::(unknown):CRAY::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT:::",
543-
544511
# SIEMENS BS2000/OSD: an EBCDIC-based mainframe
545512
"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:::",
546513

@@ -656,9 +623,6 @@ my %table=(
656623
"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:",
657624
"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:",
658625

659-
##### Compaq Non-Stop Kernel (Tandem)
660-
"tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",
661-
662626
# uClinux
663627
"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'}::",
664628
"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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,17 +170,6 @@ link_a.gnu:
170170
link_app.gnu:
171171
@ $(DO_GNU_APP); $(LINK_APP)
172172

173-
DO_BEOS_SO= SHLIB=lib$(LIBNAME).so; \
174-
SHLIB_SUFFIX=; \
175-
ALLSYMSFLAGS='-Wl,--whole-archive'; \
176-
NOALLSYMSFLAGS='-Wl,--no-whole-archive'; \
177-
SHAREDFLAGS="$(CFLAGS) $(SHARED_LDFLAGS) -shared -Wl,-Bsymbolic -Wl,-soname=$$SHLIB$$SHLIB_SUFFIX"
178-
179-
link_o.beos:
180-
@ $(DO_BEOS_SO); $(LINK_SO_O)
181-
link_a.beos:
182-
@ $(DO_BEOS_SO); $(LINK_SO_A)
183-
184173
link_o.bsd:
185174
@if $(DETECT_GNU_LD); then $(DO_GNU_SO); else \
186175
$(CALC_VERSIONS); \
@@ -573,7 +562,7 @@ symlink.hpux:
573562
expr $(PLATFORM) : '.*ia64' > /dev/null && SHLIB=lib$(LIBNAME).so; \
574563
$(SYMLINK_SO)
575564
# The following lines means those specific architectures do no symlinks
576-
symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath symlink.beos:
565+
symlink.cygwin symlink.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
577566

578567
# Compatibility targets
579568
link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu

‎TABLE

Lines changed: 0 additions & 204 deletions
Original file line numberDiff line numberDiff line change
@@ -1156,74 +1156,6 @@ $ranlib =
11561156
$arflags =
11571157
$multilib =
11581158

1159-
*** beos-x86-bone
1160-
$cc = gcc
1161-
$cflags = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall
1162-
$unistd =
1163-
$thread_cflag = -D_REENTRANT
1164-
$sys_id = BEOS
1165-
$lflags = -lbe -lbind -lsocket
1166-
$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
1167-
$cpuid_obj = x86cpuid.o
1168-
$bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o
1169-
$ec_obj =
1170-
$des_obj = des-586.o crypt586.o
1171-
$aes_obj = aes-586.o vpaes-x86.o aesni-x86.o
1172-
$bf_obj = bf-586.o
1173-
$md5_obj = md5-586.o
1174-
$sha1_obj = sha1-586.o sha256-586.o sha512-586.o
1175-
$cast_obj = cast-586.o
1176-
$rc4_obj = rc4-586.o
1177-
$rmd160_obj = rmd-586.o
1178-
$rc5_obj = rc5-586.o
1179-
$wp_obj = wp_block.o wp-mmx.o
1180-
$cmll_obj = cmll-x86.o
1181-
$modes_obj = ghash-x86.o
1182-
$engines_obj = e_padlock-x86.o
1183-
$perlasm_scheme = elf
1184-
$dso_scheme = beos
1185-
$shared_target= beos-shared
1186-
$shared_cflag = -fPIC
1187-
$shared_ldflag = -shared
1188-
$shared_extension = .so
1189-
$ranlib =
1190-
$arflags =
1191-
$multilib =
1192-
1193-
*** beos-x86-r5
1194-
$cc = gcc
1195-
$cflags = -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall
1196-
$unistd =
1197-
$thread_cflag = -D_REENTRANT
1198-
$sys_id = BEOS
1199-
$lflags = -lbe -lnet
1200-
$bn_ops = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
1201-
$cpuid_obj = x86cpuid.o
1202-
$bn_obj = bn-586.o co-586.o x86-mont.o x86-gf2m.o
1203-
$ec_obj =
1204-
$des_obj = des-586.o crypt586.o
1205-
$aes_obj = aes-586.o vpaes-x86.o aesni-x86.o
1206-
$bf_obj = bf-586.o
1207-
$md5_obj = md5-586.o
1208-
$sha1_obj = sha1-586.o sha256-586.o sha512-586.o
1209-
$cast_obj = cast-586.o
1210-
$rc4_obj = rc4-586.o
1211-
$rmd160_obj = rmd-586.o
1212-
$rc5_obj = rc5-586.o
1213-
$wp_obj = wp_block.o wp-mmx.o
1214-
$cmll_obj = cmll-x86.o
1215-
$modes_obj = ghash-x86.o
1216-
$engines_obj = e_padlock-x86.o
1217-
$perlasm_scheme = elf
1218-
$dso_scheme = beos
1219-
$shared_target= beos-shared
1220-
$shared_cflag = -fPIC -DPIC
1221-
$shared_ldflag = -shared
1222-
$shared_extension = .so
1223-
$ranlib =
1224-
$arflags =
1225-
$multilib =
1226-
12271159
*** bsdi-elf-gcc
12281160
$cc = gcc
12291161
$cflags = -DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall
@@ -1292,74 +1224,6 @@ $ranlib =
12921224
$arflags =
12931225
$multilib =
12941226

1295-
*** cray-j90
1296-
$cc = cc
1297-
$cflags = -DBIT_FIELD_LIMITS -DTERMIOS
1298-
$unistd =
1299-
$thread_cflag = (unknown)
1300-
$sys_id = CRAY
1301-
$lflags =
1302-
$bn_ops = SIXTY_FOUR_BIT_LONG DES_INT
1303-
$cpuid_obj =
1304-
$bn_obj =
1305-
$ec_obj =
1306-
$des_obj =
1307-
$aes_obj =
1308-
$bf_obj =
1309-
$md5_obj =
1310-
$sha1_obj =
1311-
$cast_obj =
1312-
$rc4_obj =
1313-
$rmd160_obj =
1314-
$rc5_obj =
1315-
$wp_obj =
1316-
$cmll_obj =
1317-
$modes_obj =
1318-
$engines_obj =
1319-
$perlasm_scheme =
1320-
$dso_scheme =
1321-
$shared_target=
1322-
$shared_cflag =
1323-
$shared_ldflag =
1324-
$shared_extension =
1325-
$ranlib =
1326-
$arflags =
1327-
$multilib =
1328-
1329-
*** cray-t3e
1330-
$cc = cc
1331-
$cflags = -DBIT_FIELD_LIMITS -DTERMIOS
1332-
$unistd =
1333-
$thread_cflag = (unknown)
1334-
$sys_id = CRAY
1335-
$lflags =
1336-
$bn_ops = SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT
1337-
$cpuid_obj =
1338-
$bn_obj =
1339-
$ec_obj =
1340-
$des_obj =
1341-
$aes_obj =
1342-
$bf_obj =
1343-
$md5_obj =
1344-
$sha1_obj =
1345-
$cast_obj =
1346-
$rc4_obj =
1347-
$rmd160_obj =
1348-
$rc5_obj =
1349-
$wp_obj =
1350-
$cmll_obj =
1351-
$modes_obj =
1352-
$engines_obj =
1353-
$perlasm_scheme =
1354-
$dso_scheme =
1355-
$shared_target=
1356-
$shared_cflag =
1357-
$shared_ldflag =
1358-
$shared_extension =
1359-
$ranlib =
1360-
$arflags =
1361-
$multilib =
1362-
13631227
*** darwin-i386-cc
13641228
$cc = cc
13651229
$cflags = -arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN
@@ -5134,40 +4998,6 @@ $ranlib =
51344998
$arflags =
51354999
$multilib =
51365000

5137-
*** ncr-scde
5138-
$cc = cc
5139-
$cflags = -O6 -Xa -Hoff=BEHAVED -686 -Hwide -Hiw
5140-
$unistd =
5141-
$thread_cflag = (unknown)
5142-
$sys_id =
5143-
$lflags = -lsocket -lnsl -lc89
5144-
$bn_ops = DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT
5145-
$cpuid_obj =
5146-
$bn_obj =
5147-
$ec_obj =
5148-
$des_obj =
5149-
$aes_obj =
5150-
$bf_obj =
5151-
$md5_obj =
5152-
$sha1_obj =
5153-
$cast_obj =
5154-
$rc4_obj =
5155-
$rmd160_obj =
5156-
$rc5_obj =
5157-
$wp_obj =
5158-
$cmll_obj =
5159-
$modes_obj =
5160-
$engines_obj =
5161-
$perlasm_scheme =
5162-
$dso_scheme =
5163-
$shared_target=
5164-
$shared_cflag =
5165-
$shared_ldflag =
5166-
$shared_extension =
5167-
$ranlib =
5168-
$arflags =
5169-
$multilib =
5170-
51715001
*** netware-clib
51725002
$cc = mwccnlm
51735003
$cflags =
@@ -6120,40 +5950,6 @@ $ranlib =
61205950
$arflags =
61215951
$multilib = /64
61225952

6123-
*** tandem-c89
6124-
$cc = c89
6125-
$cflags = -Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN
6126-
$unistd =
6127-
$thread_cflag = (unknown)
6128-
$sys_id =
6129-
$lflags =
6130-
$bn_ops = THIRTY_TWO_BIT
6131-
$cpuid_obj =
6132-
$bn_obj =
6133-
$ec_obj =
6134-
$des_obj =
6135-
$aes_obj =
6136-
$bf_obj =
6137-
$md5_obj =
6138-
$sha1_obj =
6139-
$cast_obj =
6140-
$rc4_obj =
6141-
$rmd160_obj =
6142-
$rc5_obj =
6143-
$wp_obj =
6144-
$cmll_obj =
6145-
$modes_obj =
6146-
$engines_obj =
6147-
$perlasm_scheme =
6148-
$dso_scheme =
6149-
$shared_target=
6150-
$shared_cflag =
6151-
$shared_ldflag =
6152-
$shared_extension =
6153-
$ranlib =
6154-
$arflags =
6155-
$multilib =
6156-
61575953
*** tru64-alpha-cc
61585954
$cc = cc
61595955
$cflags = -std1 -tune host -fast -readonly_strings

‎config

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -335,18 +335,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
335335
exit 0
336336
;;
337337

338-
*"CRAY T3E")
339-
echo "t3e-cray-unicosmk"; exit 0;
340-
;;
341-
342-
*CRAY*)
343-
echo "j90-cray-unicos"; exit 0;
344-
;;
345-
346-
NONSTOP_KERNEL*)
347-
echo "nsr-tandem-nsk"; exit 0;
348-
;;
349-
350338
vxworks*)
351339
echo "${MACHINE}-whatever-vxworks"; exit 0;
352340
;;
@@ -827,9 +815,6 @@ case "$GUESSOS" in
827815
# these are all covered by the catchall below
828816
*-*-cygwin_pre1.3) OUT="Cygwin-pre1.3" ;;
829817
*-*-cygwin) OUT="Cygwin" ;;
830-
t3e-cray-unicosmk) OUT="cray-t3e" ;;
831-
j90-cray-unicos) OUT="cray-j90" ;;
832-
nsr-tandem-nsk) OUT="tandem-c89" ;;
833818
x86pc-*-qnx6) OUT="QNX6-i386" ;;
834819
*-*-qnx6) OUT="QNX6" ;;
835820
x86-*-android|i?86-*-android) OUT="android-x86" ;;

‎crypto/bf/blowfish.h

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,16 +81,9 @@ extern "C" {
8181

8282
#if defined(__LP32__)
8383
#define BF_LONG unsigned long
84-
#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
84+
#elif defined(__ILP64__)
8585
#define BF_LONG unsigned long
8686
#define BF_LONG_LOG2 3
87-
/*
88-
* _CRAY note. I could declare short, but I have no idea what impact
89-
* does it have on performance on none-T3E machines. I could declare
90-
* int, but at least on C90 sizeof(int) can be chosen at compile time.
91-
* So I've chosen long...
92-
* <[email protected]>
93-
*/
9487
#else
9588
#define BF_LONG unsigned int
9689
#endif

0 commit comments

Comments
 (0)