From 2a2fa04b7b241a154cc0efd354974edf3aff7403 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Sun, 26 Jun 2005 18:10:20 +0000 Subject: [PATCH] Unify some SCO targets [from HEAD]. --- Configure | 4 +--- TABLE | 56 +------------------------------------------------------ config | 14 ++++++-------- 3 files changed, 8 insertions(+), 66 deletions(-) diff --git a/Configure b/Configure index 49c6f18470..de5366b723 100755 --- a/Configure +++ b/Configure @@ -396,9 +396,7 @@ my %table=( "unixware-2.0","cc:-DFILIO_H -DNO_STRINGS_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::", "unixware-2.1","cc:-O -DFILIO_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::", "unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=i486 -Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"OpenUNIX-8","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", -"OpenUNIX-8-gcc","gcc:-O -DFILIO_H -fomit-frame-pointer::-pthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}:${x86_elf_asm}:dlfcn:svr5-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", +"unixware-7-gcc","gcc:-DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall::-D_REENTRANT::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:gnu-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", # SCO 5 - Ben Laurie says the -O breaks the SCO cc. "sco5-cc", "cc:-belf::(unknown)::-lsocket -lnsl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:svr3-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", "sco5-gcc", "gcc:-O3 -fomit-frame-pointer::(unknown)::-lsocket -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:svr3-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", diff --git a/TABLE b/TABLE index 3182f448fc..bf0a1542bf 100644 --- a/TABLE +++ b/TABLE @@ -432,60 +432,6 @@ $shared_extension = $ranlib = $arflags = -*** OpenUNIX-8 -$cc = cc -$cflags = -O -DFILIO_H -Kalloca -$unistd = -$thread_cflag = -Kthread -$sys_id = -$lflags = -lsocket -lnsl -$bn_ops = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL -$cpuid_obj = x86cpuid-elf.o -$bn_obj = bn86-elf.o co86-elf.o -$des_obj = dx86-elf.o yx86-elf.o -$aes_obj = ax86-elf.o -$bf_obj = bx86-elf.o -$md5_obj = mx86-elf.o -$sha1_obj = sx86-elf.o s512sse2-elf.o -$cast_obj = cx86-elf.o -$rc4_obj = rx86-elf.o -$rmd160_obj = rm86-elf.o -$rc5_obj = r586-elf.o -$dso_scheme = dlfcn -$shared_target= svr5-shared -$shared_cflag = -Kpic -$shared_ldflag = -$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) -$ranlib = -$arflags = - -*** OpenUNIX-8-gcc -$cc = gcc -$cflags = -O -DFILIO_H -fomit-frame-pointer -$unistd = -$thread_cflag = -pthread -$sys_id = -$lflags = -lsocket -lnsl -$bn_ops = BN_LLONG MD2_CHAR RC4_INDEX DES_PTR DES_RISC1 DES_UNROLL -$cpuid_obj = x86cpuid-elf.o -$bn_obj = bn86-elf.o co86-elf.o -$des_obj = dx86-elf.o yx86-elf.o -$aes_obj = ax86-elf.o -$bf_obj = bx86-elf.o -$md5_obj = mx86-elf.o -$sha1_obj = sx86-elf.o s512sse2-elf.o -$cast_obj = cx86-elf.o -$rc4_obj = rx86-elf.o -$rmd160_obj = rm86-elf.o -$rc5_obj = r586-elf.o -$dso_scheme = dlfcn -$shared_target= svr5-shared -$shared_cflag = -fPIC -$shared_ldflag = -$shared_extension = .so.$(SHLIB_MAJOR).$(SHLIB_MINOR) -$ranlib = -$arflags = - *** ReliantUNIX $cc = cc $cflags = -KPIC -g -DTERMIOS -DB_ENDIAN @@ -3971,7 +3917,7 @@ $arflags = *** unixware-7-gcc $cc = gcc -$cflags = -DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=i486 -Wall +$cflags = -DL_ENDIAN -DFILIO_H -O3 -fomit-frame-pointer -march=pentium -Wall $unistd = $thread_cflag = -D_REENTRANT $sys_id = diff --git a/config b/config index 89fa0b3e23..7008a1a659 100755 --- a/config +++ b/config @@ -84,7 +84,7 @@ if [ "x$XREL" != "x" ]; then 4.2) echo "whatever-whatever-unixware1"; exit 0 ;; - 5) + 5*) case "x${VERSION}" in # We hardcode i586 in place of ${MACHINE} for the # following reason. The catch is that even though Pentium @@ -93,8 +93,7 @@ if [ "x$XREL" != "x" ]; then # with i386 is that it makes ./config pass 386 to # ./Configure, which in turn makes make generate # inefficient SHA-1 (for this moment) code. - x7*) echo "i586-sco-unixware7"; exit 0 ;; - x8*) echo "i586-unkn-OpenUNIX${VERSION}"; exit 0 ;; + x[678]*) echo "i586-sco-unixware7"; exit 0 ;; esac ;; esac @@ -654,7 +653,7 @@ case "$GUESSOS" in ;; *-*-sunos4) OUT="sunos-$CC" ;; - *86*-*-bsdi4) OUT="bsdi-elf-gcc"; options="$options no-sse2" ;; + *86*-*-bsdi4) OUT="BSD-x86-elf"; options="$options no-sse2 -ldl" ;; alpha*-*-*bsd*) OUT="BSD-generic64; options="$options -DL_ENDIAN" ;; powerpc64-*-*bsd*) OUT="BSD-generic64; options="$options -DB_ENDIAN" ;; sparc64-*-*bsd*) OUT="BSD-sparc64" ;; @@ -675,14 +674,13 @@ case "$GUESSOS" in *-*-osf) OUT="osf1-alpha-cc" ;; *-*-tru64) OUT="tru64-alpha-cc" ;; - *-*-OpenUNIX*) + *-*-[Uu]nix[Ww]are7) if [ "$CC" = "gcc" ]; then - OUT="OpenUNIX-8-gcc" + OUT="unixware-7-gcc" ; options="$options no-sse2" else - OUT="OpenUNIX-8" + OUT="unixware-7" ; options="$options no-sse2 -D__i386__" fi ;; - *-*-[Uu]nix[Ww]are7) OUT="unixware-7"; options="$options no-sse2" ;; *-*-[Uu]nix[Ww]are20*) OUT="unixware-2.0"; options="$options no-sse2 no-sha512" ;; *-*-[Uu]nix[Ww]are21*) OUT="unixware-2.1"; options="$options no-sse2 no-sha512" ;; *-*-vos) -- 2.40.0