Changeset fc0b2a8 in mainline

Timestamp:

2018-05-29T21:14:40Z (7 years ago)

Author:

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

Branches:

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

Children:

fda19b8

Parents:

ed88c8e

Message:

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

This reverts commit a05ec6671002c451fceb01aa0ab3f71f004efb6d.

Needs more work.

Location:

uspace

Files:

• Makefile.common (modified) (5 diffs)
• lib/c/Makefile (modified) (2 diffs)
• lib/c/arch/abs32le/_link.ld.in (added)
• lib/c/arch/amd64/_link.ld.in (added)
• lib/c/arch/arm32/_link.ld.in (added)
• lib/c/arch/ia32/_link.ld.in (added)
• lib/c/arch/ia64/_link.ld.in (added)
• lib/c/arch/mips32/_link.ld.in (added)
• lib/c/arch/mips32eb/_link.ld.in (added)
• lib/c/arch/ppc32/_link.ld.in (added)
• lib/c/arch/riscv64/_link.ld.in (added)
• lib/c/arch/sparc64/_link.ld.in (added)
• lib/pcut/Makefile (modified) (1 diff)
• lib/pcut/update-from-master.sh (modified) (1 diff)
• lib/posix/Makefile (modified) (5 diffs)
• srv/loader/Makefile (modified) (1 diff)
• srv/loader/elf64_ia64_loader.x (deleted)

uspace/Makefile.common

@@ -35 +35 @@
 #   DEFS               compiler defines
 #   EXTRA_CFLAGS       additional flags to pass to C compiler
+#   LINKER_SCRIPT      linker script
 #   PRE_DEPEND         targets required for dependency check
 #
@@ -112 +113 @@
 LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
 LIBDLTEST_PREFIX = $(LIB_PREFIX)/dltest
-
-STARTUP_OBJECT = $(LIBC_PREFIX)/arch/$(UARCH)/src/entry.o
 
 AFLAGS = --fatal-warnings
@@ -141 +140 @@
 BASE_LIBS += $(LIBSOFTFLOAT_PREFIX)/libsoftfloat.a $(LIBSOFTINT_PREFIX)/libsoftint.a
 
-ifneq ($(LINK_DYNAMIC),y)
+ifeq ($(LINK_DYNAMIC),y)
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
+else
         LDFLAGS += -static
-endif
+        LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
+endif
+
+LIB_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld
 
 INCLUDES_FLAGS = $(LIBC_INCLUDES_FLAGS)
@@ -297 +301 @@
 
 ifneq ($(BINARY),)
-$(BINARY): $(OBJECTS) $(LIBTAGS) $(BASE_LIBS)
-        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -Wl,-Map,$@.map -o $@ $(STARTUP_OBJECT) $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
+$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(BASE_LIBS)
+        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
 endif
 
 ifneq ($(TEST_BINARY),)
-$(TEST_BINARY): $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS) $(BASE_LIBS)
-        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -Wl,-Map,$@.map -o $@ $(STARTUP_OBJECT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
+$(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS) $(BASE_LIBS)
+        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
 endif
 
@@ -319 +323 @@
         $(AR) rc $@ $(LOBJECTS)
 
-$(SLIBRARY): $(LIBRARY).la
-        $(CC) $(CFLAGS) $(LIB_LDFLAGS) $(EXTRA_LDFLAGS) -Wl,-Map,$@.map -o $@ -Wl,--whole-archive $(LIBRARY).la -Wl,--no-whole-archive
+$(SLIBRARY): $(LIB_LINKER_SCRIPT) $(LIBRARY).la
+        $(CC) $(CFLAGS) $(LIB_LDFLAGS) $(EXTRA_LDFLAGS) -T $(LIB_LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ -Wl,--whole-archive $(LIBRARY).la -Wl,--no-whole-archive
 
 $(LSONAME):

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)
 

uspace/lib/pcut/Makefile

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

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

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

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)

uspace/srv/loader/Makefile

@@ -29 +29 @@
 
 USPACE_PREFIX = ../..
-ROOT_PATH = $(USPACE_PREFIX)/..
-CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
 
-include $(CONFIG_MAKEFILE)
-
-ifeq ($(UARCH),ia64)
-        # IA64 has a peculiar linker script with a fixed data segment address.
-        # Because the loader is a separate nonrelocatable binary in the same
-        # address space as the application, we provide a modified copy of
-        # the default linker script to work around that.
-        EXTRA_LDFLAGS = -T elf64_ia64_loader.x
-else
-        # On all other architectures, we can simply move the text segment.
-        EXTRA_LDFLAGS = -Wl,-Ttext-segment=0x70000000
-endif
+EXTRA_LDFLAGS = -Wl,-Ttext-segment=0x70000000
 
 BINARY = loader