Changeset fcd7053 in mainline for uspace/srv/loader


Ignore:
Timestamp:
2009-02-12T20:11:25Z (16 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
fa024ce
Parents:
84266669
Message:

cleanup configuration
code cleanup

Location:
uspace/srv/loader
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/loader/Makefile

    r84266669 rfcd7053  
    2828#
    2929
    30 -include ../../../Makefile.config
    31 
    3230## Setup toolchain
    3331#
    … …  
    3533LIBC_PREFIX = ../../lib/libc
    3634SOFTINT_PREFIX = ../../lib/softint
     35
    3736include $(LIBC_PREFIX)/Makefile.toolchain
    38 include arch/$(ARCH)/Makefile.inc
     37include arch/$(UARCH)/Makefile.inc
    3938
    4039CFLAGS += -Iinclude
    4140
    4241LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
    43 DEFS += -DRELEASE=\"$(RELEASE)\"
    44 
    45 ifdef REVISION
    46         DEFS += "-DREVISION=\"$(REVISION)\""
    47 endif
    48 
    49 ifdef TIMESTAMP
    50         DEFS += "-DTIMESTAMP=\"$(TIMESTAMP)\""
    51 endif
    5242
    5343## Sources
    … …  
    7060
    7161clean:
    72         -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(ARCH)/_link.ld Makefile.depend
     62        -rm -f $(OUTPUT) $(OBJECTS) $(OUTPUT).map $(OUTPUT).disasm arch/$(UARCH)/_link.ld Makefile.depend
    7363
    7464depend:
    7565        $(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
    7666
    77 $(OUTPUT): $(OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
    78         $(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
     67$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(UARCH)/_link.ld
     68        $(LD) -T arch/$(UARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
    7969
    8070disasm:
    8171        $(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
    8272
    83 arch/$(ARCH)/_link.ld: arch/$(ARCH)/_link.ld.in
     73arch/$(UARCH)/_link.ld: arch/$(UARCH)/_link.ld.in
    8474        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
    8575

  • uspace/srv/loader/arch/amd64/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__64_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/amd64.s
     30ARCH_SOURCES := arch/$(UARCH)/amd64.s

  • uspace/srv/loader/arch/amd64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/srv/loader/arch/arm32/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__32_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/arm32.s
     30ARCH_SOURCES := arch/$(UARCH)/arm32.s

  • uspace/srv/loader/arch/arm32/_link.ld.in

    r84266669 rfcd7053  
    1 /* 
     1/*
    22 * The only difference from _link.ld.in for regular statically-linked apps
    33 * is the base address.
    44 */
    5 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     5STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    66ENTRY(__entry)
    77

  • uspace/srv/loader/arch/ia32/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__32_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/ia32.s
     30ARCH_SOURCES := arch/$(UARCH)/ia32.s

  • uspace/srv/loader/arch/ia32/_link.ld.in

    r84266669 rfcd7053  
    1 /* 
     1/*
    22 * The difference from _link.ld.in for regular statically-linked apps
    33 * is the base address and the special interp section.
    44 */
    5 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     5STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    66ENTRY(__entry)
    77

  • uspace/srv/loader/arch/ia64/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__64_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/ia64.s
     30ARCH_SOURCES := arch/$(UARCH)/ia64.s
    3131AFLAGS += -xexplicit

  • uspace/srv/loader/arch/ia64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33

  • uspace/srv/loader/arch/mips32/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__32_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/mips32.s
     30ARCH_SOURCES := arch/$(UARCH)/mips32.s

  • uspace/srv/loader/arch/mips32/_link.ld.in

    r84266669 rfcd7053  
    1 /* 
     1/*
    22 * The only difference from _link.ld.in for regular statically-linked apps
    33 * is the base address.
    44 */
    5 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     5STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    66ENTRY(__entry)
    77

  • uspace/srv/loader/arch/ppc32/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__32_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/ppc32.s
     30ARCH_SOURCES := arch/$(UARCH)/ppc32.s

  • uspace/srv/loader/arch/ppc32/_link.ld.in

    r84266669 rfcd7053  
    1 /* 
     1/*
    22 * The only difference from _link.ld.in for regular statically-linked apps
    33 * is the base address.
    44 */
    5 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     5STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    66ENTRY(__entry)
    77

  • uspace/srv/loader/arch/sparc64/Makefile.inc

    r84266669 rfcd7053  
    2828
    2929CFLAGS += -D__64_BITS__
    30 ARCH_SOURCES := arch/$(ARCH)/sparc64.s
     30ARCH_SOURCES := arch/$(UARCH)/sparc64.s

  • uspace/srv/loader/arch/sparc64/_link.ld.in

    r84266669 rfcd7053  
    1 STARTUP(LIBC_PREFIX/arch/ARCH/src/entry.o)
     1STARTUP(LIBC_PREFIX/arch/UARCH/src/entry.o)
    22ENTRY(__entry)
    33
Note: See TracChangeset for help on using the changeset viewer.