Explicit locations: introduce explicit locations

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

diff --git a/ld/configure.ac b/ld/configure.ac
index ac3c14f01a16e011a20e5ee5cbc33feb06e80fdb..62aed09aed9bae99b98626e846ce6e5d0e6a916a 100644 (file)
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -31,6 +31,7 @@ AM_MAINTAINER_MODE
 
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_GREP
 AC_GNU_SOURCE
 AC_USE_SYSTEM_EXTENSIONS
 AC_PROG_INSTALL
@@ -317,10 +318,23 @@ do
 
     for i in $targ_emul $targ_extra_emuls $targ_extra_libpath; do
        case " $all_emuls " in
-       *" e${i}.o "*)
+       *" e${i}.o "*) ;;
+       *)
+         all_emuls="$all_emuls e${i}.o"
+         eval result=\$tdir_$i
+         test -z "$result" && result=$targ_alias
+         echo tdir_$i=$result >> tdirs
          case "${i}" in
          *elf*)
            elf_list_options=TRUE
+           ;;
+         *)
+           if $GREP "TEMPLATE_NAME=elf32" ${srcdir}/emulparams/${i}.sh >/dev/null 2>/dev/null; then
+             elf_list_options=TRUE
+           fi
+           ;;
+         esac
+         if test "$elf_list_options" = "TRUE"; then
            . ${srcdir}/emulparams/${i}.sh
            if test x${GENERATE_SHLIB_SCRIPT} = xyes; then
              elf_shlib_list_options=TRUE
@@ -328,14 +342,7 @@ do
            if test x${PLT_UNWIND} = xyes; then
              elf_plt_unwind_list_options=TRUE
            fi
-           ;;
-         esac
-         ;;
-       *)
-         all_emuls="$all_emuls e${i}.o"
-         eval result=\$tdir_$i
-         test -z "$result" && result=$targ_alias
-         echo tdir_$i=$result >> tdirs
+         fi
          ;;
        esac
     done