Changes in uspace/Makefile.common [a60afd0:78a9e5ef] in mainline

File:

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

uspace/Makefile.common

@@ -40 +40 @@
 #   BINARY         (/) binary output name (like appname)
 #   LIBRARY        (/) library output name (like libname)
-#
 #   EXTRA_OUTPUT       additional output targets
 #   EXTRA_CLEAN        additional cleanup targets
-#
-# Optionally, for a binary:
-#   STATIC_NEEDED      set to 'y' for init binaries, will build statically
-#                      linked version
-#   STATIC_ONLY        set to 'y' if binary cannot be linked dynamically
-#                      (e.g. uses thread-local variables)
-#
-# Optionally, for a libary:
-#   SLIBRARY           Name with full version, e.g. libfoo.so.0.0 
-#   LSONAME            Soname / name with short version, e.g. libfoo.so.0
 #
 # (x) required variables
@@ -84 +73 @@
 endif
 
-ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
-        ifneq ($(SLIBRARY),)
-                LARCHIVE = $(LIBRARY).la
-                LOUTPUT = $(SLIBRARY)
-                EXTRA_OUTPUT += $(LOUTPUT).disasm $(LIBRARY).so $(LSONAME)
-                EXTRA_CLEAN += $(LOUTPUT).map $(LOUTPUT).ldisasm \
-                    $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld \
-                    $(LIBRARY).so $(LSONAME)
-        endif
-endif
-
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
@@ -108 +86 @@
 LIBCLUI_PREFIX = $(LIB_PREFIX)/clui
 
-
-LIBUSB_PREFIX = $(LIB_PREFIX)/usb
-LIBUSBHOST_PREFIX = $(LIB_PREFIX)/usbhost
-LIBUSBDEV_PREFIX = $(LIB_PREFIX)/usbdev
-LIBUSBHID_PREFIX = $(LIB_PREFIX)/usbhid
-LIBUSBVIRT_PREFIX = $(LIB_PREFIX)/usbvirt
 LIBDRV_PREFIX = $(LIB_PREFIX)/drv
 LIBPACKET_PREFIX = $(LIB_PREFIX)/packet
 LIBNET_PREFIX = $(LIB_PREFIX)/net
 
-ifeq ($(STATIC_NEEDED),y)
-        STATIC_BUILD = y
-else
-        ifeq ($(STATIC_ONLY),y)
-                STATIC_BUILD = y
-        else
-                ifeq ($(CONFIG_USE_SHARED_LIBS), y)
-                        STATIC_BUILD = n
-                else
-                        STATIC_BUILD = y
-                endif
-        endif
-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
+
 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
-endif
 
 ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
@@ -154 +102 @@
 .PHONY: all clean
 
-all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT)
+all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(EXTRA_OUTPUT)
         -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV)
 
 clean:
-        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(LARCHIVE) $(LOUTPUT) $(EXTRA_OUTPUT) $(EXTRA_CLEAN)
+        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(EXTRA_OUTPUT) $(EXTRA_CLEAN)
         find . -name '*.o' -follow -exec rm \{\} \;
-        find . -name '*.lo' -follow -exec rm \{\} \;
 
 GCC_CFLAGS = -I$(LIBC_PREFIX)/include -O$(OPTIMIZATION) -imacros $(CONFIG_HEADER) \
@@ -166 +113 @@
         -finput-charset=UTF-8 -ffreestanding -fno-builtin -nostdlib -nostdinc \
         -Wall -Wextra -Wno-clobbered -Wno-unused-parameter -Wmissing-prototypes \
-        -std=gnu99 -Werror-implicit-function-declaration -Wwrite-strings \
+        -Werror-implicit-function-declaration -Wwrite-strings \
         -pipe -g -D__$(ENDIANESS)__
 
@@ -183 +130 @@
         -pipe -g -arch $(CLANG_ARCH) -D__$(ENDIANESS)__
 
-LIB_CFLAGS = $(CFLAGS) -fPIC -D__IN_SHARED_LIBC__
-LIB_LFLAGS = $(LFLAGS) -shared -soname $(LSONAME) --whole-archive
-
 ifeq ($(CONFIG_DEBUG),y)
         GCC_CFLAGS += -Werror
@@ -191 +135 @@
 endif
 
-ifeq ($(CONFIG_LINE_DEBUG),y)
-        GCC_CFLAGS += -g
-        ICC_CFLAGS += -g
-        SUNCC_CFLAGS += -g
-        CLANG_CFLAGS += -g
-endif
-
 ## Setup platform configuration
 #
@@ -231 +168 @@
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
 
 ifneq ($(BINARY),)
@@ -242 +178 @@
 
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+        $(LD) -N $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(BINARY)
 endif
-endif
-
-ifneq ($(SLIBRARY),)
-%.disasm: $(LOUTPUT)
-ifeq ($(CONFIG_LINE_DEBUG),y)
-        $(OBJDUMP) -d -S $< > $@
-else
-        $(OBJDUMP) -d $< > $@
-endif
-
-$(LOUTPUT): $(LARCHIVE) $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
-        $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld $(LIB_LFLAGS) $(LARCHIVE) -o $@ -Map $(LOUTPUT).map
-
-$(LIBRARY).so:
-        ln -s $(SLIBRARY) $@
-
-$(LSONAME):
-        ln -s $(SLIBRARY) $@
 endif
 
@@ -269 +187 @@
 %.a: $(OBJECTS)
         $(AR) rc $@ $(OBJECTS)
-endif
-
-ifneq ($(SLIBRARY),)
-%.la: $(LOBJECTS)
-        $(AR) rc $@ $(LOBJECTS)
 endif
 
@@ -294 +207 @@
 endif
 
-%.lo: %.S $(DEPEND)
-        $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm/preproc $(DEFS) $(CFLAGS) -D__ASM__
-endif
-
-%.lo: %.s $(DEPEND)
-        $(AS) $(AFLAGS) -o $@ $<
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ as asm
-endif
-
-%.lo: %.c $(DEPEND)
-        $(CC) $(DEFS) $(LIB_CFLAGS) -c $< -o $@
-ifeq ($(PRECHECK),y)
-        $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS)
-endif
-
 $(DEPEND): $(PRE_DEPEND)
         makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null
         -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@
-
-##
-# This explicit dependecy of the output binary on the object files seems to be
-# necessary to prevent parallel build failures (GNU make bug #26893 ???).
-$(OUTPUT): $(OBJECTS)
-
-$(LARCHIVE): $(LOBJECTS)