X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=configure.in;h=88bb232ed544ce9b34a07143b9d5a4594f9d0989;hb=ac0442dd242dcd2c734ae67974a41c2f3aa1324e;hp=7c69374a1177508087135a2158c30fd7441247dd;hpb=34b65ac5084bc34f395548e435c44ad66bcac57e;p=deliverable%2Fbinutils-gdb.git

diff --git a/configure.in b/configure.in
index 7c69374a11..88bb232ed5 100644
--- a/configure.in
+++ b/configure.in
@@ -41,10 +41,13 @@
 
 # these libraries are used by various programs built for the host environment
 #
-host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tclX itcl tix libgui"
+host_libs="intl mmalloc libiberty opcodes bfd readline gash db tcl tk tcl8.1 tk8.1 tclX itcl tix libgui"
 # start-sanitize-ide
 host_libs="${host_libs} libide libidetcl"
 # end-sanitize-ide
+# start-sanitize-cygnus
+host_libs="${host_libs} flexlm"
+# end-sanitize-cygnus
 
 if [ "${enable_gdbgui}" = "yes" ] ; then
 	host_libs="${host_libs} libgui"
@@ -53,16 +56,32 @@ fi
 # these tools are built for the host environment
 # Note, the powerpc-eabi build depends on sim occurring before gdb in order to
 # know that we are building the simulator.
-host_tools="texinfo byacc flex bison binutils ld gas gcc sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext"
+host_tools="texinfo byacc flex bison binutils ld gas gcc sim gdb make patch prms send-pr gprof gdbtest tgas etc expect dejagnu ash bash bzip2 m4 autoconf automake libtool ispell grep diff rcs cvssrc fileutils shellutils time textutils wdiff find emacs emacs19 uudecode hello tar gzip indent recode release sed utils guile perl apache inet gawk findutils snavigator libtool gettext"
 # start-sanitize-ide
 host_tools="${host_tools} ilu vmake jstools"
 # end-sanitize-ide
+# start-sanitize-cygnus
+host_tools="${host_tools} cgen"
+# end-sanitize-cygnus
 
 # these libraries are built for the target environment, and are built after
 # the host libraries and the host tools (which may be a cross compiler)
 #
-target_libs="target-libiberty target-libgloss target-newlib target-libio target-librx target-libstdc++ target-libg++ target-libjava target-boehm-gc"
-
+target_libs="target-libiberty \
+		target-libgloss \
+		target-newlib \
+		${start-sanitize-dsp}
+		target-libdsp \
+		${end-sanitize-dsp}
+		target-libio \
+		target-librx \
+		target-libstdc++ \
+		${start-sanitize-java}
+		target-libjava \
+		target-boehm-gc \
+		target-qthreads \
+		${end-sanitize-java}
+		target-libg++"
 
 # these tools are built using the target libs, and are intended to run only
 # in the target environment
@@ -85,7 +104,7 @@ target_tools="target-examples target-groff target-gperf"
 #
 # This must be a single line because of the way it is searched by grep in
 # the code below.
-native_only="autoconf automake libtool cvssrc emacs emacs19 fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils gash uudecode wdiff gprof target-groff guile perl apache inet time ash bash prms snavigator gnuserv target-gperf"
+native_only="autoconf automake libtool cvssrc emacs emacs19 fileutils find gawk gettext grep gzip hello indent ispell m4 rcs recode sed shellutils tar textutils gash uudecode wdiff gprof target-groff guile perl apache inet time ash bash bzip2 prms snavigator gnuserv target-gperf"
 
 # directories to be built in a cross environment only
 #
@@ -173,6 +192,9 @@ case "${host}" in
   i[3456]86-*-sco*)
     host_makefile_frag="${host_makefile_frag} config/mh-sco"
     ;;
+  i[3456]86-*-udk*)
+    host_makefile_frag="${host_makefile_frag} config/mh-sysv5"
+    ;;
   i[3456]86-*-isc*)
     host_makefile_frag="${host_makefile_frag} config/mh-sysv"
     ;;
@@ -188,17 +210,15 @@ case "${host}" in
   i[3456]86-*-msdosdjgpp*)
     host_makefile_frag="${host_makefile_frag} config/mh-go32"
     ;;
-  *-cygwin32*)
-    host_makefile_frag="${host_makefile_frag} config/mh-cygwin32"
+  *-cygwin*)
+    host_makefile_frag="${host_makefile_frag} config/mh-cygwin"
     ;;
   *-mingw32*)
     host_makefile_frag="${host_makefile_frag} config/mh-mingw32"
     ;;
-# start-sanitize-mswin
   *-windows*)
     host_makefile_frag="${host_makefile_frag} config/mh-windows"
     ;;
-# end-sanitize-mswin
   vax-*-ultrix2*)
     host_makefile_frag="${host_makefile_frag} config/mh-vaxult2"
     ;;
@@ -223,6 +243,9 @@ case "${host}" in
   *-*-lynxos*)
     host_makefile_frag="${host_makefile_frag} config/mh-lynxos"
     ;;
+  *-*-aix4.[3456789]* | *-*-aix[56789].*)
+    host_makefile_frag="${host_makefile_frag} config/mh-aix43"
+    ;;
   *-*-sysv4*)
     host_makefile_frag="${host_makefile_frag} config/mh-sysv4"
     ;;
@@ -234,7 +257,7 @@ fi
 
 # If we aren't going to be using gcc, see if we can extract a definition
 # of CC from the fragment.
-if [ -z "${CC}" -a "${build}" = "${host}" ]; then
+if [ -z "${CC}" ] && [ "${build}" = "${host}" ]; then
   IFS="${IFS= 	}"; save_ifs="$IFS"; IFS="${IFS}:"
   found=
   for dir in $PATH; do
@@ -245,7 +268,7 @@ if [ -z "${CC}" -a "${build}" = "${host}" ]; then
     fi
   done
   IFS="$save_ifs"
-  if [ -z "${found}" -a -n "${host_makefile_frag}" -a -f "${srcdir}/${host_makefile_frag}" ]; then
+  if [ -z "${found}" ] && [ -n "${host_makefile_frag}" ] && [ -f "${srcdir}/${host_makefile_frag}" ]; then
     xx=`sed -n -e 's/^[ 	]*CC[ 	]*=[ 	]*\(.*\)$/\1/p' < ${srcdir}/${host_makefile_frag}`
     if [ -n "${xx}" ] ; then
       CC=$xx
@@ -257,8 +280,8 @@ fi
 # Well, we don't yet, but we will.
 if false && [ "${host}" = "${target}" ] && [ x${enable_shared} = x ]; then
   case "${target}" in
-    alpha-dec-osf*)	enable_shared=yes ;;
-    alpha-*-linux*)	enable_shared=yes ;;
+    alpha*-dec-osf*)	enable_shared=yes ;;
+    alpha*-*-linux*)	enable_shared=yes ;;
     mips-sgi-irix5*)	enable_shared=yes ;;
     *)			enable_shared=no ;;
   esac
@@ -276,8 +299,8 @@ if [ x${shared} = xyes ]; then
     hppa*)
       host_makefile_frag="${host_makefile_frag} config/mh-papic"
       ;;
-    i[3456]86-*-cygwin32*)
-      # We don't want -fPIC on cygwin32.
+    i[3456]86-*-cygwin*)
+      # We don't want -fPIC on Cygwin.
       ;;
     i[3456]86-*)
       host_makefile_frag="${host_makefile_frag} config/mh-x86pic"
@@ -288,7 +311,7 @@ if [ x${shared} = xyes ]; then
     powerpc*-*)
       host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
       ;;
-    alpha-*-linux*)
+    alpha*-*-linux*)
       host_makefile_frag="${host_makefile_frag} config/mh-elfalphapic"
       ;;
     *)
@@ -320,6 +343,11 @@ case "${target}" in
   powerpc-*-netware*)
     target_makefile_frag="${target_makefile_frag} config/mt-netware"
     ;;
+# start-sanitize-sky
+  mips64r59*-sky-elf*)
+    target_makefile_frag="${target_makefile_frag} config/mt-r5900 config/mt-sky"
+    ;;
+# end-sanitize-sky
 # start-sanitize-r5900
   mips64r59*)
     target_makefile_frag="${target_makefile_frag} config/mt-r5900"
@@ -333,19 +361,14 @@ esac
 # If --enable-target-optspace always use -Os instead of -O2 to build
 # the target libraries, similarly if it is not specified, use -Os
 # on selected platforms.
-echo "---${enable_target_optspace}:${target}--" 1>&2
 case "${enable_target_optspace}:${target}" in
   yes:*)
     target_makefile_frag="${target_makefile_frag} config/mt-ospace"
     ;;
-  :m32r-* |  :d10v-*)
-    target_makefile_frag="${target_makefile_frag} config/mt-ospace"
-    ;;
-# start-sanitize-d30v
-  :d30v-*-*)
+  # CYGNUS LOCAL d10v, d30v, fr30
+  :m32r-* | :d10v-* | :d30v-* | :fr30-*)
     target_makefile_frag="${target_makefile_frag} config/mt-ospace"
     ;;
-# end-sanitize-d30v
   no:* | :*)
     ;;
   *)
@@ -387,20 +410,17 @@ if [ x"${host}" = x"${target}" ] ; then
 	# that are in the 'cross only' list
 	skipdirs="${skipdirs} ${cross_only}"
 	is_cross_compiler=no
-	target_subdir=.
-	case "${host}" in
-          # We need multilib support for irix6, to get libiberty built
-	  #  properly for o32 and n32.
-          mips-sgi-irix6*) target_subdir=${host} ;;
-	esac
 else
 	# similarly, don't build the targets in the 'native only' 
 	# list when building a cross compiler
 	skipdirs="${skipdirs} ${native_only}"
 	is_cross_compiler=yes
-	target_subdir=${target_alias}
 fi	
 
+# We always want to use the same name for this directory, so that dejagnu
+# can reliably find it.
+target_subdir=${target_alias}
+
 if [ ! -d ${target_subdir} ] ; then
   if mkdir ${target_subdir} ; then true
   else
@@ -463,7 +483,7 @@ if [ x${with_stabs} = x ]; then
   case "${target}" in
   mips*-*-irix6*)
     ;;
-  mips*-*-* | alpha*-*-osf* | i[3456]86*-*-sysv4* | i[3456]86*-*-unixware*)
+  mips*-*-* | alpha*-*-osf*)
     with_stabs=yes;
     withoptions="${withoptions} --with-stabs"
     ;;
@@ -508,7 +528,7 @@ case "${host}" in
 	  configdirs="$configdirs dosrel" ;;
 	i[3456]86-*-mingw32*)
 	  configdirs="$configdirs dosrel" ;;
-	*-cygwin32*)
+	*-cygwin*)
 	  configdirs="$configdirs dosrel" ;;
 esac
 
@@ -524,18 +544,24 @@ case "${host}" in
 # start-sanitize-ide
     noconfigdirs="$noconfigdirs libide libidetcl vmake jstools"
 # end-sanitize-ide
+# start-sanitize-cygnus
+    noconfigdirs="$noconfigdirs flexlm"
+# end-sanitize-cygnus
     ;;
   i[3456]86-*-go32* | i[3456]86-*-msdosdjgpp*)
     noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv gettext"
 # start-sanitize-ide
     noconfigdirs="$noconfigdirs libide libidetcl vmake jstools"
 # end-sanitize-ide
+# start-sanitize-cygnus
+    noconfigdirs="$noconfigdirs flexlm"
+# end-sanitize-cygnus
 	;;
   i[3456]86-*-mingw32*)
     # noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr uudecode dejagnu diff guile perl apache inet itcl tix db snavigator gnuserv"
      noconfigdirs="expect dejagnu cvs autoconf automake send-pr gprof rcs guile perl texinfo apache inet libtool"
 	;;
-  *-*-cygwin32)
+  *-*-cygwin*)
      noconfigdirs="autoconf automake send-pr gprof rcs guile perl texinfo apache inet"
     ;;
   *-*-windows*)
@@ -552,7 +578,15 @@ case "${host}" in
 # start-sanitize-ide
      noconfigdirs="$noconfigdirs libide libidetcl vmake jstools"
 # end-sanitize-ide
-    ;;
+# start-sanitize-cygnus
+     noconfigdirs="$noconfigdirs flexlm"
+# end-sanitize-cygnus
+    ;;
+# start-sanitize-beos
+  i[3456]86-*-beos)
+     noconfigdirs="$noconfigdirs tk itcl tix libgui gdb"
+     ;;
+# end-sanitize-beos
 esac
 
 
@@ -566,7 +600,7 @@ case "${target}" in
   *-*-vxworks*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
-  alpha-dec-osf*)
+  alpha*-dec-osf*)
     # ld works, but does not support shared libraries.  emacs doesn't
     # work.  newlib is not 64 bit ready.  I'm not sure about fileutils.
     # gas doesn't generate exception information.
@@ -575,7 +609,7 @@ case "${target}" in
   alpha*-*-*vms*)
     noconfigdirs="$noconfigdirs gdb ld target-newlib target-libgloss"
     ;;
-  alpha-*-linux*)
+  alpha*-*-linux*)
     # newlib is not 64 bit ready
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     # linux has rx in libc
@@ -594,9 +628,22 @@ case "${target}" in
   arm-*-coff*)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
+# CYGNUS LOCAL clm/arm-elf
+  arm-*-elf*)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+# END CYGNUS LOCAL 
+  c4x-*-*)
+    noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"
+    ;;
   thumb-*-coff)
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
+# CYGNUS LOCAL clm/arm-elf
+  thumb-*-elf)
+    noconfigdirs="$noconfigdirs target-libgloss"
+    ;;
+# END CYGNUS LOCAL
   thumb-*-pe) # CYGNUS LOCAL nickc/thumb
     noconfigdirs="$noconfigdirs target-libgloss"
     ;;
@@ -606,10 +653,9 @@ case "${target}" in
   d10v-*-*)
     noconfigdirs="$noconfigdirs target-librx target-libg++ target-libstdc++ target-libio target-libgloss"
     ;;
-# start-sanitize-d30v
+  # CYGNUS LOCAL d30v
   d30v-*-*)
     ;;
-# end-sanitize-d30v
   h8300*-*-* | \
   h8500-*-*)
     noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx target-libgloss"
@@ -632,6 +678,10 @@ case "${target}" in
     # but don't build gdb
     noconfigdirs="$noconfigdirs gdb target-libg++ target-libstdc++ target-libio target-librx"
     ;;
+  *-*-linux*)
+    # linux has rx in libc
+    skipdirs="$skipdirs target-librx"
+    ;;
   i[3456]86-*-mingw32*)
     target_configdirs="$target_configdirs target-mingw"
     noconfigdirs="$noconfigdirs expect target-libgloss"
@@ -640,22 +690,28 @@ case "${target}" in
     case "${host}" in
       i[3456]86-*-mingw32) ;; # keep gdb tcl tk expect etc.
       *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix db snavigator gnuserv"
+# start-sanitize-cygnus
+         noconfigdirs="$noconfigdirs flexlm"
+# end-sanitize-cygnus
          ;;
     esac
     ;;    
-  *-*-cygwin32*)
+  *-*-cygwin*)
     target_configdirs="$target_configdirs target-winsup"
     noconfigdirs="$noconfigdirs target-gperf target-libgloss"
     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
 
-    # Can't build gdb for cygwin32 if not native.
+    # Can't build gdb for Cygwin if not native.
     case "${host}" in
-      *-*-cygwin32*) ;; # keep gdb tcl tk expect etc.
+      *-*-cygwin*) ;; # keep gdb tcl tk expect etc.
       *) noconfigdirs="$noconfigdirs gdb tcl tk expect itcl tix libgui db snavigator gnuserv"
 # start-sanitize-ide
          noconfigdirs="$noconfigdirs libide libidetcl vmake jstools"
 # end-sanitize-ide
+# start-sanitize-cygnus
+	 noconfigdirs="$noconfigdirs flexlm"
+# end-sanitize-cygnus
          ;;
     esac
     ;;    
@@ -686,10 +742,16 @@ case "${target}" in
     noconfigdirs="$noconfigdirs emacs emacs19 target-libgloss"
     ;;
   mn10200-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss"
+    noconfigdirs="$noconfigdirs"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-libstub target-cygmon"
+    fi
     ;;
   mn10300-*-*)
     noconfigdirs="$noconfigdirs"
+    if [ x${is_cross_compiler} != xno ] ; then
+	   target_configdirs="${target_configdirs} target-libstub target-cygmon"
+    fi
     ;;
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
@@ -703,6 +765,9 @@ case "${target}" in
 # start-sanitize-ide
     noconfigdirs="$noconfigdirs libide libidetcl vmake jstools"
 # end-sanitize-ide
+# start-sanitize-cygnus
+    noconfigdirs="$noconfigdirs flexlm"
+# end-sanitize-cygnus 
     # always build newlib.
     skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     ;;
@@ -712,6 +777,9 @@ case "${target}" in
 # start-sanitize-ide
     noconfigdirs="$noconfigdirs libide libidetcl vmake jstools"
 # end-sanitize-ide
+# start-sanitize-cygnus
+    noconfigdirs="$noconfigdirs flexlm"
+# end-sanitize-cygnus
     ;;
   rs6000-*-lynxos*)
     # The CVS server code doesn't work on the RS/6000
@@ -745,6 +813,16 @@ case "${target}" in
   mips*-*-bsd*)
     noconfigdirs="$noconfigdirs gprof target-libgloss"
     ;;
+  mipstx39-*-*)
+    noconfigdirs="$noconfigdirs gprof"   # same as generic mips
+    target_configdirs="${target_configdirs} target-libstub target-cygmon"
+   ;;
+# start-sanitize-sky
+  mips64r5900-sky-elf*)
+    noconfigdirs="$noconfigdirs gprof"
+    extraconfigdirs="$extraconfigdirs gas,dvp-gas,dvp-elf"
+    ;;
+# end-sanitize-sky
   mips*-*-*)
     noconfigdirs="$noconfigdirs gprof"
     ;;
@@ -819,6 +897,11 @@ case "${target}" in
     # Macs want a resource compiler.
     configdirs="$configdirs grez"
     ;;    
+# start-sanitize-beos
+  i[3456]86-*-beos)
+     noconfigdirs="$noconfigdirs target-gperf"
+     ;;
+# end-sanitize-beos
 esac
 
 # If we aren't building newlib, then don't build libgloss, since libgloss
@@ -828,6 +911,13 @@ case "${noconfigdirs}" in
   *target-newlib*) noconfigdirs="$noconfigdirs target-libgloss" ;;
 esac
 
+# start-sanitize-cygnus
+# Only configure cgen if --enable-cgen-maint.
+if [ "x$enable_cgen_maint" != xyes ] ; then
+  noconfigdirs="$noconfigdirs cgen"
+fi
+
+# end-sanitize-cygnus
 # Make sure we don't let GNU ld be added if we didn't want it.
 if [ x$with_gnu_ld = xno ]; then
   use_gnu_ld=no
@@ -891,12 +981,12 @@ fi
 # Deconfigure all subdirectories, in case we are changing the
 # configuration from one where a subdirectory is supported to one where it
 # is not.
-if [ -z "${norecursion}" -a -n "${configdirs}" ]; then
+if [ -z "${norecursion}" ] && [ -n "${configdirs}" ]; then
   for i in `echo ${configdirs} | sed -e s/target-//g` ; do
     rm -f $i/Makefile
   done
 fi
-if [ -z "${norecursion}" -a -n "${target_configdirs}" ]; then
+if [ -z "${norecursion}" ] && [ -n "${target_configdirs}" ]; then
   for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
     rm -f ${target_subdir}/$i/Makefile
   done
@@ -983,7 +1073,7 @@ if [ x${shared} = xyes ]; then
     powerpc*-*)
       target_makefile_frag="${target_makefile_frag} config/mt-ppcpic"
       ;;
-    alpha-*-linux*)
+    alpha*-*-linux*)
       target_makefile_frag="${target_makefile_frag} config/mt-elfalphapic"
       ;;
     *)
@@ -1067,21 +1157,10 @@ if [ "${shared}" = "yes" ]; then
   esac
 fi
 
-# If we are building for a win32 host, then set INSTALL_PROGRAM_ARGS to
-# -x.  This will cause programs to be installed with .exe extensions.
-case "${host}" in
-*-*-cygwin32* | i[3456]86-*-mingw32)
-    sed -e 's/^INSTALL_PROGRAM_ARGS[ 	]*=.*$/INSTALL_PROGRAM_ARGS = -x/' \
-	Makefile > Makefile.tem
-    rm -f Makefile
-    mv -f Makefile.tem Makefile
-    ;;
-esac
-
 # Record target_configdirs and the configure arguments in Makefile.
 target_configdirs=`echo "${target_configdirs}" | sed -e 's/target-//g'`
 targargs=`echo "${arguments}" | \
-	sed -e 's/--norecursion//' \
+	sed -e 's/--no[^ 	]*//' \
 	    -e 's/--cache[a-z-]*=[^ 	]*//' \
 	    -e 's/--ho[a-z-]*=[^ 	]*//' \
 	    -e 's/--bu[a-z-]*=[^ 	]*//' \
@@ -1101,6 +1180,12 @@ if [ x${enable_multilib} = x ]; then
   targargs="--enable-multilib ${targargs}"
 fi
 
+# Pass --with-newlib if appropriate.  Note that target_configdirs has
+# changed from the earlier setting of with_newlib.
+if [ x${with_newlib} != xno ] && echo " ${target_configdirs} " | grep " newlib " > /dev/null 2>&1 && [ -d ${srcdir}/newlib ] ; then
+  targargs="--with-newlib ${targargs}"
+fi
+
 targargs="--host=${target_alias} --build=${build_alias} ${targargs}"
 sed -e "s:^TARGET_CONFIGDIRS[ 	]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
     -e "s%^CONFIG_ARGUMENTS[ 	]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \