X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=ld%2Fconfigure.tgt;h=8d4c3490d2f9613fdbc371c5f0abd4d4d0f7d7cc;hb=1e9d6fc2630d2b72281d58c3fb0807799513f3ff;hp=4171d8c9923f8efbc5a70af1c1c32a6746084c1f;hpb=3c99554527e111da0d70113852cad436c9a9d688;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/configure.tgt b/ld/configure.tgt
index 4171d8c992..8d4c3490d2 100644
--- a/ld/configure.tgt
+++ b/ld/configure.tgt
@@ -27,6 +27,14 @@ targ64_extra_libpath=
 # architecture variants should be kept together even if their names
 # break the alpha sorting.
 case "${targ}" in
+aarch64_be-*-elf)	targ_emul=aarch64elfb
+			targ_extra_emuls="aarch64elf armelfb armelf" ;;
+aarch64-*-elf)		targ_emul=aarch64elf
+			targ_extra_emuls="aarch64elfb armelf armelfb" ;;
+aarch64_be-*-linux*)	targ_emul=aarch64linuxb
+			targ_extra_emuls="aarch64linux aarch64elfb aarch64elf armelfb_linux_eabi armelf_linux_eabi armelfb armelf" ;;
+aarch64-*-linux*)	targ_emul=aarch64linux
+			targ_extra_emuls="aarch64linuxb aarch64elf aarch64elfb armelf_linux_eabi armelfb_linux_eabi armelf armelfb" ;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
 		        targ_emul=elf64alpha_fbsd
 			targ_extra_emuls="elf64alpha alpha"
@@ -205,10 +213,10 @@ i[3-7]86-*-linux-*)	targ_emul=elf_i386
 			targ_extra_libpath=elf32_x86_64
 			tdir_i386linux=${targ_alias}aout ;;
 x86_64-*-linux-gnux32)	targ_emul=elf32_x86_64
-			targ_extra_emuls="elf_x86_64 elf_i386 i386linux elf_l1om"
-			targ_extra_libpath="elf_i386 elf_x86_64 elf_l1om"
-			tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
-			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
+			targ_extra_emuls="elf_x86_64 elf_i386 i386linux elf_l1om elf_k1om"
+			targ_extra_libpath="elf_i386 elf_x86_64 elf_l1om elf_k1om"
+			tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'`
+			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/' -e 's/-linux-gnux32/-linux-gnu/'` ;;
 x86_64-*-linux-*)	targ_emul=elf_x86_64
 			targ_extra_emuls="elf32_x86_64 elf_i386 i386linux elf_l1om elf_k1om"
 			targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om"
@@ -416,7 +424,8 @@ mips*vr5000el-*-elf*)	targ_emul=elf32l4300 ;;
 mips*vr5000-*-elf*)	targ_emul=elf32b4300 ;;
 mips*el-sde-elf*)	targ_emul=elf32ltsmip
 			targ_extra_emuls="elf32btsmip elf32ltsmipn32 elf64ltsmip elf32btsmipn32 elf64btsmip" ;;
-mips*-sde-elf*)		targ_emul=elf32btsmip
+mips*-sde-elf* | mips*-mti-elf*)
+			targ_emul=elf32btsmip
 			targ_extra_emuls="elf32ltsmip elf32btsmipn32 elf64btsmip elf32ltsmipn32 elf64ltsmip" ;;
 mips*el-*-elf*)		targ_emul=elf32elmip ;;
 mips*-*-elf*)		targ_emul=elf32ebmip ;;
@@ -512,26 +521,35 @@ powerpc*-*-linux*)	case "${targ}" in
 			esac ;;
 powerpc*le-*-elf* | powerpc*le-*-eabi* | powerpc*le-*-solaris* \
   | powerpc*le-*-sysv* | powerpc*le-*-vxworks*)
-		       case "${targ}" in
-		       *64*)	targ_emul=elf64lppc
-		       		targ_extra_emuls="elf32lppc elf32lppcsim"
+			case "${targ}" in
+			*64*)	targ_emul=elf64lppc
+				targ_extra_emuls="elf32lppc elf32lppcsim"
+				targ_extra_libpath=elf32lppc
 				tdir_elf32lppc=`echo "${targ_alias}" | sed -e 's/64//'`
 				tdir_elf32lppcsim=$tdir_elf32lppc
 				;;
 			*)	targ_emul=elf32lppc
-				targ_extra_emuls="elf32ppcsim" ;;
+				targ_extra_emuls=elf32lppcsim
+				targ64_extra_emuls=elf64lppc
+				targ64_extra_libpath=elf64lppc
+				;;
 			esac ;;
 powerpc*-*-elf* | powerpc*-*-eabi* | powerpc*-*-sysv* \
   | powerpc*-*-netbsd* | powerpc-*-openbsd* | powerpc*-*-kaos*)
-  		       case "${targ}" in
-		       *64*)	targ_emul=elf64ppc
-		       		targ_extra_emuls="elf32ppc elf32ppclinux elf32ppcsim"
+			case "${targ}" in
+			*64*)	targ_emul=elf64ppc
+				targ_extra_emuls="elf32ppc elf32ppclinux elf32ppcsim"
+				targ_extra_libpath="elf32ppc elf32ppclinux"
 				tdir_elf32ppc=`echo "${targ_alias}" | sed -e 's/64//'`
 				tdir_elf32ppclinux=$tdir_elf32ppc
 				tdir_elf32ppcsim=$tdir_elf32ppc
 				;;
 			*)	targ_emul=elf32ppc
-				targ_extra_emuls="elf32ppclinux elf32ppcsim" ;;
+				targ_extra_emuls="elf32ppclinux elf32ppcsim"
+				targ_extra_libpath=elf32ppclinux
+				targ64_extra_emuls=elf64ppc
+				targ64_extra_libpath=elf64ppc
+				;;
 			esac ;;
 powerpc-*-vxworks*)
 			targ_emul=elf32ppcvxworks