X-Git-Url: https://repo.jachan.dev/binutils.git/blobdiff_plain/034fd45d55751069bf6588ffcc08932eff22cd82..7e5e83cfb45719bf120f39d1c33d8c33c521fdf8:/configure.in

diff --git a/configure.in b/configure.in
index 6b6bd85a72..54ae0895ca 100644
--- a/configure.in
+++ b/configure.in
@@ -42,7 +42,7 @@ host_tools="texinfo byacc flex bison binutils ld gas gcc gdb make patch
 # 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="xiberty libgloss newlib libio librx libstdc++ libg++"
+target_libs="target-libiberty target-libgloss target-newlib target-libio target-librx target-libstdc++ target-libg++"
 
 
 # these tools are built using the target libs, and are intended to run only
@@ -52,25 +52,25 @@ target_libs="xiberty libgloss newlib libio librx libstdc++ libg++"
 # list belongs in this list.  those programs are also very likely
 # candidates for the "native_only" list which follows
 #
-target_tools="examples groff"
+target_tools="target-examples target-groff"
 
 ################################################################################
 
 ## These two lists are of directories that are to be removed from the
 ## ${configdirs} list for either cross-compilations or for native-
 ## compilations.  For example, it doesn't make that much sense to
-## cross-compile Emacs, nor is it terribly useful to compile xiberty in
+## cross-compile Emacs, nor is it terribly useful to compile target-libiberty in
 ## a native environment.  
 
 # directories to be built in the native environment only
 #
-native_only="autoconf cvs emacs emacs19 fileutils find grep groff gzip hello
+native_only="autoconf cvs emacs emacs19 fileutils find grep gzip hello
 	     indent ispell m4 rcs recode sed shellutils tar textutils gash
-	     uudecode wdiff gprof"
+	     uudecode wdiff gprof target-groff"
 
 # directories to be built in a cross environment only
 #
-cross_only="xiberty libgloss newlib"
+cross_only="target-libiberty target-libgloss target-newlib"
 
 ## All tools belong in one of the four categories, and are assigned above
 ## We assign ${configdirs} this way to remove all embedded newlines.  This
@@ -116,11 +116,8 @@ case "${host}" in
   i[345]86-*-go32*)	  host_makefile_frag=config/mh-go32 ;;
   i[345]86-*-win32)	  host_makefile_frag=config/mh-i386win32 ;;
   vax-*-ultrix2*)         host_makefile_frag=config/mh-vaxult2 ;;
-  *-ibm-aix*)             host_makefile_frag=config/mh-aix ;;
-  *-bull-bosx*)           host_makefile_frag=config/mh-aix ;;
   *-*-solaris2*)          host_makefile_frag=config/mh-solaris ;;
-  m68k-sun-*)		  host_makefile_frag=config/mh-sun3 ;;
-  *-sun-*)		  host_makefile_frag=config/mh-sun ;;
+  m68k-sun-sunos*)	  host_makefile_frag=config/mh-sun3 ;;
   *-hp-hpux[78]*)         host_makefile_frag=config/mh-hpux8 ;;
   *-hp-hpux*)             host_makefile_frag=config/mh-hpux ;;
   *-*-hiux*)              host_makefile_frag=config/mh-hpux ;;
@@ -134,7 +131,10 @@ fi
 # See if we can extract a definition of CC from the fragment.
 if [ -z "${CC}" ]; then
   if [ -n "${host_makefile_frag}" -a -f "${srcdir}/${host_makefile_frag}" ]; then
-    CC=`sed -n -e 's/^[ 	]*CC[ 	]*=[ 	]*\(.*\)$/\1/p' < ${srcdir}/${host_makefile_frag}`
+    xx=`sed -n -e 's/^[ 	]*CC[ 	]*=[ 	]*\(.*\)$/\1/p' < ${srcdir}/${host_makefile_frag}`
+    if [ -n "${xx}" ] ; then
+      CC=$xx
+    fi
   fi
 fi
 
@@ -232,17 +232,26 @@ if [ x"${host}" = x"${target}" ] ; then
 	# that are in the 'cross only' list
 	skipdirs="${skipdirs} ${cross_only}"
 	is_cross_compiler=no
+	target_subdir=.
 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}
+	if [ ! -d ${target_subdir} ] ; then
+	    if mkdir ${target_subdir} ; then true
+	    else
+		echo "'*** could not make ${PWD=`pwd`}/${target_subdir}" 1>&2
+                exit 1
+	    fi
+	fi
 fi	
 
 copy_dirs=
 
 # Handle --with-headers=XXX.  The contents of the named directory are
-# copied to $(tooldir)/include.
+# copied to $(tooldir)/sys-include.
 if [ x"${with_headers}" != x ]; then
   if [ x${is_cross_compiler} = xno ]; then
     echo 1>&2 '***' --with-headers is only supported when cross compiling
@@ -252,7 +261,7 @@ if [ x"${with_headers}" != x ]; then
   "") x=${prefix} ;;
   *) x=${exec_prefix} ;;
   esac
-  copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/include"
+  copy_dirs="${copy_dirs} ${with_headers} $x/${target_alias}/sys-include"
 fi
 
 # Handle --with-libs=XXX.  Multiple directories are permitted.  The
@@ -283,9 +292,19 @@ fi
 
 # Recognize --with-newlib/--without-newlib.
 if [ x${with_newlib} = xno ]; then
-  skipdirs="${skipdirs} newlib"
+  skipdirs="${skipdirs} target-newlib"
 elif [ x${with_newlib} = xyes ]; then
-  skipdirs=`echo " ${skipdirs} " | sed -e 's/ newlib / /'`
+  skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
+fi
+
+# Default to using --with-stabs for certain targets.
+if [ x${with_stabs} = x ]; then
+  case "${target}" in
+  mips*-*-* | alpha*-*-osf* | i[345]86*-*-sysv4* | i[345]86*-*-unixware*)
+    with_stabs=yes;
+    withoptions="${withoptions} --with-stabs"
+    ;;
+  esac
 fi
 
 # Handle ${copy_dirs}
@@ -322,7 +341,7 @@ done
 # Configure extra directories which are host specific
 
 case "${host}" in
-  i[345]86-*-go32*|i[345]86-*-win32*)
+  i[345]86-*-win32* | i[345]86-*-go32*)
 	  configdirs="$configdirs dosrel" ;;
 esac
 
@@ -340,26 +359,30 @@ case "${host}" in
     noconfigdirs="tcl tk expect dejagnu make texinfo bison patch flex byacc send-pr gprof uudecode dejagnu diff"
 	;;
   i[345]86-*-win32)
-     noconfigdirs="tk tcl expect diff make texinfo bison flex send-pr gprof gdb readline"
+     noconfigdirs="patch diff flex make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs"
+    ;;
+  ppc*-*-pe)
+     noconfigdirs="patch diff flex make tk tcl expect dejagnu cvs autoconf texinfo bison send-pr gprof rcs"
     ;;
 esac
 
 
 case "${target}" in
   *-*-netware)
-    noconfigdirs="$noconfigdirs libg++ libstdc++ librx newlib xiberty"
+    noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-librx target-newlib target-libiberty"
     ;;
-  *-*-vxworks5.1)
-    noconfigdirs="$noconfigdirs newlib"
+  *-*-vxworks*)
+    noconfigdirs="$noconfigdirs target-newlib"
     ;;
   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 or grep.
-    noconfigdirs="$noconfigdirs ld emacs fileutils grep newlib"
+    # gas doesn't generate exception information.
+    noconfigdirs="$noconfigdirs gas ld emacs fileutils grep target-newlib"
     ;;
   alpha*-*-*)
     # newlib is not 64 bit ready
-    noconfigdirs="$noconfigdirs newlib"
+    noconfigdirs="$noconfigdirs target-newlib"
     ;;
 # start-sanitize-arc
   arc-*-*)
@@ -374,7 +397,7 @@ case "${target}" in
     ;;
   h8300*-*-* | \
   h8500-*-*)
-    noconfigdirs="$noconfigdirs libg++ libstdc++ libio librx"
+    noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx"
     ;;
   hppa*-*-*elf* | \
   hppa*-*-lites*)
@@ -392,17 +415,19 @@ case "${target}" in
     ;;
   i[345]86-*-go32)
     # but don't build gdb
-    noconfigdirs="$noconfigdirs gdb libg++ libstdc++ libio librx"
+    noconfigdirs="$noconfigdirs gdb target-libg++ target-libstdc++ target-libio target-librx"
     ;;
 
   i[345]86-*-win32)
-    # Can't build gdb for win32 target
-    noconfigdirs="$noconfigdirs gdb tk"
-    # but put newlib back
-    skipdirs=`echo " ${skipdirs} " | sed -e 's/ newlib / /'`
+    # Can't build gdb for win32 if not native.
+    # make/glob's configure uses some AC_TRY_RUN type tests
+    target_configdirs="$target_configdirs target-winsup"
+    noconfigdirs="$noconfigdirs gdb tcl tk make"
+    # always build newlib.
+    skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     ;;    
   i[345]86-*-pe)
-    noconfigdirs="$noconfigdirs libg++ libstdc++ libio librx"
+    noconfigdirs="$noconfigdirs target-libg++ target-libstdc++ target-libio target-librx"
     ;;
   i[345]86-*-sco*)
     noconfigdirs="$noconfigdirs gprof"
@@ -422,24 +447,27 @@ case "${target}" in
     # but that's okay since emacs doesn't work anyway
     noconfigdirs="$noconfigdirs emacs emacs19"
     ;;
+# start-sanitize-jaguar
+  jaguar-*-*)
+    ;;
+# end-sanitize-jaguar
   powerpc-*-aix*)
     # copied from rs6000-*-* entry
-    noconfigdirs="$noconfigdirs ld gprof textutils cvs"
+    noconfigdirs="$noconfigdirs gprof cvs"
     ;;
-  powerpc*-*-winnt* | powerpc*-*-pe*)
-    noconfigdirs="$noconfigdirs ld gdb"
+  powerpc*-*-winnt* | powerpc*-*-pe* | ppc*-*-pe)
+    target_configdirs="$target_configdirs target-winsup"
+    noconfigdirs="$noconfigdirs gdb tcl tk make expect"
+    # always build newlib.
+    skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'`
     ;;
   rs6000-*-lynxos*)
-    # a gcc built textutils will cause the linker to hang on 'join'
     # The CVS server code doesn't work on the RS/6000
     # Newlib makes problems for libg++ in crosses.
-    noconfigdirs="$noconfigdirs ld newlib gprof textutils cvs"
-    use_gnu_ld=no
-    use_gnu_as=no
+    noconfigdirs="$noconfigdirs target-newlib gprof cvs"
     ;;
   rs6000-*-*)
-    # a gcc built textutils will cause the linker to hang on 'join'
-    noconfigdirs="$noconfigdirs ld gprof textutils"
+    noconfigdirs="$noconfigdirs gprof"
     ;;
   m68k-*-netbsd*)
     noconfigdirs="$noconfigdirs gdb"
@@ -473,34 +501,48 @@ case "${target}" in
     ;;
   sparc-*-sunos4*)
     if [ x${is_cross_compiler} != xno ] ; then
-           noconfigdirs="$noconfigdirs gdb gdbtest newlib"
+           noconfigdirs="$noconfigdirs gdb gdbtest target-newlib"
     else
            use_gnu_ld=no
     fi
     ;;
   v810-*-*)
-    noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld libg++ libstdc++ opcodes"
+    noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libio target-libg++ target-libstdc++ opcodes"
     ;;
   vax-*-vms)
-    noconfigdirs="$noconfigdirs bfd binutils gdb ld newlib opcodes"
+    noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes"
     ;;
   vax-*-*)
-    noconfigdirs="$noconfigdirs newlib"
+    noconfigdirs="$noconfigdirs target-newlib"
     ;;
   *-*-lynxos*)
-     # Newlib makes problems for libg++ in crosses.
-     noconfigdirs="$noconfigdirs newlib"
-     ;;    
+    # Newlib makes problems for libg++ in crosses.
+    noconfigdirs="$noconfigdirs target-newlib"
+    ;; 
+  *-*-macos* | \
+  *-*-mpw*)
+    # Macs want a resource compiler.
+    configdirs="$configdirs grez"
+    ;;    
 esac
 
+# If we are building a Canadian Cross, discard tools that can not be built
+# using a cross compiler.  FIXME: These tools should be fixed.
+if [ "${build}" != "${host}" ]; then
+  noconfigdirs="$noconfigdirs expect dejagnu make texinfo diff"
+fi
+
 # Remove the entries in $skipdirs and $noconfigdirs from $configdirs and
 # $target_configdirs.
 # If we have the source for $noconfigdirs entries, add them to $notsupp.
+
 notsupp=""
 for dir in . $skipdirs $noconfigdirs ; do
+  dirname=`echo $dir | sed -e s/target-//g`
   if [ $dir != . ]  && echo " ${configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
     configdirs=`echo " ${configdirs} " | sed -e "s/ ${dir} / /"`
-    if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then
+    if [ -r $srcdir/$dirname/configure ] \
+	|| [ -r $srcdir/$dirname/configure.in ]; then
       if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
 	true
       else
@@ -510,7 +552,8 @@ for dir in . $skipdirs $noconfigdirs ; do
   fi
   if [ $dir != . ]  && echo " ${target_configdirs} " | grep " ${dir} " >/dev/null 2>&1; then
     target_configdirs=`echo " ${target_configdirs} " | sed -e "s/ ${dir} / /"`
-    if [ -r $srcdir/$dir/configure ] || [ -r $srcdir/$dir/configure.in ]; then
+    if [ -r $srcdir/$dirname/configure ] \
+	|| [ -r $srcdir/$dirname/configure.in ]; then
       if echo " ${skipdirs} " | grep " ${dir} " >/dev/null 2>&1; then
 	true
       else
@@ -520,14 +563,36 @@ for dir in . $skipdirs $noconfigdirs ; do
   fi
 done
 
+# Sometimes the tools are distributed with libiberty but with no other
+# libraries.  In that case, we don't want to build target-libiberty.
+if [ -n "${target_configdirs}" ]; then
+  others=
+  for i in `echo ${target_configdirs} | sed -e s/target-//g` ; do
+    if [ "$i" != "libiberty" ]; then
+      if [ -r $srcdir/$i/configure ] || [ -r $srcdir/$i/configure.in ]; then
+	others=yes;
+	break;
+      fi
+    fi
+  done
+  if [ -z "${others}" ]; then
+    target_configdirs=
+  fi
+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}" ]; then
-  for i in ${configdirs} ${target_configdirs}; do
+if [ -z "${norecursion}" -a -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
+  for i in `echo ${target_configdirs} | sed -e s/target-//` ; do
+    rm -f ${target_subdir}/$i/Makefile
+  done
+fi
 
 # Produce a warning message for the subdirs we can't configure.
 # This isn't especially interesting in the Cygnus tree, but in the individual
@@ -602,12 +667,26 @@ fi
 # post-target:
 
 # 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//' \
-	    -e 's/--*cache[a-z-]*=[^ 	]*//' \
-	    -e 's/--*cache[a-z-]*[ 	][ 	]*[^ 	]*//'`
+	sed -e 's/--norecursion//' \
+	    -e 's/--cache[a-z-]*=[^ 	]*//' \
+	    -e 's/--ho[a-z-]*=[^ 	]*//' \
+	    -e 's/--ta[a-z-]*=[^ 	]*//'`
+
+# Passing a --with-cross-host argument lets the target libraries know
+# whether they are being built with a cross-compiler or being built
+# native.  However, it would be better to use other mechanisms to make the
+# sorts of decisions they want to make on this basis.  Please consider
+# this option to be deprecated.  FIXME.
+if [ x${is_cross_compiler} = xyes ]; then
+  targargs="--with-cross-host=${host_alias} ${targargs}"
+fi
+
+targargs="--host=${target_alias} ${targargs}"
 sed -e "s:^TARGET_CONFIGDIRS[ 	]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:" \
     -e "s%^CONFIG_ARGUMENTS[ 	]*=.*$%CONFIG_ARGUMENTS = ${targargs}%" \
+    -e "s%^TARGET_SUBDIR[ 	]*=.*$%TARGET_SUBDIR = ${target_subdir}%" \
        Makefile > Makefile.tem
 rm -f Makefile
 mv -f Makefile.tem Makefile