- remove files that are not either LGPL or Public Domain.

- pull replacement funcs for fpmacros.c from glibc

  This removes the powerpc/classic implementation which did not state any
  license but read:
  Copyright © 1991 Apple Computer, Inc.  All rights reserved.
  and thus was dubious (and not needed).

1 files changed, 5 insertions, 12 deletions

diff --git a/libm/Makefile.in b/libm/Makefile.in
index f3768d38e..a94989dcf 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -34,15 +34,10 @@ libm_OUT:=$(top_builddir)libm
 
 # Fix builds for powerpc as there are different cores in this 
 # section now.`
-ifeq ($(TARGET_ARCH),powerpc)
-ifeq ($(CONFIG_E500),y)
+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)/classic
-libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)/classic
-endif
-else
 libm_ARCH_DIR:=$(libm_DIR)/$(TARGET_ARCH)
 libm_ARCH_OUT:=$(libm_OUT)/$(TARGET_ARCH)
 endif
@@ -74,7 +69,9 @@ libm_CSRC := \
 	w_cabs.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 fpmacros.c nan.c carg.c s_llrint.c
+	w_sqrt.c nan.c carg.c s_llrint.c \
+	s_fpclassify.c s_fpclassifyf.c s_signbit.c s_signbitf.c \
+	s_isnan.c s_isnanf.c s_isnf.c s_isinff.c
 FL_MOBJ := \
 	acosf.o acoshf.o asinf.o asinhf.o atan2f.o atanf.o atanhf.o cbrtf.o \
 	ceilf.o copysignf.o cosf.o coshf.o erfcf.o erff.o exp2f.o expf.o \
@@ -103,13 +100,9 @@ endif
 ifeq ($(UCLIBC_HAS_FPU),y)
 ifeq ($(DO_C99_MATH),y)
 ifneq ($(strip $(libm_ARCH_OBJS)),)
-ifeq ($(TARGET_ARCH),powerpc)
-ifeq ($(CONFIG_E500),y)
+ifeq ($(TARGET_ARCH)-$(CONFIG_E500),powerpc-y)
 CFLAGS-libm/$(TARGET_ARCH)/e500/ := $(CFLAGS-libm)
 else
-CFLAGS-libm/$(TARGET_ARCH)/classic/ := $(CFLAGS-libm)
-endif
-else
 CFLAGS-libm/$(TARGET_ARCH)/ := $(CFLAGS-libm)
 endif