Changeset 584121d in mainline

Timestamp:

2017-10-27T16:51:42Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

bc6cdc4

Parents:

d4da860

Message:

Move reference to the startup object file (entry.o) out of the linker script.

The absolute path breaks reproducibility.

Location:

uspace

Files:

• Makefile.common (modified) (3 diffs)
• lib/c/arch/abs32le/_link.ld.in (modified) (1 diff)
• lib/c/arch/amd64/_link.ld.in (modified) (1 diff)
• lib/c/arch/arm32/_link.ld.in (modified) (1 diff)
• lib/c/arch/ia32/_link.ld.in (modified) (1 diff)
• lib/c/arch/ia64/_link.ld.in (modified) (1 diff)
• lib/c/arch/mips32/_link.ld.in (modified) (1 diff)
• lib/c/arch/ppc32/_link.ld.in (modified) (1 diff)
• lib/c/arch/riscv64/_link.ld.in (modified) (1 diff)
• lib/c/arch/sparc64/_link.ld.in (modified) (1 diff)

uspace/Makefile.common

@@ -110 +110 @@
 LIBSOFTINT_PREFIX = $(LIB_PREFIX)/softint
 
+STARTUP = $(LIBC_PREFIX)/arch/$(UARCH)/src/entry.o
+
 LIBMATH_PREFIX = $(LIB_PREFIX)/math
 LIBMATH_INCLUDES_FLAGS = \
@@ -301 +303 @@
 
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(STARTUP) $(OBJECTS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(BINARY)
@@ -337 +339 @@
 ifneq ($(TEST_OUTPUT),)
 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(STARTUP) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(TEST_OUTPUT)

uspace/lib/c/arch/abs32le/_link.ld.in

@@ -1 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/amd64/_link.ld.in

@@ -1 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/arm32/_link.ld.in

@@ -1 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/ia32/_link.ld.in

@@ -1 +1 @@
 #ifndef SHLIB
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 #endif

uspace/lib/c/arch/ia64/_link.ld.in

@@ -1 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/mips32/_link.ld.in

@@ -1 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/ppc32/_link.ld.in

@@ -1 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/riscv64/_link.ld.in

@@ -1 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)
 

uspace/lib/c/arch/sparc64/_link.ld.in

@@ -1 @@
-STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
 ENTRY(__entry)