We need to link with libgcc.a when creating shared libs, in order to

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

diff --git a/libm/Makefile b/libm/Makefile
index 4c6f279..9ca4f14 100644 (file)
--- a/libm/Makefile
+++ b/libm/Makefile
@@ -34,10 +34,11 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
+DIRS = 
+ifeq ($(strip $(HAS_FPU)),y)
 ifeq ($(TARGET_ARCH),$(wildcard $(TARGET_ARCH)))
 DIRS = $(TARGET_ARCH)
-else
-DIRS = 
+endif
 endif
 ALL_SUBDIRS = powerpc
 
@@ -47,7 +48,7 @@ LIBM_SHARED=libm.so
 LIBM_SHARED_FULLNAME=libm-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
 CFLAGS+=-D_IEEE_LIBM -D_ISOC99_SOURCE -D_SVID_SOURCE
 
-ifeq ($(strip $(DO_C99_MATH)),true)
+ifeq ($(strip $(DO_C99_MATH)),y)
 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_gamma.c e_gamma_r.c e_hypot.c e_j0.c\
          e_j1.c e_jn.c e_lgamma.c e_lgamma_r.c e_log.c e_log10.c\
@@ -62,7 +63,7 @@ CSRC =   e_acos.c e_acosh.c e_asin.c e_atan2.c e_atanh.c e_cosh.c\
          w_cosh.c w_drem.c w_exp.c w_fmod.c w_gamma.c w_gamma_r.c\
          w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c w_lgamma_r.c\
          w_log.c w_log10.c w_pow.c w_remainder.c w_scalb.c w_sinh.c\
-         w_sqrt.c w_sqrtf.c fpmacros.c nan.c
+         w_sqrt.c w_sqrtf.c fpmacros.c nan.c s_ceilf.c s_floorf.c
 else
 # This list of math functions was taken from POSIX/IEEE 1003.1b-1993
 CSRC =   w_acos.c w_asin.c s_atan.c w_atan2.c s_ceil.c s_cos.c \
@@ -78,18 +79,18 @@ COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(COBJS)
 
 
-ifneq ($(strip $(HAS_FLOATING_POINT)),true)
+ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)
 all:  clean subdirs
 else
-all: $(OBJS) $(LIBM) subdirs
+all: $(LIBM) subdirs
 endif
 
 $(LIBM): ar-target
        @if [ -f $(LIBM) ] ; then \
                set -x -e; \
-               install -d $(TOPDIR)lib; \
-               rm -f $(TOPDIR)lib/$(LIBM); \
-               install -m 644 $(LIBM) $(TOPDIR)lib; \
+               $(INSTALL) -d $(TOPDIR)lib; \
+               $(RM) $(TOPDIR)lib/$(LIBM); \
+               $(INSTALL) -m 644 $(LIBM) $(TOPDIR)lib; \
        fi;
 
 shared: all
@@ -97,13 +98,13 @@ shared: all
            set -x -e; \
            $(LD) $(LDFLAGS) -soname=$(LIBM_SHARED).$(MAJOR_VERSION) \
                -o $(LIBM_SHARED_FULLNAME) --whole-archive $(LIBM) \
-               --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \
-               -L$(TOPDIR)/lib -lc; \
-           install -d $(TOPDIR)lib; \
-           rm -f $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
-           install -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
-           (cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED)); \
-           (cd $(TOPDIR)lib && ln -sf $(LIBM_SHARED_FULLNAME) $(LIBM_SHARED).$(MAJOR_VERSION)); \
+               --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
+               -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); \
+           $(INSTALL) -d $(TOPDIR)lib; \
+           $(RM) $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
+           $(INSTALL) -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \
+           $(LN) -sf $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED); \
+           $(LN) -sf $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \
        fi;
 
 ar-target: $(OBJS)
@@ -119,16 +120,15 @@ tags:
        ctags -R
 
 clean: subdirs_clean
-       rm -f *.[oa] *~ core $(LIBM_SHARED)* $(LIBM_SHARED_FULLNAME)*
+       $(RM) *.[oa] *~ core $(LIBM_SHARED)* $(LIBM_SHARED_FULLNAME)*
 
 subdirs: $(patsubst %, _dir_%, $(DIRS))
 subdirs_clean: $(patsubst %, _dirclean_%, $(ALL_SUBDIRS))
 
-$(patsubst %, _dir_%, $(DIRS)) : dummy
+$(patsubst %, _dir_%, $(DIRS)) : $(OBJS)
        $(MAKE) -C $(patsubst _dir_%, %, $@)
 
 $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
        $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
 .PHONY: dummy
-