Changes in uspace/Makefile.common [58563585:4fb794c] in mainline

File:

• uspace/Makefile.common (modified) (15 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
 #
@@ -78 +77 @@
         JOB = $(BINARY).job
         OUTPUT = $(BINARY)
-        TEST_BINARY = test-$(BINARY)
         EXTRA_OUTPUT += $(BINARY).disasm
         EXTRA_CLEAN += $(BINARY).map
@@ -86 +84 @@
         JOB = $(LIBRARY).job
         OUTPUT = $(LIBRARY).a
-        TEST_BINARY = test-$(LIBRARY)
-endif
-
-ifeq ($(CONFIG_BUILD_SHARED_LIBS),y)
+endif
+
+ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
         ifneq ($(SLIBRARY),)
                 LARCHIVE = $(LIBRARY).la
@@ -113 +110 @@
 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
 
-LIBCRYPTO_PREFIX = $(LIB_PREFIX)/crypto
 LIBBLOCK_PREFIX = $(LIB_PREFIX)/block
-LIBFDISK_PREFIX = $(LIB_PREFIX)/fdisk
-LIBLABEL_PREFIX = $(LIB_PREFIX)/label
 LIBFS_PREFIX = $(LIB_PREFIX)/fs
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
@@ -142 +131 @@
 
 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
-LIBHOUND_PREFIX = $(LIB_PREFIX)/hound
-LIBPCM_PREFIX = $(LIB_PREFIX)/pcm
+LIBNET_PREFIX = $(LIB_PREFIX)/net
 LIBNIC_PREFIX = $(LIB_PREFIX)/nic
-LIBIEEE80211_PREFIX = $(LIB_PREFIX)/ieee80211
 LIBMINIX_PREFIX = $(LIB_PREFIX)/minix
-LIBCOMPRESS_PREFIX = $(LIB_PREFIX)/compress
-LIBDLTEST_PREFIX = $(LIB_PREFIX)/dltest
 
 LIBSCSI_PREFIX = $(LIB_PREFIX)/scsi
-LIBTRACKMOD_PREFIX = $(LIB_PREFIX)/trackmod
 
 LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
-
-LIBHTTP_PREFIX = $(LIB_PREFIX)/http
-LIBURI_PREFIX = $(LIB_PREFIX)/uri
-
-LIBNETTL_PREFIX = $(LIB_PREFIX)/nettl
-
-AFLAGS = --fatal-warnings
-LFLAGS = --fatal-warnings
 
 ifeq ($(STATIC_NEEDED),y)
@@ -169 +145 @@
                 STATIC_BUILD = y
         else
-                ifeq ($(CONFIG_USE_SHARED_LIBS),y)
+                ifeq ($(CONFIG_USE_SHARED_LIBS), y)
                         STATIC_BUILD = n
                 else
@@ -177 +153 @@
 endif
 
+# Build static whenever we use libusb because that library uses 
+# thread local variables
+ifneq ($(findstring usb, $(LIBS)),)
+        STATIC_BUILD = y
+endif
+
 ifeq ($(STATIC_BUILD),y)
         BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
-        ifeq ($(MATH),y)
-                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.a
-        endif
-else
-        BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.so.0
-        LINK_DYNAMIC = y
-        ifeq ($(MATH),y)
-                BASE_LIBS += $(LIBMATH_PREFIX)/libmath.so.0
-        endif
-endif
-
-ifeq ($(LINK_DYNAMIC),y)
-        LFLAGS += -Bdynamic
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+else
+        BASE_LIBS = $(LIBC_PREFIX)/libc.so0 $(LIBSOFTINT_PREFIX)/libsofti.so0
+        LFLAGS = -Bdynamic
         LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
-else
-        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
-endif
-
-ifeq ($(MATH),y)
-        INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS) $(LIBMATH_INCLUDES_FLAGS)
-else
-        INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
 endif
 
@@ -209 +174 @@
 endif
 
-# PCUT-based unit tests
-ifneq ($(TEST_SOURCES),)
-        TEST_OUTPUT = $(TEST_BINARY)
-        TEST_CFLAGS = -I$(LIB_PREFIX)/pcut/include -D__helenos__
-        TEST_OUTPUT_LIBS = $(LIB_PREFIX)/pcut/libpcut.a
-        EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map
-ifneq ($(LIBRARY),)
-        TEST_OUTPUT_LIBS += $(OUTPUT)
-endif
-        TEST_OUTPUT_LIBS += $(TEST_LIBS)
-endif
-
 .PHONY: all clean
 
 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT)
         -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
-
-all-test: $(TEST_OUTPUT)
 
 clean:
@@ -233 +184 @@
         find . -name '*.lo' -follow -exec rm \{\} \;
 
-GCC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+GCC_CFLAGS = $(LIBC_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 \
@@ -240 +191 @@
         -pipe -ggdb -D__$(ENDIANESS)__
 
-ICC_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+ICC_CFLAGS = $(LIBC_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 \
@@ -250 +201 @@
 # something won't break because of that:
 # -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) -finput-charset=UTF-8
-CLANG_CFLAGS = $(INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
+CLANG_CFLAGS = $(LIBC_INCLUDES_FLAGS) -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
         -ffreestanding -fno-builtin -nostdlib -nostdinc \
         -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes \
-        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
-        -integrated-as -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
-
-LIB_CFLAGS = $(CFLAGS) -fPIC
+        -Werror-implicit-function-declaration -Wwrite-strings \
+        -integrated-as \
+        -pipe -g -target $(CLANG_TARGET) -D__$(ENDIANESS)__
+
+LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
 LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME) --whole-archive
 
@@ -265 +217 @@
 
 ifeq ($(CONFIG_LINE_DEBUG),y)
-        GCC_CFLAGS += -ggdb
+        GCC_CFLAGS += -g
         ICC_CFLAGS += -g
         CLANG_CFLAGS += -g
 endif
 
-# Prepare for POSIX before including platform specific stuff
+## Setup platform configuration
+#
+
+-include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.common
+
+## Compilation options
+#
+
+JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
+
 ifeq ($(POSIX_COMPAT),y)
-        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
-
-## Setup platform configuration
-#
-
--include $(LIBC_PREFIX)/arch/$(UARCH)/Makefile.common
-
-## Compilation options
-#
-
-JOBFILE = $(LIBC_PREFIX)/../../../tools/jobfile.py
+        CFLAGS = -I$(LIBPOSIX_PREFIX)/include/posix  -I$(LIBPOSIX_PREFIX)/include/
+        LIBS += $(LIBPOSIX_PREFIX)/libposix.a
+endif
 
 ifeq ($(COMPILER),gcc_cross)
-        CFLAGS += $(GCC_CFLAGS)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
-ifeq ($(COMPILER),gcc_helenos)
-        CFLAGS += $(GCC_CFLAGS)
+ifeq ($(COMPILER),gcc_native)
+        CFLAGS += $(GCC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
-ifeq ($(COMPILER),gcc_native)
-        CFLAGS += $(GCC_CFLAGS)
+ifeq ($(COMPILER),icc)
+        CFLAGS += $(ICC_CFLAGS) $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
-ifeq ($(COMPILER),icc)
-        CFLAGS += $(ICC_CFLAGS)
+ifeq ($(COMPILER),clang)
+        CFLAGS += $(CLANG_CFLAGS) $(EXTRA_CFLAGS)
+        GCC_CFLAGS += $(EXTRA_CFLAGS)
         DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
 endif
 
-ifeq ($(COMPILER),clang)
-        CFLAGS += $(CLANG_CFLAGS)
-        DEPEND_DEFS = $(DEFS) $(CONFIG_DEFS)
-endif
-
-ifneq ($(MAKECMDGOALS),clean)
 -include $(DEPEND)
-endif
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
 LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
-TEST_OBJECTS := $(addsuffix .test.o,$(basename $(TEST_SOURCES)))
 
 ifneq ($(BINARY),)
@@ -353 +297 @@
 
 ifneq ($(LIBRARY),)
-$(LIBRARY).a: $(OBJECTS)
+%.a: $(OBJECTS)
         $(AR) rc $@ $(OBJECTS)
 endif
 
-ifneq ($(LARCHIVE),)
-$(LARCHIVE): $(LOBJECTS)
+ifneq ($(SLIBRARY),)
+%.la: $(LOBJECTS)
         $(AR) rc $@ $(LOBJECTS)
 endif
 
-ifneq ($(TEST_OUTPUT),)
-$(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
-ifeq ($(CONFIG_STRIP_BINARIES),y)
-        $(STRIP) $(TEST_OUTPUT)
-endif
-endif
-
 %.o: %.S $(DEPEND)
-        $(GCC) $(DEFS) $(GCC_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
+        $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
 endif
 
@@ -383 +319 @@
 
 %.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS)
-endif
-
-%.test.o: %.c $(DEPEND)
-        $(CC) $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) $(EXTRA_CFLAGS) $(TEST_CFLAGS)
+        $(CC) $(DEFS) $(CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
 endif
 
 %.lo: %.S $(DEPEND)
-        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -D__ASM__
+        $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
 endif
 
@@ -407 +337 @@
 
 %.lo: %.c $(DEPEND)
-        $(CC) $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(LIB_CFLAGS) $(EXTRA_CFLAGS)
+        $(CC) $(DEFS) $(LIB_CFLAGS) -c $< -o $@
+ifeq ($(PRECHECK),y)
+        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
 endif
 
 $(DEPEND): $(PRE_DEPEND)
-        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) $(EXTRA_CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null
+        makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@