diff --git a/ld/ChangeLog b/ld/ChangeLog
index da54c5c560..5b65746a30 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -4,6 +4,11 @@
 	* ld.texinfo (--be8): Add a note about the interaction of this
 	option with the assembler's -EB option.
 
+2015-04-10  Alan Modra  <amodra@gmail.com>
+
+	* configure.ac: Set elf_list_options etc. in proper case.
+	* configure: Regenerate.
+
 2015-04-10  Alan Modra  <amodra@gmail.com>
 
 	PR ld/18223
diff --git a/ld/configure b/ld/configure
index b528f74d65..a558d28b30 100755
--- a/ld/configure
+++ b/ld/configure
@@ -17064,7 +17064,12 @@ 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
@@ -17078,12 +17083,6 @@ do
 	    ;;
 	  esac
 	  ;;
-	*)
-	  all_emuls="$all_emuls e${i}.o"
-	  eval result=\$tdir_$i
-	  test -z "$result" && result=$targ_alias
-	  echo tdir_$i=$result >> tdirs
-	  ;;
 	esac
     done
 
diff --git a/ld/configure.ac b/ld/configure.ac
index ac3c14f01a..e120a05c64 100644
--- a/ld/configure.ac
+++ b/ld/configure.ac
@@ -317,7 +317,12 @@ 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
@@ -331,12 +336,6 @@ do
 	    ;;
 	  esac
 	  ;;
-	*)
-	  all_emuls="$all_emuls e${i}.o"
-	  eval result=\$tdir_$i
-	  test -z "$result" && result=$targ_alias
-	  echo tdir_$i=$result >> tdirs
-	  ;;
 	esac
     done