[svn] gcry - r1209 - branches/LIBGCRYPT-1-2-BRANCH/mpi

[svn author wk]

Author: wk
Date: 2007-02-02 16:52:57 +0100 (Fri, 02 Feb 2007)
New Revision: 1209

Modified:
   branches/LIBGCRYPT-1-2-BRANCH/mpi/ChangeLog
   branches/LIBGCRYPT-1-2-BRANCH/mpi/config.links
Log:
* config.links (mpi_optional_modules): Make sure that powerpc64 is
  matched before a generic powerpc.  Reported by Andreas Metzler.
  Should fix Debian bug 284609.  Fixed in trunk on 2006-10-23.
		  


Modified: branches/LIBGCRYPT-1-2-BRANCH/mpi/ChangeLog
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/mpi/ChangeLog	2007-02-01 19:49:33 UTC (rev 1208)
+++ branches/LIBGCRYPT-1-2-BRANCH/mpi/ChangeLog	2007-02-02 15:52:57 UTC (rev 1209)
@@ -1,3 +1,9 @@
+2007-02-02  Werner Koch  <wk at g10code.com>
+
+	* config.links (mpi_optional_modules): Make sure that powerpc64 is
+	matched before a generic powerpc.  Reported by Andreas Metzler.
+	Should fix Debian bug 284609.  Fixed in trunk on 2006-10-23.
+
 2006-08-29  Werner Koch  <wk at g10code.com>
 
 	* mpiutil.c (gcry_mpi_get_flag): Let it return a value to silent

Modified: branches/LIBGCRYPT-1-2-BRANCH/mpi/config.links
===================================================================
--- branches/LIBGCRYPT-1-2-BRANCH/mpi/config.links	2007-02-01 19:49:33 UTC (rev 1208)
+++ branches/LIBGCRYPT-1-2-BRANCH/mpi/config.links	2007-02-02 15:52:57 UTC (rev 1209)
@@ -1,4 +1,4 @@
-# config.links - helper for ../configure
+# config.links - helper for ../configure             -*- mode: sh -*-
 # Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 #
 # This file is part of Libgcrypt.
@@ -221,13 +221,6 @@
 	path="m68k/mc68020 m68k"
 	;;
 
-    powerpc*-*-linux*)
-	echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h
-	echo '#define ELF_SYNTAX'               >>./mpi/asm-syntax.h
-	cat   $srcdir/mpi/powerpc32/syntax.h	>>./mpi/asm-syntax.h
-	path="powerpc32"
-	;;
-
     powerpc*-*-netbsd* | powerpc*-*-openbsd*)
        echo '/* configured {Open,Net}BSD on powerpc */' >>./mpi/asm-syntax.h
        echo '#define ELF_SYNTAX'                 >>./mpi/asm-syntax.h
@@ -236,6 +229,18 @@
        path="powerpc32"
        ;;
 
+    ppc620-*-*	    | \
+    powerpc64*-*-*)
+	mpi_sflags="-Wa,-mppc"
+	path="powerpc64"
+	;;
+    powerpc*-*-linux*)
+	echo '/* configured for powerpc/ELF */' >>./mpi/asm-syntax.h
+	echo '#define ELF_SYNTAX'               >>./mpi/asm-syntax.h
+	cat   $srcdir/mpi/powerpc32/syntax.h	>>./mpi/asm-syntax.h
+	path="powerpc32"
+	;;
+
     rs6000-*-aix[456789]*    | \
     rs6000-*-aix3.2.[456789])
 	mpi_sflags="-Wa,-mpwr"
@@ -264,11 +269,6 @@
 	mpi_sflags="-Wa,-mppc"
 	path="powerpc32"
 	;;
-    ppc620-*-*	    | \
-    powerpc64*-*-*)
-	mpi_sflags="-Wa,-mppc"
-	path="powerpc64"
-	;;
     powerpc*-*-*)
 	mpi_sflags="-Wa,-mppc"
 	path="powerpc32"