diff options
| -rw-r--r-- | generic/tclTomMath.h | 3 | ||||
| -rw-r--r-- | libtommath/makefile.include | 105 | ||||
| -rw-r--r-- | libtommath/tommath.h | 2 |
3 files changed, 107 insertions, 3 deletions
diff --git a/generic/tclTomMath.h b/generic/tclTomMath.h index 690cd80..001019c 100644 --- a/generic/tclTomMath.h +++ b/generic/tclTomMath.h @@ -15,7 +15,6 @@ #ifndef BN_H_ #define BN_H_ -#include "tclInt.h" #include "tclTomMathDecls.h" #ifndef MODULE_SCOPE #define MODULE_SCOPE extern @@ -360,7 +359,7 @@ int mp_2expt(mp_int *a, int b); /* Counts the number of lsbs which are zero before the first zero bit */ /* -int mp_cnt_lsb(mp_int *a); +int mp_cnt_lsb(const mp_int *a); */ /* I Love Earth! */ diff --git a/libtommath/makefile.include b/libtommath/makefile.include new file mode 100644 index 0000000..c862f0f --- /dev/null +++ b/libtommath/makefile.include @@ -0,0 +1,105 @@ +# +# Include makefile for libtommath +# + +#version of library +VERSION=1.0 +VERSION_SO=1:0 + +# default make target +default: ${LIBNAME} + +# Compiler and Linker Names +ifndef PREFIX + PREFIX= +endif + +ifeq ($(CC),cc) + CC = $(PREFIX)gcc +endif +LD=$(PREFIX)ld +AR=$(PREFIX)ar +RANLIB=$(PREFIX)ranlib + +ifndef MAKE + MAKE=make +endif + +CFLAGS += -I./ -Wall -Wsign-compare -Wextra -Wshadow + +ifndef NO_ADDTL_WARNINGS +# additional warnings +CFLAGS += -Wsystem-headers -Wdeclaration-after-statement -Wbad-function-cast -Wcast-align +CFLAGS += -Wstrict-prototypes -Wpointer-arith +endif + +ifdef COMPILE_DEBUG +#debug +CFLAGS += -g3 +else + +ifdef COMPILE_SIZE +#for size +CFLAGS += -Os +else + +ifndef IGNORE_SPEED +#for speed +CFLAGS += -O3 -funroll-loops + +#x86 optimizations [should be valid for any GCC install though] +CFLAGS += -fomit-frame-pointer +endif + +endif # COMPILE_SIZE +endif # COMPILE_DEBUG + +# adjust coverage set +ifneq ($(filter $(shell arch), i386 i686 x86_64 amd64 ia64),) + COVERAGE = test_standalone timing + COVERAGE_APP = ./test && ./ltmtest +else + COVERAGE = test_standalone + COVERAGE_APP = ./test +endif + +HEADERS_PUB=tommath.h tommath_class.h tommath_superclass.h +HEADERS=tommath_private.h $(HEADERS_PUB) + +test_standalone: CFLAGS+=-DLTM_DEMO_TEST_VS_MTEST=0 + +#LIBPATH-The directory for libtommath to be installed to. +#INCPATH-The directory to install the header files for libtommath. +#DATAPATH-The directory to install the pdf docs. +LIBPATH?=/usr/lib +INCPATH?=/usr/include +DATAPATH?=/usr/share/doc/libtommath/pdf + +#make the code coverage of the library +# +coverage: CFLAGS += -fprofile-arcs -ftest-coverage -DTIMING_NO_LOGS +coverage: LFLAGS += -lgcov +coverage: LDFLAGS += -lgcov + +coverage: $(COVERAGE) + $(COVERAGE_APP) + +lcov: coverage + rm -f coverage.info + lcov --capture --no-external --no-recursion $(LCOV_ARGS) --output-file coverage.info -q + genhtml coverage.info --output-directory coverage -q + +# target that removes all coverage output +cleancov-clean: + rm -f `find . -type f -name "*.info" | xargs` + rm -rf coverage/ + +# cleans everything - coverage output and standard 'clean' +cleancov: cleancov-clean clean + +clean: + rm -f *.gcda *.gcno *.bat *.o *.a *.obj *.lib *.exe *.dll etclib/*.o demo/demo.o test ltmtest mpitest mtest/mtest mtest/mtest.exe \ + *.idx *.toc *.log *.aux *.dvi *.lof *.ind *.ilg *.ps *.log *.s mpi.c *.da *.dyn *.dpi tommath.tex `find . -type f | grep [~] | xargs` *.lo *.la + rm -rf .libs/ + cd etc ; MAKE=${MAKE} ${MAKE} clean + cd pics ; MAKE=${MAKE} ${MAKE} clean diff --git a/libtommath/tommath.h b/libtommath/tommath.h index 1793ed0..e696779 100644 --- a/libtommath/tommath.h +++ b/libtommath/tommath.h @@ -284,7 +284,7 @@ int mp_mod_2d(const mp_int *a, int b, mp_int *c); int mp_2expt(mp_int *a, int b); /* Counts the number of lsbs which are zero before the first zero bit */ -int mp_cnt_lsb(mp_int *a); +int mp_cnt_lsb(const mp_int *a); /* I Love Earth! */ |