Changeset 65b4aac1 in mainline

Timestamp:

2011-07-23T20:14:32Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

df217a6

Parents:

e16e2ba4 (diff), cfbb5d18 (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 libposix changes.

Location:

uspace

Files:

• Makefile (modified) (1 diff)
• Makefile.common (modified) (3 diffs)
• lib/posix/Makefile (added)
• lib/posix/assert.h (added)
• lib/posix/ctype.c (added)
• lib/posix/ctype.h (added)
• lib/posix/errno.c (added)
• lib/posix/errno.h (added)
• lib/posix/fcntl.c (added)
• lib/posix/fcntl.h (added)
• lib/posix/float.h (added)
• lib/posix/fnmatch.c (added)
• lib/posix/fnmatch.h (added)
• lib/posix/internal/common.h (added)
• lib/posix/inttypes.h (added)
• lib/posix/iso646.h (added)
• lib/posix/limits.h (added)
• lib/posix/locale.c (added)
• lib/posix/locale.h (added)
• lib/posix/math.c (added)
• lib/posix/math.h (added)
• lib/posix/pwd.c (added)
• lib/posix/pwd.h (added)
• lib/posix/signal.c (added)
• lib/posix/signal.h (added)
• lib/posix/stdbool.h (added)
• lib/posix/stddef.h (added)
• lib/posix/stdint.h (added)
• lib/posix/stdio.c (added)
• lib/posix/stdio.h (added)
• lib/posix/stdio/scanf.c (added)
• lib/posix/stdlib.c (added)
• lib/posix/stdlib.h (added)
• lib/posix/stdlib/strtol.c (added)
• lib/posix/stdlib/strtold.c (added)
• lib/posix/string.c (added)
• lib/posix/string.h (added)
• lib/posix/strings.c (added)
• lib/posix/strings.h (added)
• lib/posix/sys/mman.h (added)
• lib/posix/sys/stat.c (added)
• lib/posix/sys/stat.h (added)
• lib/posix/sys/types.h (added)
• lib/posix/sys/wait.c (added)
• lib/posix/sys/wait.h (added)
• lib/posix/time.c (added)
• lib/posix/time.h (added)
• lib/posix/unistd.c (added)
• lib/posix/unistd.h (added)

uspace/Makefile

@@ -175 +175 @@
         lib/usbdev \
         lib/usbhid \
-        lib/usbvirt
+        lib/usbvirt \
+        lib/posix
 
 LIBC_BUILD = $(addsuffix .build,$(LIBC))

uspace/Makefile.common

@@ -44 +44 @@
 #   EXTRA_CLEAN        additional cleanup targets
 #
+#   POSIX_COMPAT       set to 'y' to use POSIX compatibility layer
+#
 # Optionally, for a binary:
 #   STATIC_NEEDED      set to 'y' for init binaries, will build statically
@@ -104 +106 @@
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
 
+LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
+
 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
 LIBFS_PREFIX = $(LIB_PREFIX)/fs
@@ -213 +217 @@
 JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
 
+ifeq ($(POSIX_COMPAT),y)
+        CFLAGS = -I$(LIBPOSIX_PREFIX)
+        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
+endif
+
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),gcc_native)
-        CFLAGS = $(GCC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),icc)
-        CFLAGS = $(ICC_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
 ifeq ($(COMPILER),clang)
-        CFLAGS = $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif