diff options
| -rwxr-xr-x | admin/config.sub | 28 | ||||
| -rw-r--r-- | admin/libtool.m4.in | 42 | ||||
| -rwxr-xr-x | admin/libtool/config.sub | 28 | ||||
| -rw-r--r-- | admin/libtool/ltmain.sh | 1 | ||||
| -rw-r--r-- | admin/ltmain.sh | 8 |
5 files changed, 9 insertions, 98 deletions
diff --git a/admin/config.sub b/admin/config.sub index 0dc94cdf..b334b551 100755 --- a/admin/config.sub +++ b/admin/config.sub @@ -181,34 +181,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; diff --git a/admin/libtool.m4.in b/admin/libtool.m4.in index b3931bc9..167d2551 100644 --- a/admin/libtool.m4.in +++ b/admin/libtool.m4.in @@ -1316,19 +1316,6 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) rm -rf conftest* ;; -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; sparc*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext @@ -1552,9 +1539,6 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; - sco3.2v5*) - lt_cv_sys_max_cmd_len=102400 - ;; sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then @@ -2617,7 +2601,7 @@ sysv4*MP*) fi ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5* | unixware* | OpenUNIX* | sysv4*uw2*) version_type=freebsd-elf need_lib_prefix=no need_version=no @@ -2630,11 +2614,6 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' else sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' - case $host_os in - sco3.2v5*) - sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" - ;; - esac fi sys_lib_dlsearch_path_spec='/usr/lib' ;; @@ -3098,7 +3077,7 @@ solaris*) lt_cv_deplibs_check_method=pass_all ;; -sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) +sysv5* | unixware* | OpenUNIX* | sysv4*uw2*) lt_cv_deplibs_check_method=pass_all ;; @@ -3322,9 +3301,6 @@ irix* | nonstopux*) solaris*) symcode='[[BDRT]]' ;; -sco3.2v5*) - symcode='[[DT]]' - ;; sysv4.2uw2*) symcode='[[DT]]' ;; @@ -3777,7 +3753,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) case $cc_basename in CC*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' @@ -4039,7 +4015,7 @@ m4_if([$1], [CXX], [ fi ;; - sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' @@ -4419,7 +4395,7 @@ _LT_EOF fi ;; - sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + sysv5* | unixware* | OpenUNIX*) case `$LD -v 2>&1` in *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) _LT_TAGVAR(ld_shlibs, $1)=no @@ -4953,7 +4929,7 @@ _LT_EOF fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -4968,7 +4944,7 @@ _LT_EOF fi ;; - sysv5* | sco3.2v5* | sco5v6*) + sysv5*) # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would @@ -6075,7 +6051,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7*) _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' _LT_TAGVAR(archive_cmds_need_lc, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=no @@ -6093,7 +6069,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - sysv5* | sco3.2v5* | sco5v6*) + sysv5*) # Note: We can NOT use -z defs as we might desire, because we do not # link with -lc, and that would cause any symbols used from libc to # always be unresolved, which means just about no library would diff --git a/admin/libtool/config.sub b/admin/libtool/config.sub index 0dc94cdf..b334b551 100755 --- a/admin/libtool/config.sub +++ b/admin/libtool/config.sub @@ -181,34 +181,6 @@ case $os in -hiux*) os=-hiuxwe2 ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -udk*) basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; diff --git a/admin/libtool/ltmain.sh b/admin/libtool/ltmain.sh index 746841cd..2e31c825 100644 --- a/admin/libtool/ltmain.sh +++ b/admin/libtool/ltmain.sh @@ -2526,7 +2526,6 @@ EOF if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; *-*-darwin* ) # if the lib is a module then we can not link against # it, someone is ignoring the new warnings I added diff --git a/admin/ltmain.sh b/admin/ltmain.sh index 462c030c..af7606f9 100644 --- a/admin/ltmain.sh +++ b/admin/ltmain.sh @@ -4532,10 +4532,6 @@ func_mode_link () deplibs="$deplibs System.ltframework" continue ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - test "X$arg" = "X-lc" && continue - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work test "X$arg" = "X-lc" && continue @@ -5659,7 +5655,6 @@ func_mode_link () if test "$hardcode_direct" = no; then add="$dir/$linklib" case $host in - *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;; *-*-sysv4*uw2*) add_dir="-L$dir" ;; *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \ *-*-unixware7*) add_dir="-L$dir" ;; @@ -6461,9 +6456,6 @@ func_mode_link () *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) # Do not include libc due to us having libc/libc_r. ;; - *-*-sco3.2v5* | *-*-sco5v6*) - # Causes problems with __ctype - ;; *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*) # Compiler inserts libc in the correct place for threads to work ;; |