Changes in uspace/lib/c/Makefile [82d9087:7137f74c] in mainline

File:

• uspace/lib/c/Makefile (modified) (6 diffs)

uspace/lib/c/Makefile

@@ -33 +33 @@
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-EXTRA_OUTPUT = $(START_FILES)
+LINKER_SCRIPTS = \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld \
+        $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+
+PRE_DEPEND =
+EXTRA_OUTPUT = $(LINKER_SCRIPTS) $(START_FILES)
+EXTRA_CLEAN = $(LINKER_SCRIPTS)
 EXTRA_TEST_CFLAGS = -Wno-deprecated-declarations
 LIBRARY = libc
@@ -44 +51 @@
         generic/libc.c \
         generic/ddi.c \
+        generic/atomic.c \
         generic/as.c \
         generic/bd.c \
@@ -77 +85 @@
         generic/strtol.c \
         generic/l18n/langs.c \
+        generic/fibril.c \
+        generic/fibril_synch.c \
         generic/pcb.c \
         generic/smc.c \
         generic/smp_memory_barrier.c \
+        generic/thread.c \
+        generic/tls.c \
         generic/task.c \
+        generic/futex.c \
         generic/imath.c \
         generic/inet/addr.c \
@@ -129 +142 @@
         generic/stdio/sstream.c \
         generic/stdio/vsprintf.c \
-        generic/thread/atomic.c \
-        generic/thread/fibril.c \
-        generic/thread/fibril_synch.c \
-        generic/thread/thread.c \
-        generic/thread/tls.c \
-        generic/thread/futex.c \
-        generic/thread/rcu.c \
-        generic/thread/mpsc.c \
         generic/sysinfo.c \
         generic/ipc.c \
@@ -160 +165 @@
         generic/vfs/mtab.c \
         generic/vfs/vfs.c \
+        generic/rcu.c \
         generic/setjmp.c \
         generic/stack.c \
@@ -212 +218 @@
         cp $< $@
 
+$(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
+
+$(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
+
+$(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
+        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
+
 AUTOCHECK = $(realpath $(ROOT_PATH)/tools/autocheck.awk)