Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 3101 → Rev 3102

/branches/dynload/uspace/app/iloader/Makefile
38,7 → 38,7
include $(LIBC_PREFIX)/Makefile.toolchain
include arch/$(ARCH)/Makefile.inc
 
CFLAGS += -Iinclude -D__32_BITS__
CFLAGS += -Iinclude
 
LIBS = $(LIBC_PREFIX)/libc.a $(SOFTINT_PREFIX)/libsoftint.a
DEFS += -DRELEASE=\"$(RELEASE)\"
78,8 → 78,7
$(CC) $(DEFS) $(CFLAGS) -M $(SOURCES) > Makefile.depend
 
$(OUTPUT): $(OBJECTS) $(LIBS) arch/$(ARCH)/_link.ld
# $(LD) -T $(LIBC_PREFIX)/arch/$(ARCH)/_link.ld $(OBJECTS) $(LIBS) $(LFLAGS) -o $@ -Map $(OUTPUT).map
$(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
$(LD) -T arch/$(ARCH)/_link.ld $(LFLAGS) $(OBJECTS) $(LIBS) -o $@ -Map $(OUTPUT).map
 
disasm:
$(OBJDUMP) -d $(OUTPUT) >$(OUTPUT).disasm
/branches/dynload/uspace/app/iloader/arch/arm32/_link.ld.in
6,11 → 6,16
ENTRY(__entry)
 
PHDRS {
interp PT_INTERP;
text PT_LOAD FLAGS(5);
data PT_LOAD FLAGS(6);
}
 
SECTIONS {
.interp : {
*(.interp);
} : interp
 
. = 0x70001000;
 
.init ALIGN(0x1000): SUBALIGN(0x1000) {
/branches/dynload/uspace/app/iloader/arch/ppc32/_link.ld.in
6,11 → 6,16
ENTRY(__entry)
 
PHDRS {
interp PT_INTERP;
text PT_LOAD FLAGS(5);
data PT_LOAD FLAGS(6);
}
 
SECTIONS {
.interp : {
*(.interp);
} :interp
 
. = 0x70001000;
 
.init ALIGN(0x1000) : SUBALIGN(0x1000) {
/branches/dynload/uspace/app/iloader/arch/amd64/_link.ld.in
6,11 → 6,16
ENTRY(__entry)
 
PHDRS {
interp PT_INTERP;
text PT_LOAD FLAGS(5);
data PT_LOAD FLAGS(6);
}
 
SECTIONS {
.interp : {
*(.interp);
} : interp
 
/* . = 0x0000700000001000;*/
. = 0x70001000;
/branches/dynload/uspace/app/iloader/arch/mips32/_link.ld.in
6,11 → 6,16
ENTRY(__entry)
 
PHDRS {
interp PT_INTERP;
text PT_LOAD FLAGS(5);
data PT_LOAD FLAGS(6);
}
 
SECTIONS {
.interp : {
*(.interp);
} :interp
 
. = 0x70004000;
.init ALIGN(0x4000) : SUBALIGN(0x4000) {
/branches/dynload/uspace/app/iloader/arch/ia32/_link.ld.in
14,7 → 14,7
SECTIONS {
.interp : {
*(.interp);
} : interp
} :interp
 
. = 0x70001000;
 
/branches/dynload/uspace/app/iramfs/main.c
86,9 → 86,9
usleep(1000 * 1000);
} while (1);
 
if (write_file(rtld, rtld_size, rtld_filename) < 0) return 1;
if (write_file(dltest, dltest_size, dltest_filename) < 0) return 1;
if (write_file(libc, libc_size, libc_filename) < 0) return 1;
// if (write_file(rtld, rtld_size, rtld_filename) < 0) return 1;
// if (write_file(dltest, dltest_size, dltest_filename) < 0) return 1;
// if (write_file(libc, libc_size, libc_filename) < 0) return 1;
if (write_file(tetris, tetris_size, tetris_filename) < 0) return 1;
 
printf("done\n");
/branches/dynload/uspace/app/iramfs/Makefile
87,8 → 87,11
%.o: %.c
$(CC) $(DEFS) $(CFLAGS) -c $< -o $@
 
data.c: ../../lib/rtld/rtld.so ../dltest/dltest ../../lib/libc-shared/libc.so.0 ../tetris/tetris
../../../tools/bin2c.py ../../lib/rtld/rtld.so rtld.so rtld >$@
../../../tools/bin2c.py ../dltest/dltest dltest dltest >>$@
../../../tools/bin2c.py ../../lib/libc-shared/libc.so.0 libc.so.0 libc >>$@
../../../tools/bin2c.py ../tetris/tetris tetris tetris >>$@
#data.c: ../../lib/rtld/rtld.so ../dltest/dltest ../../lib/libc-shared/libc.so.0 ../tetris/tetris
# ../../../tools/bin2c.py ../../lib/rtld/rtld.so rtld.so rtld >$@
# ../../../tools/bin2c.py ../dltest/dltest dltest dltest >>$@
# ../../../tools/bin2c.py ../../lib/libc-shared/libc.so.0 libc.so.0 libc >>$@
# ../../../tools/bin2c.py ../tetris/tetris tetris tetris >>$@
 
data.c: ../tetris/tetris
../../../tools/bin2c.py ../tetris/tetris tetris tetris >$@
/branches/dynload/uspace/lib/libc/generic/task.c
34,6 → 34,7
 
#include <task.h>
#include <ipc/ipc.h>
#include <libc.h>
#include <async.h>
#include <errno.h>
 
/branches/dynload/uspace/Makefile
37,9 → 37,6
lib/softint \
lib/softfloat \
app/iloader \
lib/rtld \
lib/libc-shared \
lib/libtest \
srv/ns \
srv/fb \
srv/kbd \
51,7 → 48,6
srv/devmap \
app/tetris \
app/tester \
app/dltest \
app/iramfs \
app/cli \
app/klog \
/branches/dynload/boot/arch/arm32/loader/Makefile
84,12 → 84,12
$(USPACEDIR)/srv/fb/fb \
$(USPACEDIR)/srv/vfs/vfs \
$(USPACEDIR)/srv/fs/tmpfs/tmpfs \
$(USPACEDIR)/srv/fs/fat/fat \
$(USPACEDIR)/srv/devmap/devmap \
$(USPACEDIR)/app/init/init \
$(USPACEDIR)/app/tester/tester \
$(USPACEDIR)/app/klog/klog \
$(USPACEDIR)/app/tetris/tetris
$(USPACEDIR)/app/iramfs/iramfs \
$(USPACEDIR)/app/iloader/iloader \
$(USPACEDIR)/app/cli/cli
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
/branches/dynload/boot/arch/ppc32/loader/Makefile
89,7 → 89,8
$(USPACEDIR)/app/init/init \
$(USPACEDIR)/app/klog/klog \
$(USPACEDIR)/app/iramfs/iramfs \
$(USPACEDIR)/app/iloader/iloader
$(USPACEDIR)/app/iloader/iloader \
$(USPACEDIR)/app/cli/cli
 
OBJECTS := $(addsuffix .o,$(basename $(SOURCES)))
COMPONENT_OBJECTS := $(addsuffix .o,$(basename $(notdir $(COMPONENTS))))
/branches/dynload/boot/arch/amd64/grub/menu.lst
5,15 → 5,18
root (cd)
kernel /boot/kernel.bin
module /boot/ns
module /boot/init
# module /boot/init
module /boot/pci
module /boot/fb
module /boot/kbd
module /boot/console
module /boot/tetris
module /boot/tester
# module /boot/tetris
# module /boot/tester
module /boot/klog
module /boot/tmpfs
module /boot/fat
# module /boot/fat
module /boot/vfs
module /boot/devmap
module /boot/iramfs
module /boot/iloader
module /boot/cli
/branches/dynload/boot/arch/amd64/Makefile.inc
39,7 → 39,10
$(USPACEDIR)/app/init/init \
$(USPACEDIR)/app/tetris/tetris \
$(USPACEDIR)/app/tester/tester \
$(USPACEDIR)/app/klog/klog
$(USPACEDIR)/app/klog/klog \
$(USPACEDIR)/app/iramfs/iramfs \
$(USPACEDIR)/app/iloader/iloader \
$(USPACEDIR)/app/cli/cli
 
build: $(BASE)/image.iso