Changeset 3424

Timestamp:

08/08/07 12:34:07 (4 years ago)

Author:

tg

Message:

make ISO C99 math support optional; not yet tested

Files:

• trunk/freewrt/Config.in (modified) (1 diff)
• trunk/freewrt/mk/build.mk (modified) (1 diff)
• trunk/freewrt/package/libstdcxx/Config.in (modified) (1 diff)
• trunk/freewrt/package/uclibc++/Config.in (modified) (1 diff)
• trunk/freewrt/toolchain/uClibc/Makefile (modified) (1 diff)
• trunk/freewrt/toolchain/uClibc/patches/patch-Makefile (modified) (3 diffs)
• trunk/freewrt/toolchain/uClibc/patches/patch-libm_Makefile (modified) (2 diffs)

trunk/freewrt/Config.in

@@ -171 +171 @@
-          You start with a GUI project, if you have this tools installed.
-
+config FWRT_ISOMATH
+        bool "Support ISO C99 math functions (RECOMMENDED)"
+        default y
+        help
+          This will add support for ISO C99 mathematical functions to
+          uClibc, at a cost of less than 40K on mips.
+
-config FWRT_UNICODE
-        bool "Enable support for the UTF-8 locale"

trunk/freewrt/mk/build.mk

@@ -16 +16 @@
-                        tags
-
-
+ISOMATH FWRT_
-POSTCONFIG=             @\
-        what=cleandir; \

trunk/freewrt/package/libstdcxx/Config.in

@@ -4 +4 @@
-        default n
-        select FWRT_PACKAGE_LIBGCC
+        select FWRT_ISOMATH
-        help
-          G++ support library

trunk/freewrt/package/uclibc++/Config.in

@@ -3 +3 @@
-        tristate
-        default n
+        select FWRT_ISOMATH
-        help
-          A standard C++ library for embedded systems

trunk/freewrt/toolchain/uClibc/Makefile

@@ -46 +46 @@
-ifeq ($(strip ${FWRT_UNICODE}),)
-        ${SED} 's
UCLIBC_HAS_LOCALE=y
# UCLIBC_HAS_LOCALE is not set
' \
+            ${PKG_BUILD_DIR}/.config
+endif
+ifeq ($(strip ${FWRT_ISOMATH}),)
+        ${SED} 's
-            ${PKG_BUILD_DIR}/.config
-endif

trunk/freewrt/toolchain/uClibc/patches/patch-Makefile

@@ -1 +1 @@
-$FreeWRT$
---- uClibc-0.9.28.orig/Makefile 2005-08-18 00:49:49.000000000 +0200
-1 12:32:53
-62
+8 12:25:38
+58
-        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib
-        $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
@@ -16 +16 @@
- ifneq ($(strip $(UCLIBC_HAS_FLOATS)),y)
-        # Remove floating point related headers since float support is disabled.
-52
+48
-        $(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)lib
-        $(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
@@ -25 +25 @@
-            set -e; \
-                $(SHELL_SET_X); \
-9
+5
- release: distclean
-        cd ..;                                  \

trunk/freewrt/toolchain/uClibc/patches/patch-libm_Makefile

@@ -1 +1 @@
-$FreeWRT$
---- uClibc-0.9.28.orig/libm/Makefile    2005-08-18 00:49:41.000000000 +0200
-7-24 16:46:08
+8-08 12:30:26
-@@ -67,6 +67,7 @@ CSRC =   e_acos.c e_acosh.c e_asin.c e_a
-          w_hypot.c w_j0.c w_j1.c w_jn.c w_lgamma.c w_lgamma_r.c\
@@ -10 +10 @@
-        ceilf.o copysignf.o cosf.o coshf.o erfcf.o erff.o exp2f.o expf.o \
-        expm1f.o fabsf.o fdimf.o floorf.o fmaf.o fmaxf.o fminf.o fmodf.o \
+@@ -85,8 +86,10 @@ CSRC+=   s_expm1.c s_scalbn.c s_copysign
+         k_cos.c e_cosh.c e_exp.c e_fmod.c e_log.c e_log10.c e_pow.c \
+         k_sin.c e_sinh.c e_sqrt.c k_tan.c e_rem_pio2.c k_rem_pio2.c \
+         s_finite.c
+-# We'll add sqrtf to avoid problems with libstdc++
+-FL_MOBJ = sqrtf.o
++# FreeWRT extensions (more required stuff)
++CSRC+=  fpmacros.c nan.c s_rint.c e_hypot.c w_hypot.c
++CSRC+=  s_round.c      # from MirBSD /usr/src/lib/libm/src/s_round.c
++FL_MOBJ= sqrtf.o cosf.o floorf.o logf.o sinf.o ceilf.o rintf.o roundf.o
+ endif
+ 
+ COBJS=$(patsubst %.c,%.o, $(CSRC))