Changeset eca820c in mainline

Timestamp:

2017-10-28T17:36:13Z (7 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

f834dd81

Parents:

c1f68b0

Message:

Revert change to the way startup file is referenced.

The path is not actually referenced in the output object itself.
It is only visible in the map generated by the linker, which
does not matter for reproducibility. Also, it would be infeasible
to provide reproducible map files with a proper HelenOS-targeted
toolchain. Coastline breakage begone!

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 = \
@@ -304 +302 @@
 
 $(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBS) $(BASE_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(STARTUP) $(OBJECTS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(BINARY).map -o $(BINARY) $(OBJECTS) $(LIBS) $(BASE_LIBS)
 ifeq ($(CONFIG_STRIP_BINARIES),y)
         $(STRIP) $(BINARY)
@@ -340 +338 @@
 ifneq ($(TEST_OUTPUT),)
 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS)
-        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(STARTUP) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS)
+        $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(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)