Changes in uspace/Makefile.common [0e9b512:afdcc60e] in mainline

File:

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

uspace/Makefile.common

@@ -73 +73 @@
 endif
 
-ifneq ($(SLIBRARY),)
-        LARCHIVE = $(LIBRARY).la
-        LOUTPUT = $(SLIBRARY)
-        EXTRA_OUTPUT += $(LOUTPUT).disasm
-        EXTRA_CLEAN += $(LOUTPUT).map $(LOUTPUT).ldisasm \
-            $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
-endif
-
 DEPEND = Makefile.depend
 DEPEND_PREV = $(DEPEND).prev
@@ -98 +90 @@
 LIBNET_PREFIX = $(LIB_PREFIX)/net
 
-ifeq ($(DYNAMIC_LINKING),y)
-BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.a
-LFLAGS = -Bdynamic
-LINKER_SCRIPT ?= $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld
-else
 BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
+
 LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
-endif
 
 ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
@@ -115 +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) \
@@ -144 +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
@@ -192 +175 @@
 
 OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
-LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES)))
 
 ifneq ($(BINARY),)
@@ -203 +185 @@
 
 $(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)/shared/arch/$(UARCH)/_lib.ld
-        $(LD) -T $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld $(LIB_LFLAGS) $(LARCHIVE) -o $@ -Map $(LOUTPUT).map
-endif
-
-$(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld: $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld.in
-        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
-
-$(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld.in
-        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
 
 ifneq ($(LIBRARY),)
 %.a: $(OBJECTS)
         $(AR) rc $@ $(OBJECTS)
-endif
-
-ifneq ($(SLIBRARY),)
-%.la: $(LOBJECTS)
-        $(AR) rc $@ $(LOBJECTS)
 endif
 
@@ -255 +214 @@
 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
@@ -282 +223 @@
 $(OUTPUT): $(OBJECTS)
 
-$(LARCHIVE): $(LOBJECTS)