Changeset f3fdecc in mainline for uspace/lib/posix/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/posix/Makefile (modified) (5 diffs)

uspace/lib/posix/Makefile

@@ -36 +36 @@
 
 SPECS = gcc.specs
-LIBC_STARTUP_FILE = $(STARTUP_OBJECT)
+LIBC_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+LIBC_STARTUP_FILE = $(shell sed -n -e 's/^.*STARTUP(\(.*\)).*$$/\1/p' $(LIBC_LINKER_SCRIPT))
+EXPORT_LINKER_SCRIPT = link.ld
 EXPORT_STARTUP_FILE = crt0.o
 
@@ -47 +49 @@
         $(LIBRARY).a \
         $(EXPORT_STARTUP_FILE) \
+        $(EXPORT_LINKER_SCRIPT) \
         $(SPECS)
 
@@ -52 +55 @@
 EXTRA_CLEAN = $(INCLUDE_LIBC)
 
-EXTRA_OUTPUT = $(SPECS) $(EXPORT_STARTUP_FILE)
+EXTRA_OUTPUT = $(SPECS) $(EXPORT_LINKER_SCRIPT) $(EXPORT_STARTUP_FILE)
 
 SOURCES = \
@@ -87 +90 @@
 
 EXPORT_LDFLAGS = \
-        -L$$(HELENOS_EXPORT_ROOT)/lib
+        -L$$(HELENOS_EXPORT_ROOT)/lib \
+        -T link.ld
 
 EXPORT_LDLIBS = \
@@ -107 +111 @@
         echo '$(EXPORT_LDLIBS)' >> $@.new
         mv $@.new $@
+
+$(EXPORT_LINKER_SCRIPT): $(LIBC_LINKER_SCRIPT)
+        sed 's/STARTUP(.*)/STARTUP(crt0.o)/' $< > $@
 
 $(EXPORT_STARTUP_FILE): $(LIBC_STARTUP_FILE)