Changeset d92060f in mainline for uspace/lib/posix/Makefile

Timestamp:

2018-05-02T16:31:14Z (7 years ago)

Author:

Jiří Zárevúcky <jiri.zarevucky@…>

Children:

cbc02a77

Parents:

924786bf

git-author:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-02 16:05:44)

git-committer:

Jiří Zárevúcky <jiri.zarevucky@…> (2018-05-02 16:31:14)

Message:

Don't use custom ldscripts in uspace.

Even with the *-linux-gnu targets, there is practically nothing Linux-specific
in the linker itself. We get a few GNU program headers this way, but those
can be safely ignored.

File:

• uspace/lib/posix/Makefile (modified) (5 diffs)

uspace/lib/posix/Makefile

@@ -36 +36 @@
 
 SPECS = gcc.specs
-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
+LIBC_STARTUP_FILE = $(STARTUP_OBJECT)
 EXPORT_STARTUP_FILE = crt0.o
 
@@ -49 +47 @@
         $(LIBRARY).a \
         $(EXPORT_STARTUP_FILE) \
-        $(EXPORT_LINKER_SCRIPT) \
         $(SPECS)
 
@@ -55 +52 @@
 EXTRA_CLEAN = $(INCLUDE_LIBC)
 
-EXTRA_OUTPUT = $(SPECS) $(EXPORT_LINKER_SCRIPT) $(EXPORT_STARTUP_FILE)
+EXTRA_OUTPUT = $(SPECS) $(EXPORT_STARTUP_FILE)
 
 SOURCES = \
@@ -90 +87 @@
 
 EXPORT_LDFLAGS = \
-        -L$$(HELENOS_EXPORT_ROOT)/lib \
-        -T link.ld
+        -L$$(HELENOS_EXPORT_ROOT)/lib
 
 EXPORT_LDLIBS = \
@@ -111 +107 @@
         echo '$(EXPORT_LDLIBS)' >> $@.new
         mv $@.new $@
-
-$(EXPORT_LINKER_SCRIPT): $(LIBC_LINKER_SCRIPT)
-        sed 's/STARTUP(.*)/STARTUP(crt0.o)/' $< > $@
 
 $(EXPORT_STARTUP_FILE): $(LIBC_STARTUP_FILE)