Changeset 82d9087 in mainline for uspace/lib


Ignore:
Timestamp:
2018-08-01T20:20:52Z (8 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:
3b10ae36
Parents:
f787c8e
git-author:
Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-01 20:20:43)
git-committer:
Jiří Zárevúcky <jiri.zarevucky@…> (2018-08-01 20:20:52)
Message:

Use default linker scripts (as provided by the linker) in uspace.

There have been some issues before, but they appear to have been resolved
since then.

Location:
uspace/lib
Files:
10 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/c/Makefile

    rf787c8e r82d9087  
    3333CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config
    3434
    35 LINKER_SCRIPTS = \
    36         $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld \
    37         $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld \
    38         $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld
    39 
    40 PRE_DEPEND =
    41 EXTRA_OUTPUT = $(LINKER_SCRIPTS) $(START_FILES)
    42 EXTRA_CLEAN = $(LINKER_SCRIPTS)
     35EXTRA_OUTPUT = $(START_FILES)
    4336EXTRA_TEST_CFLAGS = -Wno-deprecated-declarations
    4437LIBRARY = libc
    … …  
    219212        cp $< $@
    220213
    221 $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    222         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -E -x c $< | grep -v "^\#" > $@
    223 
    224 $(LIBC_PREFIX)/arch/$(UARCH)/_link-shlib.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    225         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DSHLIB -E -x c $< | grep -v "^\#" > $@
    226 
    227 $(LIBC_PREFIX)/arch/$(UARCH)/_link-dlexe.ld: $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld.in
    228         $(CC) $(DEFS) $(CFLAGS) -DLIBC_PATH=$(CURDIR) -DDLEXE -E -x c $< | grep -v "^\#" > $@
    229 
    230214AUTOCHECK = $(realpath $(ROOT_PATH)/tools/autocheck.awk)
    231215

  • uspace/lib/pcut/Makefile

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

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

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

  • uspace/lib/posix/Makefile

    rf787c8e r82d9087  
    3636
    3737SPECS = gcc.specs
    38 LIBC_LINKER_SCRIPT = $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
    39 EXPORT_LINKER_SCRIPT = link.ld
    4038
    4139EXPORT_FILES = \
    … …  
    4846        $(LIBC_PREFIX)/crt1.o \
    4947        $(LIBRARY).a \
    50         $(EXPORT_LINKER_SCRIPT) \
    5148        $(SPECS)
    5249
    … …  
    5451EXTRA_CLEAN = $(INCLUDE_LIBC)
    5552
    56 EXTRA_OUTPUT = $(SPECS) $(EXPORT_LINKER_SCRIPT) $(EXPORT_STARTUP_FILE)
     53EXTRA_OUTPUT = $(SPECS)
    5754
    5855SOURCES = \
    … …  
    9289EXPORT_LDFLAGS = \
    9390        -L$$(HELENOS_EXPORT_ROOT)/lib \
    94         -T link.ld \
    9591        $$(HELENOS_EXPORT_ROOT)/lib/crt0.o \
    9692        $$(HELENOS_EXPORT_ROOT)/lib/crt1.o
    … …  
    114110        echo '$(EXPORT_LDLIBS)' >> $@.new
    115111        mv $@.new $@
    116 
    117 $(EXPORT_LINKER_SCRIPT): $(LIBC_LINKER_SCRIPT)
    118         cp $< $@
    119 
    120 $(EXPORT_STARTUP_FILE): $(LIBC_STARTUP_FILE)
    121         cp $< $@
    122112
    123113$(INCLUDE_LIBC): $(shell find ../c/include -name '*.h')
Note: See TracChangeset for help on using the changeset viewer.