--- gdb/configure.tgt.orig	2016-10-10 15:12:16.102772000 +0200
+++ gdb/configure.tgt	2016-10-10 15:17:43.468480000 +0200
@@ -56,6 +56,11 @@
 	gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alpha-linux-tdep.o \
 			linux-tdep.o solib-svr4.o"
 	;;
+alpha*-*-bsdsunix*)
+	# Target: BSDSUniX/alpha
+	gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
+			alphabsdsux-tdep.o solib-svr4.o"
+	;;
 alpha*-*-freebsd* | alpha*-*-kfreebsd*-gnu)
 	# Target: FreeBSD/alpha
 	gdb_target_obs="alpha-tdep.o alpha-mdebug-tdep.o alphabsd-tdep.o \
@@ -187,6 +192,11 @@
 	# Target: DICOS/i386
 	gdb_target_obs="i386-tdep.o i387-tdep.o dicos-tdep.o i386-dicos-tdep.o"
 	;;
+i[34567]86-*-bsdsunix*)
+	# Target: BSDSUniX/i386
+	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386bsdsux-tdep.o \
+			bsd-uthread.o bsdsux-tdep.o solib-svr4.o"
+	;;
 i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
 	# Target: FreeBSD/i386
 	gdb_target_obs="i386-tdep.o i387-tdep.o i386bsd-tdep.o i386fbsd-tdep.o \
@@ -405,6 +415,13 @@
 	gdb_target_obs="nios2-tdep.o"
 	;;
 
+powerpc*-*-bsdsunix*)
+	# Target: BSDSUniX/powerpc
+	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
+		        ppcbsdsux-tdep.o bsdsux-tdep.o solib-svr4.o \
+			ravenscar-thread.o ppc-ravenscar-thread.o"
+	;;
+
 powerpc*-*-freebsd*)
 	# Target: FreeBSD/powerpc
 	gdb_target_obs="rs6000-tdep.o ppc-sysv-tdep.o ppc64-tdep.o \
@@ -529,6 +546,12 @@
 			ravenscar-thread.o sparc-ravenscar-thread.o"
 	build_gdbserver=yes
 	;;
+sparc*-*-bsdsunix*)
+	# Target: BSDSUniX/sparc64
+	gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64bsdsux-tdep.o \
+			bsdsux-tdep.o solib-svr4.o \
+			ravenscar-thread.o sparc-ravenscar-thread.o"
+	;;
 sparc*-*-freebsd* | sparc*-*-kfreebsd*-gnu)
 	# Target: FreeBSD/sparc64
 	gdb_target_obs="sparc-tdep.o sparc64-tdep.o sparc64fbsd-tdep.o \
@@ -657,6 +680,12 @@
 			solib-svr4.o symfile-mem.o linux-tdep.o linux-record.o"
 	build_gdbserver=yes
 	;;
+x86_64-*-bsdsunix*)
+	# Target: BSDSUniX/amd64
+	gdb_target_obs="amd64-tdep.o amd64bsdsux-tdep.o i386-tdep.o \
+			i387-tdep.o i386bsd-tdep.o i386bsdsux-tdep.o \
+			bsd-uthread.o bsdsux-tdep.o solib-svr4.o"
+	;;
 x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
 	# Target: FreeBSD/amd64
 	gdb_target_obs="amd64-tdep.o amd64fbsd-tdep.o i386-tdep.o \
@@ -697,6 +726,8 @@
 # map target onto default OS ABI
 
 case "${targ}" in
+*-*-bsdsunix*)
+		gdb_osabi=GDB_OSABI_BSDSUNIX_ELF ;;
 *-*-freebsd* | *-*-kfreebsd*-gnu)
 		gdb_osabi=GDB_OSABI_FREEBSD_ELF ;;
 *-*-linux* | *-*-uclinux*)