test: Fix math .c dependency

[uclinux-h8/uClibc.git] / libm / Makefile.in

diff --git a/libm/Makefile.in b/libm/Makefile.in
index d17d64f..23a55b3 100644 (file)
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -20,11 +20,12 @@
 # by Erik Andersen <andersen@codepoet.org>
 #
 
-subdirs += libm
+subdirs += libm libm/$(TARGET_ARCH)
 
 CFLAGS-libm := -DNOT_IN_libc -DIS_IN_libm $(SSP_ALL_CFLAGS)
 CFLAGS-libm += -D_IEEE_LIBM
 
+LDFLAGS-$(UCLIBC_FORMAT_DSBT_ELF)-libm.so := -Wl,--dsbt-index=5
 LDFLAGS-libm.so := $(LDFLAGS)
 
 LIBS-libm.so := $(LIBS)
@@ -34,19 +35,18 @@ libm_FULL_NAME := libm-$(VERSION).so
 libm_DIR:=$(top_srcdir)libm
 libm_OUT:=$(top_builddir)libm
 
-# Fix builds for powerpc as there are different cores in this 
-# section now.`
-ifeq ($(TARGET_ARCH)-$(CONFIG_E500),powerpc-y)
-libm_ARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)/e500
-libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)/e500
-else
 libm_ARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)
 libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)
+
+ifneq ($(TARGET_SUBARCH),)
+libm_SUBARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)/$(TARGET_SUBARCH)
+libm_SUBARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)/$(TARGET_SUBARCH)
 endif
 
 ifeq ($(UCLIBC_HAS_FPU),y)
 ifeq ($(DO_C99_MATH),y)
 -include $(libm_ARCH_DIR)/Makefile.arch
+-include $(libm_SUBARCH_DIR)/Makefile.arch
 endif
 endif
 
@@ -56,8 +56,8 @@ LD_MSRC := ldouble_wrappers.c
 ifeq ($(DO_C99_MATH),y)
 libm_CSRC := \
        e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c \
-       e_exp.c e_fmod.c e_hypot.c e_j0.c \
-       e_j1.c e_jn.c e_lgamma_r.c e_log.c e_log2.c e_log10.c \
+       e_exp.c e_fmod.c e_hypot.c \
+       e_lgamma_r.c e_log.c e_log2.c e_log10.c \
        e_pow.c e_remainder.c e_rem_pio2.c e_scalb.c e_sinh.c \
        e_sqrt.c k_cos.c k_rem_pio2.c k_sin.c k_standard.c k_tan.c \
        s_asinh.c s_atan.c s_cbrt.c s_ceil.c s_copysign.c s_cos.c \
@@ -72,10 +72,11 @@ libm_CSRC := \
        s_fpclassify.c s_fpclassifyf.c s_signbit.c s_signbitf.c \
        s_isnan.c s_isnanf.c s_isinf.c s_isinff.c s_finitef.c \
        s_fdim.c s_fma.c s_fmax.c s_fmin.c \
-       s_remquo.c w_exp2.c
+       s_remquo.c w_exp2.c \
+       cexp.c sincos.c
 
 # Not implemented [yet?], see comment in float_wrappers.c:
-# exp2f.o fdimf.o fmaf.o fmaxf.o fminf.o log2f.o
+# fdimf.o fmaf.o fmaxf.o fminf.o
 # nearbyintf.o remquof.o scalblnf.o tgammaf.o
 FL_MOBJ := \
        acosf.o \
@@ -93,6 +94,7 @@ FL_MOBJ := \
        coshf.o \
        erfcf.o \
        erff.o \
+       exp2f.o \
        expf.o \
        expm1f.o \
        fabsf.o \
@@ -108,6 +110,7 @@ FL_MOBJ := \
        llroundf.o \
        log10f.o \
        log1pf.o \
+       log2f.o \
        logbf.o \
        logf.o \
        lrintf.o \
@@ -209,15 +212,16 @@ libm_CSRC := \
 FL_MOBJ := sqrtf.o
 endif
 
+ifeq ($(DO_XSI_MATH),y)
+libm_CSRC += e_j0.c e_j1.c e_jn.c
+endif
+
 # assume that arch specific versions are provided as single sources/objects
 ifeq ($(UCLIBC_HAS_FPU),y)
 ifeq ($(DO_C99_MATH),y)
 ifneq ($(strip $(libm_ARCH_OBJS)),)
-ifeq ($(TARGET_ARCH)-$(CONFIG_E500),powerpc-y)
-CFLAGS-libm/$(TARGET_ARCH)/e500/ := $(CFLAGS-libm)
-else
 CFLAGS-libm/$(TARGET_ARCH)/ := $(CFLAGS-libm)
-endif
+CFLAGS-libm/$(TARGET_ARCH)/$(TARGET_SUBARCH)/ := $(CFLAGS-libm)
 
 # remove generic sources, if arch specific version is present
 ifneq ($(strip $(libm_ARCH_SRC)),)
@@ -264,7 +268,7 @@ libm-so-y += $(libm_OBJS:.o=.os)
 
 lib-a-$(UCLIBC_HAS_FLOATS) += $(top_builddir)lib/libm.a
 lib-so-$(UCLIBC_HAS_FLOATS) += $(top_builddir)lib/libm.so
-objclean-y += libm_clean
+objclean-y += CLEAN_libm
 
 ifeq ($(DOMULTI),n)
 ifeq ($(DOPIC),y)
@@ -272,10 +276,10 @@ $(top_builddir)lib/libm.so: $(top_builddir)lib/libm.a $(libc.depend)
 else
 $(top_builddir)lib/libm.so: $(libm_OUT)/libm_so.a $(libc.depend)
 endif
-       $(call link.so,$(libm_FULL_NAME),$(MAJOR_VERSION))
+       $(call link.so,$(libm_FULL_NAME),$(ABI_VERSION))
 else
 $(top_builddir)lib/libm.so: $(libm_OUT)/libm.oS | $(libc.depend)
-       $(call linkm.so,$(libm_FULL_NAME),$(MAJOR_VERSION))
+       $(call linkm.so,$(libm_FULL_NAME),$(ABI_VERSION))
 endif
 
 $(libm_OUT)/libm_so.a: $(libm-so-y)
@@ -310,5 +314,5 @@ $(libm_MOBJ_FL:.o=.i): $(libm_MSRC_FL)
 $(libm_MOBJ_LD:.o=.i): $(libm_MSRC_LD)
        $(compile.mi)
 
-libm_clean:
+CLEAN_libm:
        $(do_rm) $(addprefix $(libm_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*.,$(d)$(e))))