Changeset 6946f23 in mainline

Timestamp:

2013-12-17T14:11:24Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0773396, ac36aed

Parents:

f5ceb18 (diff), 2034f98 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge POSIX-related updates

Math functions were moved to a separate library. This would
allow us to easily swap the dummy implementation with a real
one (e.g. from fdlibm).

Also added few Python examples to uspace/dist/src.

Merged branch: lp:~vojtech-horky/helenos/posix

Files:

• boot/Makefile (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/Makefile.common (modified) (3 diffs)
• uspace/dist/src/python/demo/hello.py (added)
• uspace/dist/src/python/demo/sintab.py (added)
• uspace/dist/src/python/modules.py (added)
• uspace/lib/c/include/math.h (added)
• uspace/lib/math/Makefile (added)
• uspace/lib/math/src/dummy.c (added)
• uspace/lib/posix/Makefile (modified) (1 diff)
• uspace/lib/posix/include/posix/math.h (modified) (1 diff)
• uspace/lib/posix/source/math.c (deleted)

boot/Makefile

@@ -97 +97 @@
         rm -f $(USPACE_PATH)/dist/srv/*
         rm -rf $(USPACE_PATH)/dist/drv/*
-        rm -f $(USPACE_PATH)/dist/lib/*
+        rm -rf $(USPACE_PATH)/dist/lib/*
         rm -rf $(USPACE_PATH)/dist/inc/*
         rm -f $(USPACE_PATH)/dist/app/*

uspace/Makefile

@@ -240 +240 @@
         lib/softrend \
         lib/draw \
+        lib/math \
         lib/net \
         lib/nic \

uspace/Makefile.common

@@ -45 +45 @@
 #
 #   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
+#   NEEDS_MATH         set to 'y' to add implementation of mathematical functions
 #
 # Optionally, for a binary:
@@ -109 +110 @@
 LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
+LIBMATH_PREFIX = $(LIB_PREFIX)/math
 
 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
@@ -233 +235 @@
 endif
 
+# Do we need math?
+ifeq ($(NEEDS_MATH),y)
+        BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
+endif
+
 ## Setup platform configuration
 #

uspace/lib/posix/Makefile

@@ -60 +60 @@
         source/getopt.c \
         source/locale.c \
-        source/math.c \
         source/pthread/condvar.c \
         source/pthread/keys.c \

uspace/lib/posix/include/posix/math.h

@@ -36 +36 @@
 #define POSIX_MATH_H_
 
-#ifndef __POSIX_DEF__
-#define __POSIX_DEF__(x) x
-#endif
-
-#ifdef __GNUC__
-        #define HUGE_VAL (__builtin_huge_val())
-#endif
-
-/* Normalization Functions */
-extern double __POSIX_DEF__(ldexp)(double x, int exp);
-extern double __POSIX_DEF__(frexp)(double num, int *exp);
-
-double __POSIX_DEF__(fabs)(double x);
-double __POSIX_DEF__(floor)(double x);
-double __POSIX_DEF__(modf)(double x, double *iptr);
-double __POSIX_DEF__(fmod)(double x, double y);
-double __POSIX_DEF__(pow)(double x, double y);
-double __POSIX_DEF__(exp)(double x);
-double __POSIX_DEF__(sqrt)(double x);
-double __POSIX_DEF__(log)(double x);
-double __POSIX_DEF__(sin)(double x);
-double __POSIX_DEF__(cos)(double x);
-double __POSIX_DEF__(atan2)(double y, double x);
+#include "libc/math.h"
 
 #endif /* POSIX_MATH_H_ */