Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 3e30c0b in mainline


Ignore:
Timestamp:
2010-01-17T11:02:13Z (10 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
master
Children:
3c081d0e
Parents:
cec261e (diff), 8416d46 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge fix for loader not using the correct linker script.

Location:
uspace/srv
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/Makefile.common

    rcec261e r3e30c0b  
    5050SOFTINT_PREFIX = $(USPACE_PREFIX)/lib/softint
    5151
     52LINK_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
     53
    5254JOB = $(OUTPUT).job
    5355
     
    6769    $(LIBS) \
    6870    \
    69     $(OUTPUT) $(OUTPUT).disasm
     71    $(OUTPUT) $(OUTPUT).disasm \
     72    $(EXTRA_OUTPUT)
    7073        -[ -f $(DEPEND) ] && mv -f $(DEPEND) $(DEPEND_PREV)
    7174
    7275clean:
    73         rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm
     76        rm -f $(DEPEND) $(DEPEND_PREV) $(JOB) $(OUTPUT) $(OUTPUT).map $(OUTPUT).disasm $(EXTRA_OUTPUT)
    7477        find . -name '*.o' -follow -exec rm \{\} \;
    7578
     
    8285
    8386$(OUTPUT): $(OBJECTS) $(LIBS)
    84         $(LD) -T $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
     87        $(LD) -T $(LINK_SCRIPT) $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
    8588
    8689%.o: %.c $(DEPEND)
  • uspace/srv/loader/Makefile

    rcec261e r3e30c0b  
    3434LIBS = $(LIBC_PREFIX)/libc.a
    3535EXTRA_CFLAGS += -Iinclude
     36LINK_SCRIPT = arch/$(UARCH)/_link.ld
    3637
    3738OUTPUT = loader
     39EXTRA_OUTPUT = $(LINK_SCRIPT)
    3840
    3941GENERIC_SOURCES = \
     
    4648
    4749include ../Makefile.common
     50
     51$(LINK_SCRIPT): $(LINK_SCRIPT).in
     52        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
Note: See TracChangeset for help on using the changeset viewer.