X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fconfigure.in;h=ae012dedee7e89d4584ca80aa941ad770f2b555c;hb=cede97315d431887698effbd97cdc53ff90a8b24;hp=2eceb21557955f9bf62ba00f63b05fbdcbe0d664;hpb=77c3feeed121c78c40973a3457342c4d398a7b2e;p=deliverable%2Fbinutils-gdb.git

diff --git a/bfd/configure.in b/bfd/configure.in
index 2eceb21557..ae012dedee 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -7,244 +7,267 @@ configdirs="doc"
 srctrigger=libbfd.c
 srcname="BFD"
 target_dependent=true
+host64=false
+target64=false
+want64=false
 
 # per-host:
 
-case "${host_cpu}" in
-
-rs6000)	my_host=rs6000
-	;;
-
-mips)
-	case "${host_vendor}" in
-	dec)	my_host=decstation ;;
-	sgi)	my_host=irix3 ;;
-	esac
-	;;
-
-m88k)
-	case "${host_vendor}" in
-	motorola)
-		my_host=delta88 ;;
-	harris)
-		my_host=harris ;;
-	*)
-		case "${host_os}" in
-		dgux)	my_host=dgux ;;
-		esac
-		;;
-	esac
-	;;
-
-m68k)
-	case "${host_vendor}" in
-	cbm)
-		case ${host_os} in
-		amigados)	my_host=amigados ;;
-		sysv4*)		my_host=amix ;;
-		esac
-		;;
-	hp)	
-		case "${host_os}" in
-		hpux)	my_host=hp9000 ;;
-		bsd)	my_host=hp300bsd ;;
-		esac
-		;;
-	sony)	my_host=news ;;
-	sun)	my_host=sun3 ;;
-	apollo*)
-		case "${host_os}" in
-		sysv*)	my_host=apollo68v ;;
-		esac
-		;;
-	esac
-	;;
-
-i860)	my_host=stratus
-	;;
-
-i386)
-	case "${host_vendor}" in
-	*)
-		case "${host_os}" in
-		sysv4*)	my_host=i386v4 ;;
-		sysv* | scosysv*) my_host=i386v ;;
-		mach*)	my_host=i386mach ;;
-		msdos*)	my_host=dose ;;
-		esac
-		;;
-	esac
-	;;
-
-sparc)
-	case "${host_os}" in
-	sunos64)	my_host=sparc-ll ;;
-	*)		my_host=sparc ;;
-	esac
-	;;
-
-romp)	my_host=rtbsd
-	;;
-
-a29k)	my_host=ultra3
-	;;
-
-tahoe)
-	my_host=tahoe
-	;;
-
-vax)
-	case "${host_os}" in
-	ultrix*) my_host=vaxult ;;
-	*) my_host=vaxbsd ;;
-	esac
-	;;
-esac
+. ${srcdir}/configure.host
 
 # Set up to make a link between the host's include file and "sysdep.h".
-files="hosts/h-${my_host}.h"
+files="hosts/${my_host}.h"
 links="sysdep.h"
 
 if [ ! -f ${srcdir}/${files} ] ; then
-	if [ -n "${my_host}" ] ; then
-		echo '***' No file ${srcdir}/${files}
-	fi
-	echo '***' ${srcname} does not support host ${host}
-	exit 1
+	files=../bfd/hosts/std-host.h
+	echo "[${srcname} has no specific support for host ${host} -- using std-host]"
 fi
 
 host_makefile_frag=
-if [ -f ${srcdir}/config/mh-${my_host} ] ; then
-	host_makefile_frag=config/mh-${my_host}
+if [ -f ${srcdir}/config/${my_host}.mh ] ; then
+	host_makefile_frag=config/${my_host}.mh
 fi
 
 # per-target:
 
-case "${target_vendor}" in
-aout | coff | bout | elf) bfd_target=${target_cpu}-${target_vendor} ;;
-sony)		bfd_target=news ;;
-intel)		bfd_target=${target_cpu}-coff ;;	
-stratus | cbm | ncr)	bfd_target=${target_cpu}-elf ;;
-
-unknown)
-	case "${target_os}" in
-	bsd) bfd_target=${target_cpu}-aout ;;
-	sysv4*) bfd_target=${target_cpu}-elf ;;
-	sysv* | scosysv*) bfd_target=${target_cpu}-coff ;;
-	none)	case "${target_cpu}" in
-		tahoe | vax)	bfd_target=${target_cpu} ;;
-		esac
-	esac
-	;;
-
-ibm)	my_host=rs6000
-	case "${target_cpu}" in
-	rs6000)	bfd_target=rs6000 ;;
-	esac
-	;;
-
-amd)
-	case "${target_os}"  in
-		ebmon) bfd_target=a29k-coff ;;
-		*) bfd_target=a29k-aout ;;
-	esac
-	;;
-
-hitachi)
-	case "${target_cpu}" in
-	h8300) bfd_target=h8300-coff ;;
-	*) echo "bad hitachi cpu" ;;
-	esac
-	;;
-
-
-wrs)
-	case "${target_cpu}" in
-	i960) bfd_target=i960-bout ;;
-	m68k) bfd_target=m68k-aout ;;
-	esac
-	;;
-sun)
-	case "${target_cpu}" in
-	m68k)	bfd_target=m68k-aout ;;
-	sparc)	bfd_target=sparc-aout ;;
-	esac
-	;;
-dec)
-	case "${target_cpu}" in
-	mips) bfd_target=decstation ;;
-	vax) bfd_target=vax ;;
-	esac
-	;;
-hp)
-	case "${target_cpu}" in
-	m68k)
-		case "${target_os}" in
-		hpux)	bfd_target=hp9000 ;;
-		bsd)	bfd_target=hp300bsd ;;
-		esac
-		;;
-	esac
-	;;
-sgi)
-	case "${target_cpu}" in
-	mips)
-		bfd_target=irix3 ;;
-	esac
-	;;
-big)
-	case "${target_cpu}" in
-	mips)
-		bfd_target=irix3 ;;
-	esac
-	;;
-tandem)
-	bfd_target=m68k-aout 
-	;;
-
-none|nyu|sco)
-	case "${target_cpu}" in
-	m68k) case "${target_os}" in
-		os68k) bfd_target=m68k-aout ;;
-	      esac
-	      ;;
-	i386) bfd_target=i386-coff ;;
-	a29k) case "${target_os}" in
-		aout) bfd_target=a29k-aout ;;
-		coff) bfd_target=a29k-coff ;;
-		sym1) bfd_target=a29k-coff ;;
-	       esac
-	       ;;
-	tahoe | vax) bfd_target=${target_cpu} ;;
-	esac
-	;;
-harris)
-	case "${target_cpu}" in
-		m88k) bfd_target=m88k-coff ;;
-		esac
-	;;
-
-motorola)
-	case "${target_cpu}" in
-		m88k) bfd_target=m88k-coff ;;
-		esac
-	;;
-*)
-	case "${target_cpu}" in
-	tahoe | vax) bfd_target=${target_cpu} ;;
-	esac
-	;;
-esac
-
-if [ ! -f ${srcdir}/config/mt-${bfd_target} ] ; then
-	if [ -n "${bfd_target}" ] ; then
-		echo '***' No file ${srcdir}/config/mt-${bfd_target}
+# Canonicalize the secondary target names.
+if [ -n "$with_targets" ]; then
+    for targ in `echo $with_targets | sed 's/,/ /g'`
+    do
+	result=`$configsub $targ 2>/dev/null`
+	if [ -n "$result" ]; then
+	    canon_targets="$canon_targets $result"
+	else
+	    # Allow targets that config.sub doesn't recognize, like "all".
+	    canon_targets="$canon_targets $targ"
 	fi
-	echo '***' BFD does not support target ${target}
-	echo '***' Look in bfd/configure.in for supported targets
-	exit 1
+    done
 fi
-target_makefile_frag=config/mt-${bfd_target}
 
-# We don't do any links based on the target system, just very minor makefile
-# config.
+all_targets=false
+
+for targ in $target $canon_targets
+do
+    bfd_target=`$srcdir/config.bfd $targ`
+
+    if [ "x$bfd_target" = "xall" ]; then
+        all_targets=true
+    else
+	if [ ! -f ${srcdir}/config/${bfd_target}.mt ] ; then
+	    echo '***' No file ${srcdir}/config/${bfd_target}.mt 1>&2
+	    echo '***' BFD does not support target ${bfd_target} 1>&2
+	    echo '***' Look in bfd/config.bfd for supported targets 1>&2
+	    exit 1
+	fi
+
+	if [ "x$targ" = "x$target" ]; then
+	    target_makefile_frag=${srcdir}/config/${bfd_target}.mt
+	else
+	    target_extra_frags="$target_extra_frags ${srcdir}/config/${bfd_target}.mt"
+	fi
+    fi
+done
+
+# We don't do any links based on the target system, just makefile config.
+
+# post-target:
+
+rm -f Makefile.tmp Makefile.2
+mv Makefile Makefile.tmp
+
+case ${with_64_bit_bfd} in
+  yes)		want64=true  ;;
+  no | "")	want64=false ;;
+  *)
+    echo "*** bad value \"${with_64_bit_bfd}\" for 64-bit-bfd flag; ignored" 1>&2
+    ;;
+esac
+
+# This processing still needs to be done if we're to decide properly whether
+# 64-bit support needs to be compiled in.  Currently, it will be included if
+# the default or any other explicitly requested target requires it; it
+# will not be included on a 32-bit host if no 64-bit target is requested, and
+# no "--with-64-bit-bfd" option is given, even if "--with-targets=all" is
+# used.
+
+# The default vector in the primary target.
+DEFAULT_VECTOR=`sed -n '
+s/DEFAULT_VECTOR[ 	]*=[ 	]*\([^ 	]*\)/\1/p
+' $target_makefile_frag`
+
+allfrags="$target_makefile_frag $target_extra_frags"
+
+# The default and selected vectors in all the configured targets.
+SELECT_VECS=`sed -n '
+s/DEFAULT_VECTOR[ 	]*=[ 	]*\([^ 	]*\)/\1/p
+s/SELECT_VECS[ 	]*=[ 	]*\([^ 	]*\)/\1/p
+' $allfrags`
+# uniq the list.
+f=""
+for i in $SELECT_VECS ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+SELECT_VECS="$f"
+
+# The architectures in all the configured targets.
+SELECT_ARCHITECTURES=`sed -n '
+s/SELECT_ARCHITECTURES[ 	]*=[ 	]*//p
+' $allfrags`
+# uniq the list.
+f=""
+for i in $SELECT_ARCHITECTURES ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+SELECT_ARCHITECTURES="$f"
+
+# Target backend .o files.
+tb=
+
+for vec in $SELECT_VECS
+do
+    case "$vec" in
+    # This list is alphabetized to make it easy to compare
+    # with the two vector lists in targets.c.
+    a29kcoff_big_vec)		tb="$tb coff-a29k.o" ;;
+    a_out_adobe_vec)		tb="$tb aout-adobe.o aout32.o stab-syms.o" ;;
+    aout_mips_big_vec)		tb="$tb mipsbsd.o aout32.o stab-syms.o" ;;
+    aout_mips_little_vec)	tb="$tb mipsbsd.o aout32.o stab-syms.o" ;;
+    b_out_vec_big_host)		tb="$tb bout.o aout32.o stab-syms.o" ;;
+    b_out_vec_little_host)	tb="$tb bout.o aout32.o stab-syms.o" ;;
+    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.o elf32.o elf.o" ;;
+    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.o elf32.o elf.o" ;;
+    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.o elf32.o elf.o" ;;
+    bfd_elf32_i386_vec)		tb="$tb elf32-i386.o elf32.o elf.o" ;;
+    bfd_elf32_i860_vec)		tb="$tb elf32-i860.o elf32.o elf.o" ;;
+    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.o elf32.o elf.o" ;;
+    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.o elf32.o elf.o" ;;
+    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.o elf32.o elf.o" ;;
+    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.o elf32.o elf.o" ;;
+    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.o elf32.o elf.o" ;;
+    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.o elf64.o elf.o"
+				target64=true ;;
+    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.o elf64.o elf.o"
+				target64=true ;;
+#   start-sanitize-v9
+    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.o elf64.o elf.o"
+				target64=true ;;
+#   end-sanitize-v9
+    demo_64_vec)		tb="$tb demo64.o aout64.o stab-syms.o"
+				target64=true ;;
+    ecoff_big_vec)		tb="$tb coff-mips.o" ;;
+    ecoff_little_vec)		tb="$tb coff-mips.o" ;;
+    ecoffalpha_little_vec)	tb="$tb coff-alpha.o" ;;
+    h8300coff_vec)		tb="$tb coff-h8300.o reloc16.o" ;;
+    h8500coff_vec)		tb="$tb coff-h8500.o reloc16.o" ;;
+    host_aout_vec)		tb="$tb host-aout.o aout32.o stab-syms.o" ;;
+    hp300bsd_vec)		tb="$tb hp300bsd.o aout32.o stab-syms.o" ;;
+    hp300hpux_vec)		tb="$tb hp300hpux.o aout32.o stab-syms.o" ;;
+    hppa_vec)			tb="$tb som.o" ;;
+    i386aout_vec)		tb="$tb i386aout.o aout32.o stab-syms.o" ;;
+    i386bsd_vec)		tb="$tb i386bsd.o aout32.o stab-syms.o" ;;
+    netbsd386_vec)		tb="$tb netbsd386.o aout32.o stab-syms.o" ;;
+    i386coff_vec)		tb="$tb coff-i386.o" ;;
+    i386linux_vec)		tb="$tb i386linux.o aout32.o stab-syms.o" ;;
+    i386lynx_aout_vec)		tb="$tb i386lynx.o lynx-core.o aout32.o stab-syms.o" ;;
+    i386lynx_coff_vec)		tb="$tb i386lynx-cf.o lynx-core.o stab-syms.o" ;;
+    icoff_big_vec)		tb="$tb coff-i960.o" ;;
+    icoff_little_vec)		tb="$tb coff-i960.o" ;;
+    ieee_vec)			tb="$tb ieee.o" ;;
+    m68kcoff_vec)		tb="$tb coff-m68k.o" ;;
+    m68kcoffun_vec)		tb="$tb coff-u68k.o coff-m68k.o" ;;
+    m68klynx_aout_vec)		tb="$tb m68klynx.o lynx-core.o aout32.o stab-syms.o" ;;
+    m68klynx_coff_vec)		tb="$tb m68klynx-cf.o lynx-core.o stab-syms.o" ;;
+    m88kbcs_vec)		tb="$tb coff-m88k.o" ;;
+    newsos3_vec)		tb="$tb newsos3.o aout32.o stab-syms.o" ;;
+    nlm32_big_generic_vec)	tb="$tb nlm32-gen.o nlm32.o nlm.o" ;;
+    nlm32_i386_vec)		tb="$tb nlm32-i386.o nlm32.o nlm.o" ;;
+    nlm32_little_generic_vec) 	tb="$tb nlm32-gen.o nlm32.o nlm.o" ;;
+    nlm64_big_generic_vec)	tb="$tb nlm64-gen.o nlm64.o nlm.o"
+				target64=true ;;
+    nlm64_little_generic_vec) 	tb="$tb nlm64-gen.o nlm64.o nlm.o"
+				target64=true ;;
+    rs6000coff_vec)		tb="$tb coff-rs6000.o" ;;
+    shcoff_vec)			tb="$tb coff-sh.o reloc16.o" ;;
+    sunos_big_vec)		tb="$tb sunos.o aout32.o stab-syms.o" ;;
+    tekhex_vec)			tb="$tb tekhex.o" ;;
+    we32kcoff_vec)		tb="$tb coff-we32k.o" ;;
+    z8kcoff_vec)		tb="$tb coff-z8k.o reloc16.o" ;;
+
+    srec_vec)			tb="$tb srec.o" ;;
+    symbolsrec_vec)		tb="$tb srec.o" ;;
+
+    "")			;;
+    *) echo "*** unknown target vector $vec" 1>&2; exit 1 ;;
+    esac
+done
+
+# Target architecture .o files.
+ta=`echo $SELECT_ARCHITECTURES | sed -e s/bfd_/cpu-/g -e s/_arch/.o/g`
+
+# Weed out duplicate .o files.
+f=""
+for i in $tb ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+tb="$f"
+
+f=""
+for i in $ta ; do
+    case " $f " in
+    *" $i "*) ;;
+    *) f="$f $i" ;;
+    esac
+done
+ta="$f"
+
+bfd_backends="$tb"
+bfd_machines="$ta"
+
+if [ x${all_targets} = xtrue ]; then
+  bfd_backends="${bfd_backends}"' $(ALL_BACKENDS)'
+  bfd_machines="${bfd_machines}"' $(ALL_MACHINES)'
+else	# all_targets is true
+  # Only set these if they will be nonempty, for the clever echo.
+  test -n "$SELECT_VECS" &&
+    selvecs=`echo $SELECT_VECS | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
+  test -n "SELECT_ARCHITECTURES" &&
+    selarchs=`echo $SELECT_ARCHITECTURES | sed -e 's/ \(.\)/,\1/g'`
+fi	# all_targets is true
+
+case ${host64}-${target64}-${want64} in
+  *true*)
+    wordsize=64
+    all_backends='$(BFD64_BACKENDS) $(BFD32_BACKENDS)'
+    ;;
+  false-false-false)
+    wordsize=32
+    all_backends='$(BFD32_BACKENDS)'
+    ;;
+esac
+
+echo WORDSIZE=${wordsize}		>> Makefile.2
+echo ALL_BACKENDS=${all_backends}	>> Makefile.2
+echo BFD_BACKENDS=${bfd_backends}	>> Makefile.2
+echo BFD_MACHINES=${bfd_machines}	>> Makefile.2
+
+test -n "$DEFAULT_VECTOR" && defvec="$DEFAULT_VECTOR"
+
+echo "TDEFAULTS = \
+${defvec+-DDEFAULT_VECTOR=$defvec} \
+${selvecs+-DSELECT_VECS='$selvecs'} \
+${selarchs+-DSELECT_ARCHITECTURES='$selarchs'}" \
+  >> Makefile.2
+
+cat Makefile.tmp >> Makefile.2
+rm -f Makefile.tmp
+mv Makefile.2 Makefile