Changeset 8e7c9fe in mainline for uspace/Makefile.common

Timestamp:

2014-09-12T03:45:25Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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 mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• uspace/Makefile.common (modified) (8 diffs)

uspace/Makefile.common

@@ -44 +44 @@
 #   EXTRA_CLEAN        additional cleanup targets
 #
+#   MATH               set to 'y' to use the math library
 #   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:
@@ -87 +87 @@
 endif
 
-ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
+ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
         ifneq ($(SLIBRARY),)
                 LARCHIVE = $(LIBRARY).la
@@ -110 +110 @@
 LIBSOFTFLOAT_PREFIX = $(LIB_PREFIX)/softfloat
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
+
 LIBMATH_PREFIX = $(LIB_PREFIX)/math
+LIBMATH_INCLUDES_FLAGS = \
+        -I$(LIBMATH_PREFIX)/include \
+        -I$(LIBMATH_PREFIX)/arch/$(UARCH)/include
 
 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
@@ -155 +159 @@
                 STATIC_BUILD = y
         else
-                ifeq ($(CONFIG_USE_SHARED_LIBS), y)
+                ifeq ($(CONFIG_USE_SHARED_LIBS),y)
                         STATIC_BUILD = n
                 else
@@ -172 +176 @@
         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
         LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+        ifeq ($(MATH),y)
+                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
+        endif
 else
         BASE_LIBS = $(LIBC_PREFIX)/libc.so0 $(LIBSOFTINT_PREFIX)/libsofti.so0
         LFLAGS = -Bdynamic
         LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+        ifeq ($(MATH),y)
+                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so0
+        endif
+endif
+
+ifeq ($(MATH),y)
+        INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) $(LIBMATH_INCLUDES_FLAGS)
+else
+        INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
 endif
 
@@ -194 +210 @@
         find . -name '*.lo' -follow -exec rm \{\} \;
 
-GCC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -201 +217 @@
         -pipe -ggdb -D__$(ENDIANESS)__
 
-ICC_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
@@ -234 +250 @@
 # Prepare for POSIX before including platform specific stuff
 ifeq ($(POSIX_COMPAT),y)
-        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix  -I$(LIBPOSIX_PREFIX)/include/
+        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix -I$(LIBPOSIX_PREFIX)/include/
         BASE_LIBS = $(LIBPOSIX_PREFIX)/libposixaslibc.a $(LIBPOSIX_PREFIX)/libc4posix.a $(LIBSOFTINT_PREFIX)/libsoftint.a
-endif
-
-# Do we need math?
-ifeq ($(NEEDS_MATH),y)
-        BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
 endif