--- configure.orig	2015-05-03 17:29:57 UTC
+++ configure
@@ -2947,7 +2947,7 @@ case "${ENABLE_GOLD}" in
     case "${target}" in
       *-*-elf* | *-*-sysv4* | *-*-unixware* | *-*-eabi* | hppa*64*-*-hpux* \
       | *-*-linux* | *-*-gnu* | frv-*-uclinux* | *-*-irix5* | *-*-irix6* \
-      | *-*-netbsd* | *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* \
+      | *-*-netbsd* | *-*-openbsd* | *-*-bsdsunix* | *-*-freebsd* | *-*-dragonfly* \
       | *-*-solaris2* | *-*-nto* | *-*-nacl*)
         case "${target}" in
           *-*-linux*aout* | *-*-linux*oldld*)
@@ -3165,7 +3165,7 @@ if test x$enable_libgomp = x ; then
     case "${target}" in
     *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
 	;;
-    *-*-netbsd* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
+    *-*-netbsd* | *-*-bsdsunix* | *-*-freebsd* | *-*-openbsd* | *-*-dragonfly*)
 	;;
     *-*-solaris2* | *-*-hpux11*)
 	;;
@@ -3408,6 +3408,10 @@ case "${target}" in
     ;;
   powerpc-*-aix* | rs6000-*-aix*)
     ;;
+  powerpc-*-bsdsunix*)
+    ;;
+  powerpc64-*-bsdsunix*)
+    ;;
   powerpc-*-freebsd*)
     ;;
   powerpc64-*-freebsd*)
@@ -3458,6 +3462,9 @@ case "${target}" in
   alpha*-*-*vms*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
+  arm*-*-bsdsunix*)
+    noconfigdirs="$noconfigdirs ${libgcj}"
+    ;;
   arm*-*-freebsd*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
@@ -3624,6 +3631,9 @@ case "${target}" in
   *-*-dragonfly*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
+  *-*-bsdsunix*)
+    noconfigdirs="$noconfigdirs target-newlib target-libgloss"
+    ;;
   *-*-freebsd*)
     noconfigdirs="$noconfigdirs target-newlib target-libgloss"
     ;;
@@ -3674,6 +3684,12 @@ case "${target}" in
     ;;
   *-*-dragonfly*)
     ;;
+  *-*-bsdsunix*)
+    if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \
+	&& test -f /usr/local/include/gmp.h; then
+      with_gmp=/usr/local
+    fi
+    ;;
   *-*-freebsd*)
     if test "x$with_gmp" = x && test "x$with_gmp_dir" = x \
 	&& test -f /usr/local/include/gmp.h; then