From a4d57b79478f214cdf535eb941abdd71e0071edc Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 22 Aug 2017 12:45:16 +0200 Subject: [PATCH] math: Statically link tests of internal functionality --- ChangeLog | 9 +++++++++ math/Makefile | 13 +++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7fb4d18658..753257810b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2017-08-22 Florian Weimer + + 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 [BZ #21987] diff --git a/math/Makefile b/math/Makefile index 25d3e95c6c..fb79b801cf 100644 --- 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) -- 2.11.4.GIT