--- mpi/config.links.orig	2015-12-19 15:08:22.000000000 +0100
+++ mpi/config.links	2016-10-31 02:52:08.037547000 +0100
@@ -39,8 +39,10 @@
        path=""
        ;;
     i[3467]86*-*-openbsd*      | \
+    i[3467]86*-*-bsdsunix*-elf | \
     i[3467]86*-*-freebsd*-elf  | \
-    i[3467]86*-*-freebsd[3-9]* | \
+    i[3467]86*-*-freebsd[1-9]* | \
+    i[3467]86*-*-bsdsunix*     | \
     i[3467]86*-*-freebsdelf*   | \
     i[3467]86*-*-netbsd*       | \
     i[3467]86*-*-k*bsd*)
@@ -50,7 +52,9 @@
        ;;
     i586*-*-openbsd*       | \
     i586*-*-freebsd*-elf   | \
+    i586*-*-bsdsunix*-elf  | \
     i586*-*-freebsd[3-9]*  | \
+    i586*-*-bsdsunix*      | \
     i586*-*-freebsdelf*    | \
     i586*-*-netbsd*	   | \
     i586*-*-k*bsd*	   | \
@@ -131,7 +135,7 @@
        echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
        path=""
        ;;
-    sparc64-*-netbsd* | sparc64-*-freebsd* | sparc64-*-openbsd*)
+    sparc64-*-netbsd* | sparc64-*-bsdsunix* | sparc64-*-freebsd* | sparc64-*-openbsd*)
        # There are no sparc64 assembler modules that work on the
        # *BSDs, so use the generic C functions.
        echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
@@ -141,6 +145,18 @@
        echo '/* No working assembler modules available */' >>./mpi/asm-syntax.h
        path=""
        ;;
+    sparc64-*-bsdsunix*)
+       # There are no sparc64 assembler modules that work, so
+       # just use generic C functions
+       echo '/* configured for sparc64-*-bsdsunix* */' >>./mpi/asm-syntax.h
+       path=""
+       ;;
+    sparc64-*-freebsd*)
+       # There are no sparc64 assembler modules that work, so
+       # just use generic C functions
+       echo '/* configured for sparc64-*freebsd* */' >>./mpi/asm-syntax.h
+       path=""
+       ;;
     sparc9*-*-*     | \
     ultrasparc*-*-* )
 	echo '/* configured for sparc9 or higher */' >>./mpi/asm-syntax.h
@@ -230,8 +246,8 @@
 	path="powerpc32"
 	;;
 
-    powerpc*-*-netbsd* | powerpc*-*-openbsd*)
-       echo '/* configured for {Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h
+    powerpc*-*-freebsd* | powerpc*-*-bsdsunix |  powerpc*-*-netbsd* | powerpc*-*-openbsd*)
+       echo '/* configured for {Free,Open,Net}BSD{SUniX} on powerpc */' >>./mpi/asm-syntax.h
        echo '#define ELF_SYNTAX'                 >>./mpi/asm-syntax.h
        cat   $srcdir/mpi/powerpc32/syntax.h	 >>./mpi/asm-syntax.h
        mpi_sflags="-Wa,-mppc"