Merged back some changes fron gnupg. Fixed doc building.

2 files changed, 40 insertions, 26 deletions

diff --git a/mpi/pa7100/mpih-lshift.S b/mpi/pa7100/mpih-lshift.S
index e17e1b70..76368fe7 100644
--- a/mpi/pa7100/mpih-lshift.S
+++ b/mpi/pa7100/mpih-lshift.S
@@ -1,16 +1,17 @@
 /* hppa   lshift
- *	  optimized for the PA7100, where is runs at 3.25 cycles/limb
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	  optimized for the PA7100, where it runs at 3.25 cycles/limb
+ * 
+ *      Copyright (C) 1992, 1994, 1998, 
+ *                    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.
@@ -32,7 +33,7 @@
 
 	.code
 	.export 	mpihelp_lshift
-mpihelp_lshift
+	.label		mpihelp_lshift
 	.proc
 	.callinfo	frame=64,no_calls
 	.entry
@@ -48,7 +49,8 @@ mpihelp_lshift
 	addib,<=	-5,%r24,L$rest
 	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)
 	vshd		%r29,%r22,%r20
 	ldws,mb 	-4(0,%r25),%r29
@@ -62,9 +64,11 @@ L$loop	ldws,mb 	-4(0,%r25),%r22
 	addib,> 	-4,%r24,L$loop
 	vshd		%r22,%r29,%r20
 
-L$rest	addib,= 	4,%r24,L$end1
+	.label	L$rest
+	addib,= 	4,%r24,L$end1
 	nop
-L$eloop ldws,mb 	-4(0,%r25),%r22
+	.label	L$eloop
+	ldws,mb 	-4(0,%r25),%r22
 	stws,mb 	%r20,-4(0,%r26)
 	addib,<=	-1,%r24,L$end2
 	vshd		%r29,%r22,%r20
@@ -73,12 +77,15 @@ L$eloop ldws,mb 	-4(0,%r25),%r22
 	addib,> 	-1,%r24,L$eloop
 	vshd		%r22,%r29,%r20
 
-L$end1	stws,mb 	%r20,-4(0,%r26)
+	.label	L$end1
+	stws,mb 	%r20,-4(0,%r26)
 	vshd		%r29,%r0,%r20
 	bv		0(%r2)
 	stw		%r20,-4(0,%r26)
-L$end2	stws,mb 	%r20,-4(0,%r26)
-L$0004	vshd		%r22,%r0,%r20
+	.label	L$end2
+	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/pa7100/mpih-rshift.S b/mpi/pa7100/mpih-rshift.S
index b409de04..3bada7ce 100644
--- a/mpi/pa7100/mpih-rshift.S
+++ b/mpi/pa7100/mpih-rshift.S
@@ -1,16 +1,17 @@
 /* hppa   rshift
- *	  optimized for the PA7100, where is runs at 3.25 cycles/limb
- *	Copyright (C) 1992, 1994 Free Software Foundation, Inc.
- *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *	  optimized for the PA7100, where it runs at 3.25 cycles/limb
  *
- * 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,<=	-5,%r24,L$rrest
 	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)
 	vshd		%r22,%r29,%r20
 	ldws,ma 	4(0,%r25),%r29
@@ -59,9 +61,11 @@ L$roop	ldws,ma 	4(0,%r25),%r22
 	addib,> 	-4,%r24,L$roop
 	vshd		%r29,%r22,%r20
 
-L$rrest addib,= 	4,%r24,L$rend1
+	.label	L$rrest
+	addib,= 	4,%r24,L$rend1
 	nop
-L$eroop ldws,ma 	4(0,%r25),%r22
+	.label	L$eroop
+	ldws,ma 	4(0,%r25),%r22
 	stws,ma 	%r20,4(0,%r26)
 	addib,<=	-1,%r24,L$rend2
 	vshd		%r22,%r29,%r20
@@ -70,12 +74,15 @@ L$eroop ldws,ma 	4(0,%r25),%r22
 	addib,> 	-1,%r24,L$eroop
 	vshd		%r29,%r22,%r20
 
-L$rend1  stws,ma	 %r20,4(0,%r26)
+	.label	L$rend1
+	stws,ma		%r20,4(0,%r26)
 	vshd		%r0,%r29,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)
-L$rend2  stws,ma	 %r20,4(0,%r26)
-L$r004	vshd		%r0,%r22,%r20
+	.label	L$rend2
+	stws,ma		%r20,4(0,%r26)
+	.label	L$r004
+	vshd		%r0,%r22,%r20
 	bv		0(%r2)
 	stw		%r20,0(0,%r26)