math: Statically link tests of internal functionality

diff --git a/ChangeLog b/ChangeLog
index 7fb4d1865879e945a69f0f3453f75cbbaa198667..753257810b7a81dbca0eb75f35f938dc010c479d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-08-22  Florian Weimer  <fweimer@redhat.com>
+
+       math: Statically link tests of internal functionality.
+       * math/Makefile (tests): Remove atest-exp, atest-sincos,
+       atest-exp2.
+       (tests-static): Add atest-exp, atest-sincos, atest-exp2.
+       (gmp-objs): Remove assignment.
+       (atest-exp, atest-sincos, atest-exp2): Remove targets.
+
 2017-08-22  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #21987]

diff --git a/math/Makefile b/math/Makefile
index 25d3e95c6c1b284e48d28117753835d425a60a77..fb79b801cfb3cf30b99e4588dae6f1ce12b99fca 100644 (file)
--- a/math/Makefile
+++ b/math/Makefile
@@ -181,7 +181,7 @@ $(inst_libdir)/libm.a: $(common-objpfx)format.lds \
 endif
 
 # Rules for the test suite.
-tests = test-matherr-3 test-fenv atest-exp atest-sincos atest-exp2 basic-test \
+tests = test-matherr-3 test-fenv basic-test \
        test-misc test-fpucw test-fpucw-ieee tst-definitions test-tgmath \
        test-tgmath-ret bug-nextafter bug-nexttoward bug-tgmath1 \
        test-tgmath-int test-tgmath2 test-powl tst-CMPLX tst-CMPLX2 test-snan \
@@ -203,6 +203,10 @@ tests-static = test-fpucw-static test-fpucw-ieee-static \
               test-signgam-ullong-static test-signgam-ullong-init-static
 tests-internal = test-matherr test-matherr-2
 
+# These tests use internal (unexported) GMP functions and are linked
+# statically to obtain access to these functions.
+tests-static += atest-exp atest-sincos atest-exp2
+
 ifneq (,$(CXX))
 tests += test-math-isinff test-math-iszero
 endif
@@ -569,11 +573,4 @@ endef
 object-suffixes-left := $(libmvec-tests)
 include $(o-iterator)
 
-gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\
-                     add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \
-                     lshift rshift mp_clz_tab udiv_qrnnd inlines \
-                     $(gmp-sysdep_routines))
-$(objpfx)atest-exp: $(gmp-objs)
-$(objpfx)atest-sincos: $(gmp-objs)
-$(objpfx)atest-exp2: $(gmp-objs)
 $(objpfx)test-fenv-tls: $(shared-thread-library)