Changeset f3fdecc in mainline for uspace/lib/c/Makefile

Timestamp:

2018-05-03T05:37:08Z (7 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

2f72560a

Parents:

349e04ac

Message:

Revert "Don't use custom ldscripts in uspace."

This reverts commit 66262a1bc2d53e61780c5f98a184a3b48b3de53f.

More work is needed on ia64.

File:

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

uspace/lib/c/Makefile

@@ -33 +33 @@
 CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
+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)
+EXTRA_CLEAN = $(LINKER_SCRIPTS)
 LIBRARY = libc
 SOVERSION = 0.0
@@ -182 +190 @@
 include $(USPACE_PREFIX)/Makefile.common
 
+$(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)