Merged back some changes fron gnupg. Fixed doc building.

7 files changed, 54 insertions, 40 deletions

diff --git a/mpi/mips3/mpih-add1.S b/mpi/mips3/mpih-add1.S
index 7ac5f38b..a998420d 100644
--- a/mpi/mips3/mpih-add1.S
+++ b/mpi/mips3/mpih-add1.S
@@ -1,15 +1,17 @@
 /* mips3  add_n -- Add two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
diff --git a/mpi/mips3/mpih-lshift.S b/mpi/mips3/mpih-lshift.S
index 37e9a5e1..112383f9 100644
--- a/mpi/mips3/mpih-lshift.S
+++ b/mpi/mips3/mpih-lshift.S
@@ -1,14 +1,16 @@
 /* mips3    lshift
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000,
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
diff --git a/mpi/mips3/mpih-mul1.S b/mpi/mips3/mpih-mul1.S
index fd349ee9..70409e8d 100644
--- a/mpi/mips3/mpih-mul1.S
+++ b/mpi/mips3/mpih-mul1.S
@@ -1,15 +1,17 @@
 /* mips3 mpih-mul1.S -- Multiply a limb vector with a limb and store
  *			the result in a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -36,10 +38,10 @@ mpihelp_mul_1:
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -64,7 +66,7 @@ Loop:	mflo	$10
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	mflo	$10
 	mfhi	$9
 	daddu	$10,$10,$2
@@ -74,7 +76,7 @@ $LC1:	mflo	$10
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	mflo	$10
 	mfhi	$9
 	daddu	$10,$10,$2
diff --git a/mpi/mips3/mpih-mul2.S b/mpi/mips3/mpih-mul2.S
index 1474b4f0..1bddd053 100644
--- a/mpi/mips3/mpih-mul2.S
+++ b/mpi/mips3/mpih-mul2.S
@@ -1,15 +1,17 @@
 /* MIPS3   addmul_1 -- Multiply a limb vector with a single limb and
  *		       add the product to a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -36,10 +38,10 @@ mpihelp_addmul_1:
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -68,7 +70,7 @@ Loop:	ld	$10,0($4)
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
@@ -82,7 +84,7 @@ $LC1:	ld	$10,0($4)
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
diff --git a/mpi/mips3/mpih-mul3.S b/mpi/mips3/mpih-mul3.S
index 4616732f..82fe47d5 100644
--- a/mpi/mips3/mpih-mul3.S
+++ b/mpi/mips3/mpih-mul3.S
@@ -1,15 +1,17 @@
 /* MIPS3 submul_1 -- Multiply a limb vector with a single limb and
  *		     subtract the product from a second limb vector.
- * Copyright (C) 1992, 1994, 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
@@ -36,10 +38,10 @@ mpihelp_submul_1:
 	.set	noreorder
 	.set	nomacro
 
- # warm up phase 0
+/* # warm up phase 0 */
 	ld	$8,0($5)
 
- # warm up phase 1
+/* # warm up phase 1 */
 	daddiu	$5,$5,8
 	dmultu	$8,$7
 
@@ -68,7 +70,7 @@ Loop:	ld	$10,0($4)
 	bne	$6,$0,Loop
 	 daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 1
+/* # cool down phase 1 */
 $LC1:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
@@ -82,7 +84,7 @@ $LC1:	ld	$10,0($4)
 	daddiu	$4,$4,8
 	daddu	$2,$9,$2	# add high product limb and carry from addition
 
- # cool down phase 0
+/* # cool down phase 0 */
 $LC0:	ld	$10,0($4)
 	mflo	$3
 	mfhi	$9
diff --git a/mpi/mips3/mpih-rshift.S b/mpi/mips3/mpih-rshift.S
index 7bc08450..74a6cc96 100644
--- a/mpi/mips3/mpih-rshift.S
+++ b/mpi/mips3/mpih-rshift.S
@@ -1,14 +1,16 @@
 /* mips3    rshift
- *	Copyright (C) 1995, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1995, 1998, 2000
+ *                    2001 Free Software Foundation, Inc.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * This file is part of GnuPG.
+ *
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
diff --git a/mpi/mips3/mpih-sub1.S b/mpi/mips3/mpih-sub1.S
index 4bc3ad29..72f506ea 100644
--- a/mpi/mips3/mpih-sub1.S
+++ b/mpi/mips3/mpih-sub1.S
@@ -1,15 +1,17 @@
 /* mips3  sub_n -- Subtract two limb vectors of the same length > 0 and
  *		  store difference in a third limb vector.
- * Copyright (C) 1995, 1998 Free Software Foundation, Inc.
+ * 
+ *      Copyright (C) 1995, 1998, 1999, 2000,
+ *                    2001 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ * This file is part of GnuPG.
  *
- * GNUPG is free software; you can redistribute it and/or modify
+ * GnuPG is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
  *
- * GNUPG is distributed in the hope that it will be useful,
+ * GnuPG is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.