From f62cab60111a1817992fe5915f9a0c8ea9f7d164 Mon Sep 17 00:00:00 2001 From: jasonmoxham Date: Thu, 12 Feb 2009 12:00:42 +0000 Subject: [PATCH] changed libgmp*.* for a few odd cases left --- Makefile.am | 4 ++-- configure.in | 20 ++++++++++---------- tests/cxx/Makefile.am | 2 +- tune/Makefile.am | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile.am b/Makefile.am index 48fbdb66..1f869b74 100644 --- a/Makefile.am +++ b/Makefile.am @@ -102,7 +102,7 @@ endif EXTRA_DIST += mpirxx.h # mpir.h and mp.h are architecture dependent, mainly since they encode the -# limb size used in libgmp. For that reason they belong under $exec_prefix +# limb size used in libmpir. For that reason they belong under $exec_prefix # not $prefix, strictly speaking. # # $exec_prefix/include is not in the default include path for gcc built to @@ -244,7 +244,7 @@ MPBSD_OBJECTS = mpbsd/add$U.lo mpbsd/tdiv_qr$U.lo mpbsd/set$U.lo \ # something extra. The source files for each .lo are listed in the # Makefile.am's in the subdirectories. # -# Currently, for libgmp, unlike libmp below, we're not using +# Currently, for libmpir, unlike libmp below, we're not using # -export-symbols, since the tune and speed programs, and perhaps some of # the test programs, want to access undocumented symbols. diff --git a/configure.in b/configure.in index b7eb7cd0..13abf8c7 100644 --- a/configure.in +++ b/configure.in @@ -1867,7 +1867,7 @@ if test $found_compiler = yes; then # GMP_LDFLAGS substitution, selected according to ABI. - # These are needed on libgmp.la and libmp.la, but currently not on + # These are needed on libmpir.la and libmp.la, but currently not on # convenience libraries like tune/libspeed.la or mpz/libmpz.la. # eval GMP_LDFLAGS=\"\$${ccbase}${abi1}_ldflags\" @@ -2102,7 +2102,7 @@ GMP_PROG_NM case $host in # FIXME: On AIX 3 and 4, $libname.a is included in libtool - # $library_names_spec, so libgmp.a becomes a symlink to libgmp.so, making + # $library_names_spec, so libmpir.a becomes a symlink to libmpir.so, making # it impossible to build shared and static libraries simultaneously. # Disable shared libraries by default, but let the user override with # --enable-shared --disable-static. @@ -2137,8 +2137,8 @@ Use "--disable-static --enable-shared" to build just a DLL.]) # "-no-undefined" is required when building a DLL, see documentation on # AC_LIBTOOL_WIN32_DLL. # - # "-Wl,--export-all-symbols" is a bit of a hack, it gets all libgmp and - # libgmpxx functions and variables exported. This is what libtool did + # "-Wl,--export-all-symbols" is a bit of a hack, it gets all libmpir and + # libmpirxx functions and variables exported. This is what libtool did # in the past, and it's convenient for us in the test programs. # # Maybe it'd be prudent to check for --export-all-symbols before using @@ -2146,11 +2146,11 @@ Use "--disable-static --enable-shared" to build just a DLL.]) # not really any alternative we want to take up at the moment. # # "-Wl,output-def" is used to get a .def file for use by MS lib to make - # a .lib import library, described in the manual. libgmp-3.dll.def + # a .lib import library, described in the manual. libmpir-3.dll.def # corresponds to the libmp-3.dll.def generated by libtool (as a result # of -export-symbols on that library). # - # Incidentally, libtool does generate an import library libgmp.dll.a, + # Incidentally, libtool does generate an import library libmpir.dll.a, # but it's "ar" format and cannot be used by the MS linker. There # doesn't seem to be any GNU tool for generating or converting to .lib. # @@ -2161,8 +2161,8 @@ Use "--disable-static --enable-shared" to build just a DLL.]) # if test "$enable_shared" = yes; then GMP_LDFLAGS="$GMP_LDFLAGS -no-undefined -Wl,--export-all-symbols" - LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmp-3.dll.def" - LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libgmpxx-3.dll.def" + LIBGMP_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libmpir-3.dll.def" + LIBGMPXX_LDFLAGS="$LIBGMP_LDFLAGS -Wl,--output-def,.libs/libmpirxx-3.dll.def" LIBGMP_DLL=1 fi ;; @@ -2227,7 +2227,7 @@ AM_CONDITIONAL(ENABLE_STATIC, test "$enable_static" = yes) # Many of these library and header checks are for the benefit of -# supplementary programs. libgmp doesn't use anything too weird. +# supplementary programs. libmpir doesn't use anything too weird. AC_HEADER_STDC AC_HEADER_TIME @@ -3141,7 +3141,7 @@ GMP_DEFINE_RAW(["define(,<$ac_cv_sizeof_unsigned>)"]) # # FIXME: Some of the cycle counter objects in the tune directory depend on # the size of ulong, it'd be possible to check that here, though a mismatch -# probably wouldn't want to be fatal, none of the libgmp assembler code +# probably wouldn't want to be fatal, none of the libmpir assembler code # depends on ulong. # mparam_bits=[`sed -n 's/^#define BITS_PER_MP_LIMB[ ][ ]*\([0-9]*\).*$/\1/p' $gmp_mparam_source`] diff --git a/tests/cxx/Makefile.am b/tests/cxx/Makefile.am index 78e2d37f..9c04873e 100644 --- a/tests/cxx/Makefile.am +++ b/tests/cxx/Makefile.am @@ -67,4 +67,4 @@ $(top_builddir)/tests/libtests.la: # Note this fix applies only when running "make check". The cp here should # be done manually if just one program is to be built and run. # -TESTS_ENVIRONMENT = cp $(top_builddir)/.libs/libgmp.so.* .libs 2>/dev/null || true; +TESTS_ENVIRONMENT = cp $(top_builddir)/.libs/libmpir.so.* .libs 2>/dev/null || true; diff --git a/tune/Makefile.am b/tune/Makefile.am index e4bc3a9a..4a6ed529 100644 --- a/tune/Makefile.am +++ b/tune/Makefile.am @@ -66,7 +66,7 @@ $(top_builddir)/tests/libtests.la: # # On Solaris 8, gcc 2.95.2 -static is somehow broken (it creates executables # that immediately seg fault), so -all-static is not used. The only thing -# -all-static does is make libc static linked as well as libgmp, and that +# -all-static does is make libc static linked as well as libmpir, and that # makes a difference only when measuring malloc and friends in the speed # program. This can always be forced with "make speed_LDFLAGS=-all-static # ..." if desired, see tune/README.