Changeset 1103


Ignore:
Timestamp:
Jan 29, 2004, 7:37:01 PM (22 years ago)
Author:
bird
Message:

Synced with binutils.

Location:
trunk/src/gcc
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/gcc/libtool.m4

    • Property cvs2svn:cvs-rev changed from 1.3 to 1.4
    r1102 r1103  
    145145  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
    146146  if AC_TRY_EVAL(ac_compile); then
     147   if test "$lt_cv_prog_gnu_ld" = yes; then
     148    case `/usr/bin/file conftest.$ac_objext` in
     149    *32-bit*)
     150      LD="${LD-ld} -melf32bsmip"
     151      ;;
     152    *N32*)
     153      LD="${LD-ld} -melf32bmipn32"
     154      ;;
     155    *64-bit*)
     156      LD="${LD-ld} -melf64bmip"
     157      ;;
     158    esac
     159   else
    147160    case `/usr/bin/file conftest.$ac_objext` in
    148161    *32-bit*)
    … …  
    154167    *64-bit*)
    155168      LD="${LD-ld} -64"
     169      ;;
     170    esac
     171   fi
     172  fi
     173  rm -rf conftest*
     174  ;;
     175
     176ia64-*-hpux*)
     177  # Find out which ABI we are using.
     178  echo 'int i;' > conftest.$ac_ext
     179  if AC_TRY_EVAL(ac_compile); then
     180    case "`/usr/bin/file conftest.o`" in
     181    *ELF-32*)
     182      HPUX_IA64_MODE="32"
     183      ;;
     184    *ELF-64*)
     185      HPUX_IA64_MODE="64"
    156186      ;;
    157187    esac
    … …  
    569599
    570600hpux10.20*|hpux11*)
    571   lt_cv_deplibs_check_method=['file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
     601  case $host_cpu in
     602  hppa*)
     603    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library']
    572604  lt_cv_file_magic_cmd=/usr/bin/file
    573605  lt_cv_file_magic_test_file=/usr/lib/libc.sl
     606    ;;
     607  ia64*)
     608    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64']
     609    lt_cv_file_magic_cmd=/usr/bin/file
     610    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     611  ;;
     612  esac
    574613  ;;
    575614
    … …  
    598637linux-gnu*)
    599638  case $host_cpu in
    600   alpha* | hppa* | i*86 | powerpc* | sparc* | ia64* )
     639  alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* )
    601640    lt_cv_deplibs_check_method=pass_all ;;
    602641  *)
    … …  
    629668  lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
    630669  lt_cv_file_magic_test_file=/shlib/libc.so
    631   lt_cv_deplibs_check_method=pass_all
    632   ;;
    633 
    634 os2*)
    635670  lt_cv_deplibs_check_method=pass_all
    636671  ;;

  • trunk/src/gcc/ltcf-c.sh

    • Property cvs2svn:cvs-rev changed from 1.4 to 1.5
    r1102 r1103  
    109109      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~
    110110      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
    111       if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
     111      if test "x$BUILD_CC" != "x" ; then $BUILD_CC -o impgen impgen.c ; \
    112112      else $CC -o impgen impgen.c ; fi)~
    113113      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
    … …  
    418418
    419419  hpux9* | hpux10* | hpux11*)
     420    case "$host_cpu" in
     421    ia64*)
     422      hardcode_direct=no
     423      hardcode_shlibpath_var=no
     424      archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
     425      hardcode_libdir_flag_spec='-L$libdir' ;;
     426    *)
    420427    if test $with_gcc = yes; then
    421428      case "$host_os" in
    … …  
    431438    hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
    432439    hardcode_libdir_separator=:
    433     hardcode_direct=yes
    434440    hardcode_minus_L=yes # Not in the search PATH, but as the default
    435441                         # location of the library.
     442      ;;
     443    esac
    436444    export_dynamic_flag_spec='${wl}-E'
     445    hardcode_direct=yes
    437446    ;;
    438447
    … …  
    481490  allow_undefined_flag=no
    482491  archive_cmds='$echo "LIBRARY $soname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
    483   # contains GCC_OMF hack.
    484   old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def~emximp -p128 -o $output_objdir/$libname.lib $output_objdir/$libname.def~if test -n $GCC_OMF;then mv -f $output_objdir/$libname.lib $output_objdir/$libname.a; fi'
     492  old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
    485493    ;;
    486494

  • trunk/src/gcc/ltcf-cxx.sh

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r1102 r1103  
    33# ltcf-cxx.sh - Create a C++ compiler specific configuration
    44#
    5 # Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
     5# Copyright (C) 1996-1999, 2000, 2001, 2003 Free Software Foundation, Inc.
    66# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    77#
    … …  
    6969
    7070  # Check if GNU C++ uses GNU ld as the underlying linker, since the
    71   # archiving commands below assume that GNU ld is being used.
    72   if eval "`$CC -print-prog-name=ld` --version 2>&1" | \
    73       egrep 'GNU ld' > /dev/null; then
    74     with_gnu_ld=yes
    75 
     71  # archiving commands below assume that GNU ld is being used.  The
     72  # assumption here is that the linker is going to be the same as that
     73  # used by the C compiler.  For the purposes of GCC, this is ok, but
     74  # if someone uses g++ along with a non-GNU C compiler that doesn't
     75  # use GNU ld, we may lose.  This is ok for the toolchain tree, since
     76  # the only users of ltcf-cxx.sh are libstdc++-v3 and libjava,
     77  # anyway, and those use both gcc and g++, so the settings are bound
     78  # to be the same.
     79
     80  if test "$with_gnu_ld" = yes; then
    7681    archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
    7782    archive_expsym_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
    … …  
    9398    fi
    9499  else
    95     with_gnu_ld=no
    96100    wlarc=
    97101
    … …  
    111115else
    112116  with_gcc=no
    113   with_gnu_ld=no
    114117  wlarc=
    115118fi
    … …  
    251254  hpux*)
    252255    if test $with_gnu_ld = no; then
    253       hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
     256      case "$host_cpu" in
     257        ia64*)
     258          hardcode_libdir_flag_spec='-L$libdir'
     259          hardcode_shlibpath_var=no ;;
     260        *)
     261          hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' ;;
     262      esac
     263      hardcode_direct=yes
    254264      hardcode_libdir_separator=:
    255265      export_dynamic_flag_spec='${wl}-E'
    256266    fi
    257     hardcode_direct=yes
    258267    hardcode_minus_L=yes # Not in the search PATH, but as the default
    259268                         # location of the library.
    … …  
    284293            case "$host_os" in
    285294            hpux9*) archive_cmds='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ;;
    286             *) archive_cmds='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
     295            *)
     296              case "$host_cpu" in
     297                ia64*)
     298                  archive_cmds='$LD -b +h $soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ;;
     299                *)
     300                  archive_cmds='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ;;
     301              esac
     302              ;;
    287303            esac
    288304          fi
    … …  
    311327            archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
    312328          else
    313             archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
     329            archive_cmds='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -o $lib'
    314330          fi
    315331        fi
    … …  
    498514          allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
    499515          archive_cmds='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
    500          
     516       
    501517          hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
    502518          hardcode_libdir_separator=:
    503          
     519       
    504520          # Commands to make compiler produce verbose output that lists
    505521          # what "hidden" libraries, object files and flags are used when
    … …  
    598614          no_undefined_flag=' ${wl}-z ${wl}defs'
    599615          if $CC --version | egrep -v '^2\.7' > /dev/null; then
    600             archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
     616            archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
    601617            archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    602                 $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags~$rm $lib.exp'
     618                $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
    603619
    604620            # Commands to make compiler produce verbose output that lists
    … …  
    609625            # g++ 2.7 appears to require `-G' NOT `-shared' on this
    610626            # platform.
    611             archive_cmds='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
     627            archive_cmds='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
    612628            archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    613                 $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags~$rm $lib.exp'
     629                $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
    614630
    615631            # Commands to make compiler produce verbose output that lists

  • trunk/src/gcc/ltcf-gcj.sh

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r1102 r1103  
    33# ltcf-gcj.sh - Create a GCJ compiler specific configuration
    44#
    5 # Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc.
     5# Copyright (C) 1996-1999, 2000, 2001, 2003 Free Software Foundation, Inc.
    66# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
    77#
    … …  
    112112      sed -e "/^# \/\* impgen\.c starts here \*\//,/^# \/\* impgen.c ends here \*\// { s/^# //; p; }" -e d < $0 > $output_objdir/impgen.c~
    113113      test -f $output_objdir/impgen.exe || (cd $output_objdir && \
    114       if test "x$HOST_CC" != "x" ; then $HOST_CC -o impgen impgen.c ; \
     114      if test "x$BUILD_CC" != "x" ; then $BUILD_CC -o impgen impgen.c ; \
    115115      else $CC -o impgen impgen.c ; fi)~
    116116      $output_objdir/impgen $dir/$soroot > $output_objdir/$soname-def'
    … …  
    493493  solaris*)
    494494    no_undefined_flag=' ${wl}-z ${wl}defs'
    495     archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $linker_flags ${wl}-h $wl$soname -o $lib'
     495    archive_cmds='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
    496496    archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
    497       $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags~$rm $lib.exp'
     497      $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
    498498
    499499    # Commands to make compiler produce verbose output that lists

  • trunk/src/gcc/ltconfig

    • Property cvs2svn:cvs-rev changed from 1.5 to 1.6
    r1102 r1103  
    11561156  # Give a soname corresponding to the major version so that dld.sl refuses to
    11571157  # link against other versions.
    1158   dynamic_linker="$host_os dld.sl"
    11591158  version_type=sunos
    11601159  need_lib_prefix=no
    11611160  need_version=no
     1161  case "$host_cpu" in
     1162  ia64*)
     1163    dynamic_linker="$host_os dld.so"
     1164    shlibpath_var=LD_LIBRARY_PATH
     1165    library_names_spec='${libname}${release}.so$versuffix ${libname}${release}.so$major $libname.so'
     1166    soname_spec='${libname}${release}.so$major'
     1167    shlibpath_var=LD_LIBRARY_PATH
     1168    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
     1169    if test "X$HPUX_IA64_MODE" = X32; then
     1170      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32/usr/local/lib"
     1171    else
     1172      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
     1173    fi
     1174    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
     1175    ;;
     1176  *)
     1177    dynamic_linker="$host_os dld.sl"
    11621178  shlibpath_var=SHLIB_PATH
    11631179  shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
    11641180  library_names_spec='${libname}${release}.sl$versuffix ${libname}${release}.sl$major $libname.sl'
    11651181  soname_spec='${libname}${release}.sl$major'
     1182    ;;
     1183  esac
    11661184  # HP-UX runs *really* slowly unless shared libraries are mode 555.
    11671185  postinstall_cmds='chmod 555 $lib'
    … …  
    11691187
    11701188irix5* | irix6*)
     1189  if test "$with_gnu_ld" = yes; then
     1190    version_type=linux
     1191  else
     1192  version_type=irix
     1193  fi
    11711194  version_type=irix
    11721195  need_lib_prefix=no
    … …  
    11801203  *)
    11811204    case $LD in # libtool.m4 will add one of these switches to LD
    1182     *-32|*"-32 ") libsuff= shlibsuff= libmagic=32-bit;;
    1183     *-n32|*"-n32 ") libsuff=32 shlibsuff=N32 libmagic=N32;;
    1184     *-64|*"-64 ") libsuff=64 shlibsuff=64 libmagic=64-bit;;
     1205    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
     1206      libsuff= shlibsuff= libmagic=32-bit;;
     1207    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
     1208      libsuff=32 shlibsuff=N32 libmagic=N32;;
     1209    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
     1210      libsuff=64 shlibsuff=64 libmagic=64-bit;;
    11851211    *) libsuff= shlibsuff= libmagic=never-match;;
    11861212    esac
    … …  
    12621288  need_version=no
    12631289  need_lib_prefix=no
    1264   # embedd hex versionnumbers into the name as far as there is space for such.
     1290  # embedd versionnumbers into the name as far as there is space for such.
    12651291  # old: libname_spec='$name'
    12661292  # old: library_names_spec='$libname.dll $libname.a'

  • trunk/src/gcc/ltmain.sh

    • Property cvs2svn:cvs-rev changed from 1.1 to 1.2
    r1102 r1103  
    647647          exit $status
    648648        fi
    649       fi 
     649      fi
    650650
    651651      if test -z "$output_obj"; then
    … …  
    42484248          concat_cmds=
    42494249          save_oldobjs=$oldobjs
    4250           # GNU ar 2.10+ was changed to match POSIX; thus no paths are
    4251           # encoded into archives.  This makes 'ar r' malfunction in
    4252           # this piecewise linking case whenever conflicting object
    4253           # names appear in distinct ar calls; check, warn and compensate.
    4254           if (for obj in $save_oldobjs
    4255             do
    4256               $echo "X$obj" | $Xsed -e 's%^.*/%%'
    4257             done | sort | sort -uc >/dev/null 2>&1); then
    4258             :
    4259           else
    4260             $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
    4261             $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
    4262             AR_FLAGS=cq
    4263           fi
    42644250          for obj in $save_oldobjs
    42654251          do
Note: See TracChangeset for help on using the changeset viewer.