[PATCH 4/4] mpi/config.links: merge i586 targets with rest i*86 targets

[Jussi Kivilinna]

* mpi/config.links: Merge i586 targets with rest i[3467]86 targets.
--

Signed-off-by: Jussi Kivilinna <jussi.kivilinna at iki.fi>
---
 mpi/config.links | 64 ++++++++++++------------------------------------
 1 file changed, 15 insertions(+), 49 deletions(-)

diff --git a/mpi/config.links b/mpi/config.links
index deb98bf0..8cd6657e 100644
--- a/mpi/config.links
+++ b/mpi/config.links
@@ -50,26 +50,14 @@ case "${host}" in
        path=""
        mpi_cpu_arch="x86"
        ;;
-    i[3467]86*-*-openbsd*         | \
-    i[3467]86*-*-freebsd*-elf     | \
-    i[3467]86*-*-freebsd[3-9]*    | \
-    i[3467]86*-*-freebsd[12][0-9]*| \
-    i[3467]86*-*-freebsdelf*      | \
-    i[3467]86*-*-netbsd*          | \
-    i[3467]86*-*-k*bsd*)
-       echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
-       cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
-       path="i386"
-       mpi_cpu_arch="x86"
-       ;;
-    i586*-*-openbsd*         | \
-    i586*-*-freebsd*-elf     | \
-    i586*-*-freebsd[3-9]*    | \
-    i586*-*-freebsd[12][0-9]*| \
-    i586*-*-freebsdelf*      | \
-    i586*-*-netbsd*	     | \
-    i586*-*-k*bsd*	     | \
-    pentium-*-netbsd*	     | \
+    i[34567]86*-*-openbsd*         | \
+    i[34567]86*-*-freebsd*-elf     | \
+    i[34567]86*-*-freebsd[3-9]*    | \
+    i[34567]86*-*-freebsd[12][0-9]*| \
+    i[34567]86*-*-freebsdelf*      | \
+    i[34567]86*-*-netbsd*          | \
+    i[34567]86*-*-k*bsd*           | \
+    pentium-*-netbsd*	           | \
     pentiumpro-*-netbsd*)
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
        cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
@@ -82,46 +70,24 @@ case "${host}" in
        path="i386"
        mpi_cpu_arch="x86"
        ;;
-    i[3467]86*-*-linuxaout*  | \
-    i[3467]86*-*-linuxoldld* | \
-    i[3467]86*-*-*bsd*)
-	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
-	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
-	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
-	path="i386"
-        mpi_cpu_arch="x86"
-	;;
-    i586*-*-linuxaout*  | \
-    i586*-*-linuxoldld* | \
-    i586*-*-*bsd*)
+    i[34567]86*-*-linuxaout*  | \
+    i[34567]86*-*-linuxoldld* | \
+    i[34567]86*-*-*bsd*)
 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
 	path="i386"
         mpi_cpu_arch="x86"
 	;;
-    i[3467]86*-msdosdjgpp* | \
-    i[34]86*-apple-darwin*)
+    i[34567]86*-msdosdjgpp* | \
+    i[34567]86*-apple-darwin*)
 	echo '#define BSD_SYNTAX'        >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
 	path="i386"
         mpi_cpu_arch="x86"
 	;;
-    i586*-msdosdjgpp* | \
-    i[567]86*-apple-darwin*)
-	echo '#define BSD_SYNTAX'        >>./mpi/asm-syntax.h
-	cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
-	path="i386"
-        mpi_cpu_arch="x86"
-	;;
-    i[3467]86*-*-*)
-	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
-	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
-	path="i386"
-        mpi_cpu_arch="x86"
-	;;
-    i586*-*-*  | \
-    pentium-*-*   | \
+    i[34567]86*-*-* | \
+    pentium-*-*     | \
     pentiumpro-*-*)
 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
-- 
2.32.0