diff --git a/ld/ChangeLog b/ld/ChangeLog
index ae4c08da1fea8d09a417d33ebfae1ff0df6c7a1b..c216fb00043fa6666fb488d4d3537e9276159e55 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+2013-11-25  Yufeng Zhang  <yufeng.zhang@arm.com>
+
+	Backport from master
+
+	2013-11-21  Andrew Pinski  <apinski@cavium.com>
+
+	* configure.tgt (aarch64_be-*-linux*): Split out the linux targets
+	into targ_extra_libpath.
+	(aarch64-*-linux*): Likewise.
+
 2013-11-22  Cory Fields  <cory@coryfields.com>
 
 	* libcoff-in.h: Add insert_timestamp flag to the pe_data struct.
diff --git a/ld/configure.tgt b/ld/configure.tgt
index eefb7723011a09a7a550006fce676313a473e02b..5d23732b6c168ae4ee2b428c4d7e4d4d56ec7b44 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -50,9 +50,11 @@ aarch64_be-*-elf)	targ_emul=aarch64elfb
 aarch64-*-elf)		targ_emul=aarch64elf
 			targ_extra_emuls="aarch64elf32 aarch64elf32b aarch64elfb armelf armelfb" ;;
 aarch64_be-*-linux*)	targ_emul=aarch64linuxb
-			targ_extra_emuls="aarch64linux aarch64elfb aarch64elf aarch64elf32 aarch64elf32b armelfb_linux_eabi armelf_linux_eabi armelfb armelf" ;;
+			targ_extra_libpath="aarch64linux armelfb_linux_eabi armelf_linux_eabi"
+			targ_extra_emuls="aarch64elfb aarch64elf aarch64elf32 aarch64elf32b armelfb armelf $targ_extra_libpath" ;;
 aarch64-*-linux*)	targ_emul=aarch64linux
-			targ_extra_emuls="aarch64linuxb aarch64elf aarch64elf32 aarch64elf32b aarch64elfb armelf_linux_eabi armelfb_linux_eabi armelf armelfb" ;;
+			targ_extra_libpath="aarch64linuxb armelfb_linux_eabi armelf_linux_eabi"
+			targ_extra_emuls="aarch64elf aarch64elf32 aarch64elf32b aarch64elfb armelf armelfb $targ_extra_libpath" ;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
 		        targ_emul=elf64alpha_fbsd
 			targ_extra_emuls="elf64alpha alpha"