mpi fixes for non-gcc compilers

Albert Chin gcrypt-devel at mlists.thewrittenword.com
Sat Jan 22 21:08:06 CET 2005


1. [mpi/hppa1.1/mpih-mul3.S, mpi/hppa1.1/udiv-qrnnd.S,
    mpi/hppa1.1/mpih-mul2.S, mpi/hppa1.1/mpih-mul1.S]
   Add ".level 1.1" to disable warning about using PA-RISC1.1
   opcodes.
2. [mpi/Makefile.am]
   Don't assume the compiler will pre-process the .S files. Some
   compilers, like those from HP and IBM, don't do this. So, we
   use the same solution gnupg-1.4.0 does. Preprocess first and
   then compile.

-- 
albert chin (china at thewrittenword.com)

-- snip snip
--- mpi/hppa1.1/mpih-mul3.S.orig	2005-01-20 23:13:30.000000000 -0600
+++ mpi/hppa1.1/mpih-mul3.S	2005-01-20 23:13:38.000000000 -0600
@@ -51,6 +51,7 @@
  * but that requires reworking the hairy software pipeline...
  */
 
+	.level		1.1
 
 	.code
 	.export 	_gcry_mpih_submul_1
--- mpi/hppa1.1/udiv-qrnnd.S.orig	2005-01-20 23:36:26.000000000 -0600
+++ mpi/hppa1.1/udiv-qrnnd.S	2005-01-20 23:36:39.000000000 -0600
@@ -36,6 +36,8 @@
  *   d		   gr23
  */
 
+	.level		1.1
+
         .data
 	.align		8
 	.label L$0000
--- mpi/hppa1.1/mpih-mul2.S.orig	2005-01-20 23:36:50.000000000 -0600
+++ mpi/hppa1.1/mpih-mul2.S	2005-01-20 23:36:58.000000000 -0600
@@ -45,6 +45,8 @@
  * There are some ideas described in mul1.S that applies to this code too.
  */
 
+	.level		1.1
+
 	.code
 	.export 	_gcry_mpih_addmul_1
 	.label		_gcry_mpih_addmul_1
--- mpi/hppa1.1/mpih-mul1.S.orig	2005-01-20 23:37:07.000000000 -0600
+++ mpi/hppa1.1/mpih-mul1.S	2005-01-20 23:37:14.000000000 -0600
@@ -55,6 +55,8 @@
  * in the cache.)
  */
 
+	.level		1.1
+
 	.code
 	.export 	_gcry_mpih_mul_1
 	.label		_gcry_mpih_mul_1
--- mpi/Makefile.am.orig	Thu Jan 20 22:20:39 2005
+++ mpi/Makefile.am	Sat Jan 22 14:04:05 2005
@@ -181,10 +181,14 @@
 SUFFIXES = .S .o .obj .lo
 
 .S.o:
-	$(CCASCOMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+	$(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > $*.s
+	$(CCASCOMPILE) -c `test -f '$*.s' || echo '$(srcdir)/'`$*.s
+	rm $*.s
 
 .S.obj:
 	$(CCASCOMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
 
 .S.lo:
-	$(LTCCASCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+	$(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' > $*.s
+	$(LTCCASCOMPILE) -c -o $@ `test -f '$*.s' || echo '$(srcdir)/'`$*.s
+	rm $*.s



More information about the Gcrypt-devel mailing list