Merged back some changes fron gnupg. Fixed doc building.

5 files changed, 61 insertions, 45 deletions

diff --git a/mpi/hppa/mpih-add1.S b/mpi/hppa/mpih-add1.S
index e01c2eed..7a2a2c2c 100644
--- a/mpi/hppa/mpih-add1.S
+++ b/mpi/hppa/mpih-add1.S
@@ -1,17 +1,17 @@
 /* hppa add_n -- Add two limb vectors of the same length > 0 and store
  *		 sum in a third limb vector.
  *
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    2001 Fee 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.
@@ -45,7 +45,7 @@
 
 	.code
 	.export 	mpihelp_add_n
-mpihelp_add_n
+	.label		mpihelp_add_n
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -56,13 +56,15 @@ mpihelp_add_n
 	addib,= 	-1,%r23,L$end	; check for (SIZE == 1)
 	 add		%r20,%r19,%r28	; add first limbs ignoring cy
 
-L$loop	ldws,ma 	4(0,%r25),%r20
+	.label L$loop
+	ldws,ma 	4(0,%r25),%r20
 	ldws,ma 	4(0,%r24),%r19
 	stws,ma 	%r28,4(0,%r26)
 	addib,<>	-1,%r23,L$loop
 	 addc		%r20,%r19,%r28
 
-L$end	stws		%r28,0(0,%r26)
+	.label L$end
+	stws		%r28,0(0,%r26)
 	bv		0(%r2)
 	 addc		%r0,%r0,%r28
 
diff --git a/mpi/hppa/mpih-lshift.S b/mpi/hppa/mpih-lshift.S
index ada09f59..6a8b2c4c 100644
--- a/mpi/hppa/mpih-lshift.S
+++ b/mpi/hppa/mpih-lshift.S
@@ -1,15 +1,16 @@
 /* hppa   lshift
-*
- * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998
+ *                    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.
@@ -31,7 +32,7 @@
 
 	.code
 	.export 	mpihelp_lshift
-mpihelp_lshift
+	.label		mpihelp_lshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -47,7 +48,8 @@ mpihelp_lshift
 	addib,= 	-1,%r24,L$0002
 	vshd		%r22,%r29,%r20
 
-L$loop	ldws,mb 	-4(0,%r25),%r22
+	.label	L$loop
+	ldws,mb 	-4(0,%r25),%r22
 	stws,mb 	%r20,-4(0,%r26)
 	addib,= 	-1,%r24,L$0003
 	vshd		%r29,%r22,%r20
@@ -56,12 +58,15 @@ L$loop	ldws,mb 	-4(0,%r25),%r22
 	addib,<>	-1,%r24,L$loop
 	vshd		%r22,%r29,%r20
 
-L$0002	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0002
+	stws,mb 	%r20,-4(0,%r26)
 	vshd		%r29,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
-L$0003	stws,mb 	%r20,-4(0,%r26)
-L$0004	vshd		%r22,%r0,%r20
+	.label	L$0003
+	stws,mb 	%r20,-4(0,%r26)
+	.label	L$0004
+	vshd		%r22,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
 
diff --git a/mpi/hppa/mpih-rshift.S b/mpi/hppa/mpih-rshift.S
index 0299d2e2..b1e6a679 100644
--- a/mpi/hppa/mpih-rshift.S
+++ b/mpi/hppa/mpih-rshift.S
@@ -1,15 +1,16 @@
 /* hppa   rshift
-*
- * Copyright (C) 1992, 1994, 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998,
+ *                    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.
@@ -32,7 +33,7 @@
 
 	.code
 	.export 	mpihelp_rshift
-mpihelp_rshift
+	.label		mpihelp_rshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -45,7 +46,8 @@ mpihelp_rshift
 	addib,= 	-1,%r24,L$r002
 	vshd		%r29,%r22,%r20
 
-L$roop	ldws,ma 	4(0,%r25),%r22
+	.label	L$roop
+	ldws,ma 	4(0,%r25),%r22
 	stws,ma 	%r20,4(0,%r26)
 	addib,= 	-1,%r24,L$r003
 	vshd		%r22,%r29,%r20
@@ -54,12 +56,15 @@ L$roop	ldws,ma 	4(0,%r25),%r22
 	addib,<>	-1,%r24,L$roop
 	vshd		%r29,%r22,%r20
 
-L$r002	stws,ma 	%r20,4(0,%r26)
+	.label	L$r002
+	stws,ma 	%r20,4(0,%r26)
 	vshd		%r0,%r29,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
-L$r003	stws,ma 	%r20,4(0,%r26)
-L$r004	vshd		%r0,%r22,%r20
+	.label	L$r003
+	stws,ma 	%r20,4(0,%r26)
+	.label	L$r004
+	vshd		%r0,%r22,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
 
diff --git a/mpi/hppa/mpih-sub1.S b/mpi/hppa/mpih-sub1.S
index 8672e314..870009e9 100644
--- a/mpi/hppa/mpih-sub1.S
+++ b/mpi/hppa/mpih-sub1.S
@@ -1,16 +1,17 @@
 /* hppa   sub_n -- Sub two limb vectors of the same length > 0 and store
  *		   sum in a third limb vector.
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
  *
- * This file is part of GNUPG.
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    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.
@@ -48,7 +49,7 @@
 
 	.code
 	.export 	mpihelp_sub_n
-mpihelp_sub_n
+	.label		mpihelp_sub_n
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -59,13 +60,15 @@ mpihelp_sub_n
 	addib,= 	-1,%r23,L$end	; check for (SIZE == 1)
 	 sub		%r20,%r19,%r28	; subtract first limbs ignoring cy
 
-L$loop	ldws,ma 	4(0,%r25),%r20
+	.label	L$loop
+	ldws,ma 	4(0,%r25),%r20
 	ldws,ma 	4(0,%r24),%r19
 	stws,ma 	%r28,4(0,%r26)
 	addib,<>	-1,%r23,L$loop
 	 subb		%r20,%r19,%r28
 
-L$end	stws		%r28,0(0,%r26)
+	.label	L$end
+	stws		%r28,0(0,%r26)
 	addc		%r0,%r0,%r28
 	bv		0(%r2)
 	 subi		1,%r28,%r28
diff --git a/mpi/hppa/udiv-qrnnd.S b/mpi/hppa/udiv-qrnnd.S
index 84923834..c8a52412 100644
--- a/mpi/hppa/udiv-qrnnd.S
+++ b/mpi/hppa/udiv-qrnnd.S
@@ -1,17 +1,16 @@
 /* HP-PA  __udiv_qrnnd division support, used from longlong.h.
  *	  This version runs fast on pre-PA7000 CPUs.
  *
- *	Copyright (C) 1993, 1994 Free Software Foundation, Inc.
- *	Copyright (c) 1997 by Werner Koch (dd9jn)
+ *      Copyright (C) 1993, 1994, 1998, 2001 Free Software Foundation, Inc.
  *
- * This file is part of G10.
+ * This file is part of GnuPG.
  *
- * G10 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.
  *
- * G10 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.
@@ -44,7 +43,7 @@
 
 	.code
 	.export 	__udiv_qrnnd
-__udiv_qrnnd
+	.label		__udiv_qrnnd
 	.proc
 	.callinfo	frame=0,no_calls
 	.entry
@@ -122,7 +121,7 @@ __udiv_qrnnd
 	bv		0(%r2)
 	 addc		%r28,%r28,%r28
 
-L$largedivisor
+	.label	L$largedivisor
 	extru		%r24,31,1,%r19		; r19 = n0 & 1
 	bb,<		%r23,31,L$odd
 	 extru		%r23,30,31,%r22 	; r22 = d >> 1
@@ -201,7 +200,8 @@ L$largedivisor
 	bv		0(%r2)
 	 addc		%r24,%r24,%r28
 
-L$odd	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
+	.label	L$odd
+	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
 	shd		%r25,%r24,1,%r24	; r24 = new n0
 	extru		%r25,30,31,%r25 	; r25 = new n1
 	sub		%r0,%r22,%r21
@@ -286,7 +286,8 @@ L$odd	addib,sv,n	1,%r22,L$FF..		; r22 = (d / 2 + 1)
 
 ; This is just a special case of the code above.
 ; We come here when d == 0xFFFFFFFF
-L$FF..	add,uv		%r25,%r24,%r24
+	.label	L$FF..
+	add,uv		%r25,%r24,%r24
 	sub,<<		%r24,%r23,%r0
 	ldo		1(%r24),%r24
 	stws		%r24,0(0,%r26)