--- ld/Makefile.am.orig	2016-08-03 07:36:54 UTC
+++ ld/Makefile.am
@@ -174,6 +174,7 @@ ALL_EMULATION_SOURCES = \
 	earmaoutl.c \
 	earmcoff.c \
 	earmelf.c \
+	earmelf_bsdsux.c \
 	earmelf_fbsd.c \
 	earmelf_linux.c \
 	earmelf_linux_eabi.c \
@@ -182,6 +183,7 @@ ALL_EMULATION_SOURCES = \
 	earmelf_phoenix.c \
 	earmelf_vxworks.c \
 	earmelfb.c \
+	earmelfb_bsdsux.c \
 	earmelfb_fbsd.c \
 	earmelfb_linux.c \
 	earmelfb_linux_eabi.c \
@@ -268,6 +270,7 @@ ALL_EMULATION_SOURCES = \
 	eelf32or1k.c \
 	eelf32or1k_linux.c \
 	eelf32ppc.c \
+	eelf32ppc_bsdsux.c \
 	eelf32ppc_fbsd.c \
 	eelf32ppclinux.c \
 	eelf32ppcnto.c \
@@ -288,6 +291,7 @@ ALL_EMULATION_SOURCES = \
 	eelf32xtensa.c \
 	eelf_i386.c \
 	eelf_i386_be.c \
+	eelf_i386_bsdsux.c \
 	eelf_i386_chaos.c \
 	eelf_i386_fbsd.c \
 	eelf_i386_ldso.c \
@@ -444,6 +448,8 @@ ALL_64_EMULATION_SOURCES = \
 	eaarch64elf32b.c \
 	eaarch64cloudabi.c \
 	eaarch64cloudabib.c \
+	eaarch64bsdsux.c \
+	eaarch64bsdsuxb.c \
 	eaarch64fbsd.c \
 	eaarch64fbsdb.c \
 	eaarch64linux.c \
@@ -457,8 +463,10 @@ ALL_64_EMULATION_SOURCES = \
 	eelf32bmipn32.c \
 	eelf32bsmip.c \
 	eelf32btsmip.c \
+	eelf32btsmip_bsdsux.c \
 	eelf32btsmip_fbsd.c \
 	eelf32btsmipn32.c \
+	eelf32btsmipn32_bsdsux.c \
 	eelf32btsmipn32_fbsd.c \
 	eelf32ebmip.c \
 	eelf32ebmipvxworks.c \
@@ -470,40 +478,51 @@ ALL_64_EMULATION_SOURCES = \
 	eelf32lr5900n32.c \
 	eelf32lsmip.c \
 	eelf32ltsmip.c \
+	eelf32ltsmip_bsdsux.c \
 	eelf32ltsmip_fbsd.c \
 	eelf32ltsmipn32.c \
+	eelf32ltsmipn32_bsdsux.c \
 	eelf32ltsmipn32_fbsd.c \
 	eelf32mipswindiss.c \
 	eelf64_aix.c \
 	eelf64_ia64.c \
+	eelf64_ia64_bsdsux.c \
 	eelf64_ia64_fbsd.c \
 	eelf64_ia64_vms.c \
 	eelf64_s390.c \
 	eelf64_sparc.c \
+	eelf64_sparc_bsdsux.c \
 	eelf64_sparc_fbsd.c \
 	eelf64_sparc_sol2.c \
 	eelf64alpha.c \
+	eelf64alpha_bsdsux.c \
 	eelf64alpha_fbsd.c \
 	eelf64alpha_nbsd.c \
 	eelf64bmip.c \
 	eelf64btsmip.c \
+	eelf64btsmip_bsdsux.c \
 	eelf64btsmip_fbsd.c \
 	eelf64hppa.c \
 	eelf64lppc.c \
 	eelf64ltsmip.c \
+	eelf64ltsmip_bsdsux.c \
 	eelf64ltsmip_fbsd.c \
 	eelf64mmix.c \
 	eelf64ppc.c \
+	eelf64ppc_bsdsux.c \
 	eelf64ppc_fbsd.c \
 	eelf64rdos.c \
 	eelf64tilegx.c \
 	eelf64tilegx_be.c \
 	eelf_l1om.c \
+	eelf_l1om_bsdsux.c \
 	eelf_l1om_fbsd.c \
 	eelf_k1om.c \
+	eelf_k1om_bsdsux.c \
 	eelf_k1om_fbsd.c \
 	eelf_x86_64.c \
 	eelf_x86_64_cloudabi.c \
+	eelf_x86_64_bsdsux.c \
 	eelf_x86_64_fbsd.c \
 	eelf_x86_64_nacl.c \
 	eelf_x86_64_sol2.c \
@@ -752,6 +771,11 @@ earmelf.c: $(srcdir)/emulparams/armelf.s
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+earmelf_bsdsux.c: $(srcdir)/emulparams/armelf_bsdsux.sh \
+  $(srcdir)/emulparams/armelf.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 earmelf_fbsd.c: $(srcdir)/emulparams/armelf_fbsd.sh \
   $(srcdir)/emulparams/armelf.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
@@ -792,6 +816,11 @@ earmelfb.c: $(srcdir)/emulparams/armelfb
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+earmelfb_bsdsux.c: $(srcdir)/emulparams/armelfb_bsdsux.sh \
+  $(srcdir)/emulparams/armelf_bsdsux.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 earmelfb_fbsd.c: $(srcdir)/emulparams/armelfb_fbsd.sh \
   $(srcdir)/emulparams/armelf_fbsd.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/armelf.em \
@@ -1038,6 +1067,10 @@ eelf32btsmip.c: $(srcdir)/emulparams/elf
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf32btsmip_bsdsux.c: $(srcdir)/emulparams/elf32btsmip_bsdsux.sh \
+  $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
+  $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf32btsmip_fbsd.c: $(srcdir)/emulparams/elf32btsmip_fbsd.sh \
   $(srcdir)/emulparams/elf32bmip.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1046,6 +1079,10 @@ eelf32btsmipn32.c: $(srcdir)/emulparams/
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf32btsmipn32_bsdsux.c: $(srcdir)/emulparams/elf32btsmipn32_bsdsux.sh \
+  $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
+  $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf32btsmipn32_fbsd.c: $(srcdir)/emulparams/elf32btsmipn32_fbsd.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1171,6 +1208,11 @@ eelf32ltsmip.c: $(srcdir)/emulparams/elf
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
   ${GEN_DEPENDS}
 
+eelf32ltsmip_bsdsux.c: $(srcdir)/emulparams/elf32ltsmip_bsdsux.sh \
+  $(srcdir)/emulparams/elf32btsmip.sh $(srcdir)/emulparams/elf32bmip.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
+  ${GEN_DEPENDS}
+
 eelf32ltsmip_fbsd.c: $(srcdir)/emulparams/elf32ltsmip_fbsd.sh \
   $(srcdir)/emulparams/elf32btsmip.sh $(srcdir)/emulparams/elf32bmip.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc \
@@ -1181,6 +1223,11 @@ eelf32ltsmipn32.c: $(srcdir)/emulparams/
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf32ltsmipn32_bsdsux.c: $(srcdir)/emulparams/elf32ltsmipn32_bsdsux.sh \
+  $(srcdir)/emulparams/elf32btsmipn32.sh \
+  $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
+  $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf32ltsmipn32_fbsd.c: $(srcdir)/emulparams/elf32ltsmipn32_fbsd.sh \
   $(srcdir)/emulparams/elf32btsmipn32.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
@@ -1235,6 +1282,12 @@ eelf32ppc.c: $(srcdir)/emulparams/elf32p
   $(srcdir)/emultempl/ppc32elf.em ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf32ppc_bsdsux.c: $(srcdir)/emulparams/elf32ppc_bsdsux.sh \
+  $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
+  $(srcdir)/emultempl/ppc32elf.em $(ELF_DEPS) \
+  ldemul-list.h \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf32ppc_fbsd.c: $(srcdir)/emulparams/elf32ppc_fbsd.sh \
   $(srcdir)/emulparams/elf32ppc.sh $(srcdir)/emulparams/elf32ppccommon.sh \
   $(srcdir)/emultempl/ppc32elf.em ldemul-list.h \
@@ -1318,6 +1371,10 @@ eelf_i386_be.c: $(srcdir)/emulparams/elf
 eelf_i386_chaos.c: $(srcdir)/emulparams/elf_i386_chaos.sh \
   $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf_chaos.sc ${GEN_DEPENDS}
 
+eelf_i386_bsdsux.c: $(srcdir)/emulparams/elf_i386_bsdsux.sh \
+  $(srcdir)/emulparams/elf_i386.sh \
+  $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf_i386_fbsd.c: $(srcdir)/emulparams/elf_i386_fbsd.sh \
   $(srcdir)/emulparams/elf_i386.sh \
   $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1645,6 +1702,14 @@ eaarch64cloudabib.c: $(srcdir)/emulparam
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eaarch64bsdsux.c: $(srcdir)/emulparams/aarch64bsdsux.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
+eaarch64bsdsuxb.c: $(srcdir)/emulparams/aarch64bsdsuxb.sh $(srcdir)/emulparams/aarch64bsdsux.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eaarch64fbsd.c: $(srcdir)/emulparams/aarch64fbsd.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/aarch64elf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1890,6 +1955,12 @@ eelf64_ia64.c: $(srcdir)/emulparams/elf6
   $(srcdir)/emultempl/needrelax.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf64_ia64_bsdsux.c: $(srcdir)/emulparams/elf64_ia64_bsdsux.sh \
+  $(srcdir)/emulparams/elf64_ia64.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/ia64elf.em \
+  $(srcdir)/emultempl/needrelax.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf64_ia64_fbsd.c: $(srcdir)/emulparams/elf64_ia64_fbsd.sh \
   $(srcdir)/emulparams/elf64_ia64.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/ia64elf.em \
@@ -1907,6 +1978,10 @@ eelf64_s390.c: $(srcdir)/emulparams/elf6
 eelf64_sparc.c: $(srcdir)/emulparams/elf64_sparc.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf64_sparc_bsdsux.c: $(srcdir)/emulparams/elf64_sparc_bsdsux.sh \
+  $(srcdir)/emulparams/elf64_sparc.sh \
+  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf64_sparc_fbsd.c: $(srcdir)/emulparams/elf64_sparc_fbsd.sh \
   $(srcdir)/emulparams/elf64_sparc.sh \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1921,6 +1996,11 @@ eelf64alpha.c: $(srcdir)/emulparams/elf6
   $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
   $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf64alpha_bsdsux.c: $(srcdir)/emulparams/elf64alpha_bsdsux.sh \
+  $(srcdir)/emulparams/elf64alpha.sh \
+  $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
+  $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf64alpha_fbsd.c: $(srcdir)/emulparams/elf64alpha_fbsd.sh \
   $(srcdir)/emulparams/elf64alpha.sh \
   $(ELF_DEPS) $(srcdir)/emultempl/alphaelf.em \
@@ -1942,6 +2022,11 @@ eelf64btsmip.c: $(srcdir)/emulparams/elf
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf64btsmip_bsdsux.c: $(srcdir)/emulparams/elf64btsmip_bsdsux.sh \
+  $(srcdir)/emulparams/elf64bmip-defs.sh \
+  $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
+  $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf64btsmip_fbsd.c: $(srcdir)/emulparams/elf64btsmip_fbsd.sh \
   $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
@@ -1960,6 +2045,11 @@ eelf64ltsmip.c: $(srcdir)/emulparams/elf
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
   $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf64ltsmip_bsdsux.c: $(srcdir)/emulparams/elf64ltsmip_bsdsux.sh \
+  $(srcdir)/emulparams/elf64btsmip_bsdsux.sh $(srcdir)/emulparams/elf64bmip-defs.sh \
+  $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
+  $(srcdir)/emultempl/mipself.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf64ltsmip_fbsd.c: $(srcdir)/emulparams/elf64ltsmip_fbsd.sh \
   $(srcdir)/emulparams/elf64btsmip_fbsd.sh $(srcdir)/emulparams/elf64bmip-defs.sh \
   $(srcdir)/emulparams/elf32bmipn32-defs.sh $(ELF_DEPS) \
@@ -1973,6 +2063,10 @@ eelf64ppc.c: $(srcdir)/emulparams/elf64p
   ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf64ppc_bsdsux.c: $(srcdir)/emulparams/elf64ppc_bsdsux.sh \
+  $(srcdir)/emultempl/ppc64elf.em ldemul-list.h \
+  $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf64ppc_fbsd.c: $(srcdir)/emulparams/elf64ppc_fbsd.sh \
   $(srcdir)/emultempl/ppc64elf.em ldemul-list.h \
   $(ELF_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1991,6 +2085,10 @@ eelf64tilegx_be.c: $(srcdir)/emulparams/
 eelf_l1om.c: $(srcdir)/emulparams/elf_l1om.sh \
   $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf_l1om_bsdsux.c: $(srcdir)/emulparams/elf_l1om_bsdsux.sh \
+  $(srcdir)/emulparams/elf_l1om.sh \
+  $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf_l1om_fbsd.c: $(srcdir)/emulparams/elf_l1om_fbsd.sh \
   $(srcdir)/emulparams/elf_l1om.sh \
   $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -1998,6 +2096,10 @@ eelf_l1om_fbsd.c: $(srcdir)/emulparams/e
 eelf_k1om.c: $(srcdir)/emulparams/elf_k1om.sh \
   $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf_k1om_bsdsux.c: $(srcdir)/emulparams/elf_k1om_bsdsux.sh \
+  $(srcdir)/emulparams/elf_k1om.sh \
+  $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf_k1om_fbsd.c: $(srcdir)/emulparams/elf_k1om_fbsd.sh \
   $(srcdir)/emulparams/elf_k1om.sh \
   $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
@@ -2009,6 +2111,10 @@ eelf_x86_64_cloudabi.c: $(srcdir)/emulpa
   $(srcdir)/emulparams/elf_x86_64.sh \
   $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
 
+eelf_x86_64_bsdsux.c: $(srcdir)/emulparams/elf_x86_64_bsdsux.sh \
+  $(srcdir)/emulparams/elf_x86_64.sh \
+  $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}
+
 eelf_x86_64_fbsd.c: $(srcdir)/emulparams/elf_x86_64_fbsd.sh \
   $(srcdir)/emulparams/elf_x86_64.sh \
   $(ELF_X86_DEPS) $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS}