summaryrefslogtreecommitdiffstats
path: root/mpi
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>1999-07-07 13:28:26 +0200
committerWerner Koch <wk@gnupg.org>1999-07-07 13:28:26 +0200
commitbd7298cf0dbeacbd415acdf814acace9aabb8455 (patch)
treeae235766ee42b77ba5ca19dfb1bf99e678154e3d /mpi
parentSee ChangeLog: Fri Jul 2 11:45:54 CEST 1999 Werner Koch (diff)
downloadgnupg2-bd7298cf0dbeacbd415acdf814acace9aabb8455.tar.xz
gnupg2-bd7298cf0dbeacbd415acdf814acace9aabb8455.zip
See ChangeLog: Wed Jul 7 13:23:40 CEST 1999 Werner Koch
Diffstat (limited to 'mpi')
-rw-r--r--mpi/ChangeLog7
-rw-r--r--mpi/Makefile.am33
-rw-r--r--mpi/mpicoder.c10
3 files changed, 38 insertions, 12 deletions
diff --git a/mpi/ChangeLog b/mpi/ChangeLog
index 1951dd3a4..cce6ee56d 100644
--- a/mpi/ChangeLog
+++ b/mpi/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jul 7 13:08:40 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
+
+
+ * mpicoder.c (g10_log_mpidump): New.
+
+ * Makefile.am: Support for libtool.
+
Fri Jul 2 11:45:54 CEST 1999 Werner Koch <wk@isil.d.shuttle.de>
diff --git a/mpi/Makefile.am b/mpi/Makefile.am
index 42acb55fe..fc25bbb81 100644
--- a/mpi/Makefile.am
+++ b/mpi/Makefile.am
@@ -10,11 +10,11 @@ DISTCLEANFILES = mpih-add1.S mpih-mul1.S mpih-mul2.S mpih-mul3.S \
CLEANFILES = tmp-*.s
-noinst_LIBRARIES = libmpi.a
-# noinst_HEADERS =
+noinst_LTLIBRARIES = libmpi.la
-libmpi_a_SOURCES = longlong.h \
+libmpi_la_LDFLAGS =
+libmpi_la_SOURCES = longlong.h \
mpi-add.c \
mpi-bit.c \
mpi-cmp.c \
@@ -37,16 +37,16 @@ libmpi_a_SOURCES = longlong.h \
# Note this objects are actually links, the sourcefiles are
# distributed by special code in dist-hook
-common_asm_objects = mpih-mul1.o \
- mpih-mul2.o \
- mpih-mul3.o \
- mpih-add1.o \
- mpih-sub1.o \
- mpih-lshift.o \
- mpih-rshift.o
+common_asm_objects = mpih-mul1.lo \
+ mpih-mul2.lo \
+ mpih-mul3.lo \
+ mpih-add1.lo \
+ mpih-sub1.lo \
+ mpih-lshift.lo \
+ mpih-rshift.lo
-libmpi_a_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
-libmpi_a_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
+libmpi_la_DEPENDENCIES = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
+libmpi_la_LIBADD = $(common_asm_objects) @MPI_EXTRA_ASM_OBJS@
SUFFIXES = .S
@@ -56,3 +56,12 @@ SUFFIXES = .S
mv tmp-$*.o $@
rm -f tmp-$*.s
+.S.lo:
+ $(CPP) $(INCLUDES) $(DEFS) $< | grep -v '^#' >tmp-$*.s
+ if test -f tmp-$*.lo; then rm tmp-$*.lo; fi
+ if test -f tmp-$*.o ; then rm tmp-$*.o ; fi
+ $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(SFLAGS) -c tmp-$*.s
+ if test -f tmp-$*.lo; then mv tmp-$*.lo $*.lo; fi
+ if test -f tmp-$*.o ; then mv tmp-$*.o $*.o ; fi
+ rm -f tmp-$*.s
+
diff --git a/mpi/mpicoder.c b/mpi/mpicoder.c
index 2ef4c1419..dae6eb4e1 100644
--- a/mpi/mpicoder.c
+++ b/mpi/mpicoder.c
@@ -286,6 +286,16 @@ mpi_print( FILE *fp, MPI a, int mode )
}
+void
+g10_log_mpidump( const char *text, MPI a )
+{
+ FILE *fp = log_stream();
+
+ g10_log_print_prefix(text);
+ mpi_print(fp, a, 1 );
+ fputc('\n', fp);
+}
+
/****************
* Special function to get the low 8 bytes from an mpi.
* This can be used as a keyid; KEYID is an 2 element array.