Changeset c2c4127 in mainline


Ignore:
Timestamp:
2018-07-11T16:55:23Z (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:
2eadda9
Parents:
2d56e2e
git-author:
Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-10 19:09:09)
git-committer:
Jiří Zárevúcky <jiri.zarevucky@…> (2018-07-11 16:55:23)
Message:

Do not set STARTUP() in the linker script. Add the file to build script instead.

Location:
uspace
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile.common

    r2d56e2e rc2c4127  
    117117LIBPOSIX_PREFIX = $(LIB_PREFIX)/posix
    118118LIBDLTEST_PREFIX = $(LIB_PREFIX)/dltest
     119
     120START_FILES = $(LIBC_PREFIX)/arch/$(UARCH)/src/entry.o
    119121
    120122AFLAGS = --fatal-warnings
    … …  
    339341ifneq ($(filter %.cpp %.cc %.cxx, $(SOURCES)),)
    340342$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(CXX_BASE_LIBS)
    341         $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)
     343        $(CXX) $(CXXFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(CXX_BASE_LIBS)
    342344else
    343345$(BINARY): $(LINKER_SCRIPT) $(OBJECTS) $(LIBTAGS) $(BASE_LIBS)
    344         $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
     346        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(OBJECTS) $(LIBARGS) $(BASE_LIBS)
    345347endif
    346348
    … …  
    349351ifneq ($(TEST_BINARY),)
    350352$(TEST_BINARY): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBTAGS) $(BASE_LIBS)
    351         $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
     353        $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) -T $(LINKER_SCRIPT) -Wl,-Map,$@.map -o $@ $(START_FILES) $(TEST_OBJECTS) $(TEST_BINARY_LIBS) $(LIBARGS) $(BASE_LIBS)
    352354endif
    353355

  • uspace/lib/c/Makefile

    r2d56e2e rc2c4127  
    3939
    4040PRE_DEPEND =
    41 EXTRA_OUTPUT = $(LINKER_SCRIPTS)
     41EXTRA_OUTPUT = $(LINKER_SCRIPTS) $(START_FILES)
    4242EXTRA_CLEAN = $(LINKER_SCRIPTS)
    4343EXTRA_TEST_CFLAGS = -Wno-deprecated-declarations

  • uspace/lib/c/arch/abs32le/Makefile.inc

    r2d56e2e rc2c4127  
    3434        arch/$(UARCH)/src/syscall.c \
    3535        arch/$(UARCH)/src/stacktrace.c
    36 
    37 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

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

    r2d56e2e rc2c4127  
    1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    21ENTRY(_start)
    32

  • uspace/lib/c/arch/amd64/Makefile.inc

    r2d56e2e rc2c4127  
    3838ARCH_AUTOCHECK_HEADERS = \
    3939        arch/$(UARCH)/include/libarch/fibril_context.h
    40 
    41 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
    42 

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

    r2d56e2e rc2c4127  
    1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    21ENTRY(_start)
    32

  • uspace/lib/c/arch/arm32/Makefile.inc

    r2d56e2e rc2c4127  
    3737        arch/$(UARCH)/src/stacktrace.c \
    3838        arch/$(UARCH)/src/stacktrace_asm.S
    39 
    40 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o
    41 

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

    r2d56e2e rc2c4127  
    1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    21ENTRY(_start)
    32

  • uspace/lib/c/arch/ia32/Makefile.inc

    r2d56e2e rc2c4127  
    4040ARCH_AUTOCHECK_HEADERS = \
    4141        arch/$(UARCH)/include/libarch/fibril_context.h
    42 
    43 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

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

    r2d56e2e rc2c4127  
    11#ifndef SHLIB
    2 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    32ENTRY(_start)
    43#endif

  • uspace/lib/c/arch/ia64/Makefile.inc

    r2d56e2e rc2c4127  
    3939ARCH_AUTOCHECK_HEADERS = \
    4040        arch/$(UARCH)/include/libarch/fibril_context.h
    41 
    42 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

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

    r2d56e2e rc2c4127  
    1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    21ENTRY(_start)
    32

  • uspace/lib/c/arch/mips32/Makefile.inc

    r2d56e2e rc2c4127  
    3838ARCH_AUTOCHECK_HEADERS = \
    3939        arch/$(UARCH)/include/libarch/fibril_context.h
    40 
    41 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

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

    r2d56e2e rc2c4127  
    1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    21ENTRY(__start)
    32

  • uspace/lib/c/arch/mips32eb/Makefile.inc

    r2d56e2e rc2c4127  
    3838ARCH_AUTOCHECK_HEADERS = \
    3939        arch/$(UARCH)/include/libarch/fibril_context.h
    40 
    41 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

  • uspace/lib/c/arch/ppc32/Makefile.inc

    r2d56e2e rc2c4127  
    3838ARCH_AUTOCHECK_HEADERS = \
    3939        arch/$(UARCH)/include/libarch/fibril_context.h
    40 
    41 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

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

    r2d56e2e rc2c4127  
    1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    21ENTRY(_start)
    32

  • uspace/lib/c/arch/riscv64/Makefile.inc

    r2d56e2e rc2c4127  
    3737ARCH_AUTOCHECK_HEADERS = \
    3838        arch/$(UARCH)/include/libarch/fibril_context.h
    39 
    40 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

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

    r2d56e2e rc2c4127  
    1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    21ENTRY(_start)
    32

  • uspace/lib/c/arch/sparc64/Makefile.inc

    r2d56e2e rc2c4127  
    3737ARCH_AUTOCHECK_HEADERS = \
    3838        arch/$(UARCH)/include/libarch/fibril_context.h
    39 
    40 EXTRA_OUTPUT += arch/$(UARCH)/src/entry.o

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

    r2d56e2e rc2c4127  
    1 STARTUP(LIBC_PATH/arch/UARCH/src/entry.o)
    21ENTRY(_start)
    32

  • uspace/lib/pcut/Makefile

    r2d56e2e rc2c4127  
    3636
    3737test-libpcut-%: $(LIBRARY).a
    38         $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
     38        $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(START_FILES) $^ $(LIBRARY).a $(BASE_LIBS)
    3939

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

    r2d56e2e rc2c4127  
    8080
    8181test-libpcut-%: $(LIBRARY).a
    82         $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(STARTUP) $^ $(LIBRARY).a $(BASE_LIBS)
     82        $(CC) $(CFLAGS) $(LDFLAGS) -T $(LINKER_SCRIPT) -o $@ $(START_FILES) $^ $(LIBRARY).a $(BASE_LIBS)
    8383
    8484EOF_MAKEFILE_TAIL

  • uspace/lib/posix/Makefile

    r2d56e2e rc2c4127  
    3737SPECS = gcc.specs
    3838LIBC_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
    39 LIBC_STARTUP_FILE = $(shell sed -n -e 's/^.*STARTUP(\(.*\)).*$$/\1/p' $(LIBC_LINKER_SCRIPT))
     39LIBC_STARTUP_FILE = $(START_FILES)
    4040EXPORT_LINKER_SCRIPT = link.ld
    4141EXPORT_STARTUP_FILE = crt0.o
    … …  
    9494EXPORT_LDFLAGS = \
    9595        -L$$(HELENOS_EXPORT_ROOT)/lib \
    96         -T link.ld
     96        -T link.ld \
     97        $(EXPORT_STARTUP_FILE)
    9798
    9899EXPORT_LDLIBS = \
    … …  
    116117
    117118$(EXPORT_LINKER_SCRIPT): $(LIBC_LINKER_SCRIPT)
    118         sed 's/STARTUP(.*)/STARTUP(crt0.o)/' $< > $@
     119        cp $< $@
    119120
    120121$(EXPORT_STARTUP_FILE): $(LIBC_STARTUP_FILE)
Note: See TracChangeset for help on using the changeset viewer.