Correct ordering of args for cmov insn.

[deliverable/binutils-gdb.git] / ld / configure.in

diff --git a/ld/configure.in b/ld/configure.in
index 4913982a4dc7893c7c35c4428357e63ef1067e58..6d5d8960778ea0aea1b61bf0a87871d77d17a6d1 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -1,8 +1,14 @@
 dnl Process this file with autoconf to produce a configure script
 dnl
-AC_PREREG(2.0)
+AC_PREREG(2.5)
 AC_INIT(ldmain.c)
 
+AC_CANONICAL_SYSTEM
+
+AM_INIT_AUTOMAKE(ld, 2.8.2)
+
+AM_PROG_LIBTOOL
+
 AC_ARG_ENABLE(targets,
 [  --enable-targets        alternative target configurations],
 [case "${enableval}" in
@@ -11,25 +17,38 @@ AC_ARG_ENABLE(targets,
   no)       enable_targets= ;;
   *)        enable_targets=$enableval ;;
 esac])dnl
+AC_ARG_ENABLE(64-bit-bfd,
+[  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)],
+[case "${enableval}" in
+  yes)  want64=true  ;;
+  no)   want64=false ;;
+  *)    AC_MSG_ERROR(bad value ${enableval} for 64-bit-bfd option) ;;
+esac],[want64=false])dnl
 
-AC_CONFIG_HEADER(config.h:config.in)
+AM_CONFIG_HEADER(config.h:config.in)
 
-AC_CONFIG_AUX_DIR(`cd $srcdir/..; pwd`)
-AC_CANONICAL_SYSTEM
 if test -z "$target" ; then
     AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
 fi
 if test -z "$host" ; then
     AC_MSG_ERROR(Unrecognized host system type; please check config.sub.)
 fi
-AC_ARG_PROGRAM
 
 # host-specific stuff:
 
+AC_PROG_CC
+AM_PROG_INSTALL
+AM_CYGWIN32
+AM_EXEEXT
+
+AC_PROG_YACC
+AC_PROG_LEX
+AC_DECL_YYTEXT
+
+AM_MAINTAINER_MODE
+
 . ${srcdir}/configure.host
 
-AC_PROG_CC
-AC_SUBST(CFLAGS)
 AC_SUBST(HDEFINES)
 AC_SUBST(HOSTING_CRT0)
 AC_SUBST(HOSTING_LIBS)
@@ -37,63 +56,71 @@ AC_SUBST(NATIVE_LIB_DIRS)
 
 AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h)
 AC_CHECK_FUNCS(sbrk)
+AC_HEADER_DIRENT
 
 BFD_BINARY_FOPEN
 
-# target-specific stuff:
+BFD_NEED_DECLARATION(strstr)
+BFD_NEED_DECLARATION(free)
+BFD_NEED_DECLARATION(sbrk)
+BFD_NEED_DECLARATION(getenv)
 
-# Canonicalize the secondary target names.
-if test -n "$enable_targets"; then
-    for targ in `echo $enable_targets | sed 's/,/ /g'`
-    do
-       result=`$ac_config_sub $targ 2>/dev/null`
-       if test -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
-    done
-fi
+# target-specific stuff:
 
-all_targets=false
+all_targets=
 EMUL=
 all_emuls=
+TDIRS=
 
-for targ in $target $canon_targets
+for targ_alias in `echo $target_alias $enable_targets | sed 's/,/ /g'`
 do
-    if test "x$targ" = "xall"; then
-        all_targets=true
+  if test "$targ_alias" = "all"; then
+    all_targets=true
+  else
+    # Canonicalize the secondary target names.
+    result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ_alias 2>/dev/null`
+    if test -n "$result"; then
+       targ=$result
     else
-       . ${srcdir}/configure.tgt
+       targ=$targ_alias
+    fi
 
-       if test "x$targ" = "x$target"; then
-           EMUL=${targ_emul}
-       fi
+    . ${srcdir}/configure.tgt
 
-       all_emuls="${all_emuls} ${targ_emul} ${targ_extra_emuls}"
+    if test "$targ" = "$target"; then
+      EMUL=$targ_emul
     fi
-done
-
-AC_SUBST(EMUL)
 
-if test x${all_targets} = xfalse; then
-    # uniq the list.
-    f=""
-    for i in $all_emuls ; do
-       case " $f " in
-       *" e$i.o "*) ;;
-       *) f="$f e$i.o" ;;
+    for i in $targ_emul $targ_extra_emuls; do
+       case " $all_emuls " in
+       *" e${i}.o "*) ;;
+       *)
+         all_emuls="$all_emuls e${i}.o"
+         eval result=\$tdir_$i
+         test -z "$result" && result=$targ_alias
+         TDIRS="$TDIRS\\
+tdir_$i=$result"
+         ;;
        esac
     done
+  fi
+done
 
-    EMULATION_OFILES="$f"
-
-else   # all_targets is true
+AC_SUBST(EMUL)
+AC_SUBST(TDIRS)
+
+dnl FIXME: We will build a 64 bit BFD for a 64 bit host or a 64 bit
+dnl target, and in those cases we should also build the 64 bit
+dnl emulations.
+if test x${all_targets} = xtrue; then
+  if test x${want64} = xtrue; then
+    EMULATION_OFILES='$(ALL_EMULATIONS) $(ALL_64_EMULATIONS)'
+  else
     EMULATION_OFILES='$(ALL_EMULATIONS)'
-fi     # all_targets is true
-
+  fi
+else
+  EMULATION_OFILES=$all_emuls
+fi
 AC_SUBST(EMULATION_OFILES)
 
-AC_OUTPUT(Makefile,
-[case x$CONFIG_HEADERS in xconfig.h:config.in) echo > stamp-h ;; esac])
+AC_OUTPUT(Makefile)