Changeset a05ec66 in mainline for uspace/lib

Timestamp:

2018-05-25T15:42:06Z (7 years ago)

Author:

GitHub <noreply@…>

Branches:

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

Children:

a57fa32

Parents:

774aa332

git-author:

Jiří Zárevúcky <zarevucky.jiri@…> (2018-05-25 15:42:06)

git-committer:

GitHub <noreply@…> (2018-05-25 15:42:06)

Message:

Don't use custom ldscripts in uspace. (#38)

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.

Location:

uspace/lib

Files:

• c/Makefile (modified) (2 diffs)
• c/arch/abs32le/_link.ld.in (deleted)
• c/arch/amd64/_link.ld.in (deleted)
• c/arch/arm32/_link.ld.in (deleted)
• c/arch/ia32/_link.ld.in (deleted)
• c/arch/ia64/_link.ld.in (deleted)
• c/arch/mips32/_link.ld.in (deleted)
• c/arch/mips32eb/_link.ld.in (deleted)
• c/arch/ppc32/_link.ld.in (deleted)
• c/arch/riscv64/_link.ld.in (deleted)
• c/arch/sparc64/_link.ld.in (deleted)
• pcut/Makefile (modified) (1 diff)
• pcut/update-from-master.sh (modified) (1 diff)
• posix/Makefile (modified) (5 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
@@ -190 +182 @@
 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)
 

uspace/lib/pcut/Makefile

@@ -36 +36 @@
 
 test-libpcut-%: $(LIBRARY).a
-        $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
+        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(STARTUP_OBJECT) $^ $(LIBRARY).a $(BASE_LIBS)
 

uspace/lib/pcut/update-from-master.sh

@@ -80 +80 @@
 
 test-libpcut-%: $(LIBRARY).a
-        $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
+        $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(STARTUP_OBJECT) $^ $(LIBRARY).a $(BASE_LIBS)
 
 EOF_MAKEFILE_TAIL

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)