From b4bcb3aec62b97fda984e07aa8d89d2f76c96127 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@suse.de>
Date: Wed, 13 Apr 2016 17:04:37 +0200
Subject: Register extra test objects

This makes sure that the extra test objects are compiled with the correct
MODULE_NAME and dependencies are tracked.
---
 math/Makefile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'math/Makefile')

diff --git a/math/Makefile b/math/Makefile
index d440833f4d..57c3ec15aa 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -136,6 +136,9 @@ libm-tests = test-float test-double $(test-longdouble-$(long-double-fcts)) \
 libm-tests.o = $(addsuffix .o,$(libm-tests))
 
 tests += $(libm-tests)
+libm-vec-test-wrappers = $(addsuffix -wrappers, $(libm-vec-tests))
+test-extras += $(libm-vec-test-wrappers)
+extra-test-objs += $(addsuffix .o, $(libm-vec-test-wrappers))
 libm-tests-generated = libm-test-ulps.h libm-have-vector-test.h libm-test.c
 generated += $(libm-tests-generated) libm-test.stmp
 
@@ -300,10 +303,11 @@ $(objpfx)libieee.a: $(objpfx)ieee-math.o
 	$(patsubst %/,cd % &&,$(objpfx)) \
 	$(LN_S) $(<F) $(@F)
 
-$(addprefix $(objpfx),$(filter-out $(tests-static) $(libm-vec-tests),$(tests))): $(libm)
+$(addprefix $(objpfx),\
+	    $(filter-out $(tests-static) $(libm-vec-tests),$(tests))): $(libm)
 $(addprefix $(objpfx),$(tests-static)): $(objpfx)libm.a
-$(addprefix $(objpfx), $(libm-vec-tests)): $(objpfx)%: $(objpfx)%-wrappers.o $(libm) \
-					   $(libmvec)
+$(addprefix $(objpfx), $(libm-vec-tests)): $(objpfx)%: $(objpfx)%-wrappers.o \
+						       $(libm) $(libmvec)
 
 gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\
 		      add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \
-- 
cgit 1.4.1