Changes in / [75aa59a:056d6821] in mainline

Files:

• HelenOS.config (modified) (1 diff)
• Makefile (modified) (3 diffs)
• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (2 diffs)
• uspace/Makefile.common (modified) (3 diffs)
• uspace/app/binutils/Makefile (added)
• uspace/app/binutils/distclean.sh (added)
• uspace/app/binutils/intrusive.sh (added)
• uspace/app/binutils/patch.awk (added)
• uspace/app/binutils/toolchain.sh (added)
• uspace/drv/bus/usb/usbhid/kbd/main.c (added)
• uspace/lib/posix/Makefile (added)
• uspace/lib/posix/assert.h (added)
• uspace/lib/posix/ctype.c (added)
• uspace/lib/posix/ctype.h (added)
• uspace/lib/posix/errno.c (added)
• uspace/lib/posix/errno.h (added)
• uspace/lib/posix/fcntl.c (added)
• uspace/lib/posix/fcntl.h (added)
• uspace/lib/posix/float.h (added)
• uspace/lib/posix/fnmatch.c (added)
• uspace/lib/posix/fnmatch.h (added)
• uspace/lib/posix/internal/common.h (added)
• uspace/lib/posix/inttypes.h (added)
• uspace/lib/posix/iso646.h (added)
• uspace/lib/posix/limits.h (added)
• uspace/lib/posix/locale.c (added)
• uspace/lib/posix/locale.h (added)
• uspace/lib/posix/math.c (added)
• uspace/lib/posix/math.h (added)
• uspace/lib/posix/pwd.c (added)
• uspace/lib/posix/pwd.h (added)
• uspace/lib/posix/signal.c (added)
• uspace/lib/posix/signal.h (added)
• uspace/lib/posix/stdbool.h (added)
• uspace/lib/posix/stddef.h (added)
• uspace/lib/posix/stdint.h (added)
• uspace/lib/posix/stdio.c (added)
• uspace/lib/posix/stdio.h (added)
• uspace/lib/posix/stdio/scanf.c (added)
• uspace/lib/posix/stdlib.c (added)
• uspace/lib/posix/stdlib.h (added)
• uspace/lib/posix/stdlib/strtol.c (added)
• uspace/lib/posix/stdlib/strtold.c (added)
• uspace/lib/posix/string.c (added)
• uspace/lib/posix/string.h (added)
• uspace/lib/posix/strings.c (added)
• uspace/lib/posix/strings.h (added)
• uspace/lib/posix/sys/mman.h (added)
• uspace/lib/posix/sys/stat.c (added)
• uspace/lib/posix/sys/stat.h (added)
• uspace/lib/posix/sys/types.h (added)
• uspace/lib/posix/sys/wait.c (added)
• uspace/lib/posix/sys/wait.h (added)
• uspace/lib/posix/time.c (added)
• uspace/lib/posix/time.h (added)
• uspace/lib/posix/unistd.c (added)
• uspace/lib/posix/unistd.h (added)
• uspace/srv/hid/input/include/sun.h (added)
• uspace/srv/hid/input/port/dummy.c (added)
• uspace/srv/hid/input/port/sun.c (added)

HelenOS.config ¶

@@ -563 +563 @@
 ! CONFIG_BAREBONE (n/y)
 
+% Build binutils binaries 
+! CONFIG_BINUTILS (n/y)
+
 % Line debugging information
 ! [CONFIG_STRIP_BINARIES!=y] CONFIG_LINE_DEBUG (n/y)

Makefile ¶

@@ -66 +66 @@
 # Autotool (detects compiler features)
 
-$(COMMON_MAKEFILE): autotool
-$(COMMON_HEADER): autotool
-
-autotool: $(CONFIG_MAKEFILE)
+autotool $(COMMON_MAKEFILE) $(COMMON_HEADER): $(CONFIG_MAKEFILE)
         $(AUTOTOOL)
         -[ -f $(COMMON_HEADER_PREV) ] && diff -q $(COMMON_HEADER_PREV) $(COMMON_HEADER) && mv -f $(COMMON_HEADER_PREV) $(COMMON_HEADER)
@@ -75 +72 @@
 # Build-time configuration
 
-$(CONFIG_MAKEFILE): config_default
-$(CONFIG_HEADER): config_default
-
-config_default: $(CONFIG_RULES)
+config_default $(CONFIG_MAKEFILE) $(CONFIG_HEADER): $(CONFIG_RULES)
 ifeq ($(HANDS_OFF),y)
         $(CONFIG) $< hands-off $(PROFILE)
@@ -100 +94 @@
 distclean: clean
         rm -f $(CSCOPE).out $(COMMON_MAKEFILE) $(COMMON_HEADER) $(COMMON_HEADER_PREV) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) tools/*.pyc tools/checkers/*.pyc release/HelenOS-*
+        cd ./uspace/app/binutils/; ./distclean.sh
 
 clean:

boot/Makefile.common ¶

@@ -171 +171 @@
         $(USPACE_PATH)/app/websrv/websrv
 
+ifeq ($(CONFIG_BINUTILS),y)
+RD_APPS_NON_ESSENTIAL += \
+        $(USPACE_PATH)/app/binutils/bin/as \
+        $(USPACE_PATH)/app/binutils/bin/ld
+endif
+
 ifneq ($(CONFIG_BAREBONE),y)
 NET_CFG = \

uspace/Makefile ¶

@@ -111 +111 @@
         drv/bus/usb/vhc
 
+ifeq ($(CONFIG_BINUTILS),y)
+DIRS += \
+        app/binutils
+endif
+
 ## Networking
 #
@@ -175 +180 @@
         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