Changeset 1d465bf in mainline


Ignore:
Timestamp:
2011-04-03T15:34:24Z (13 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
3a3d4ca
Parents:
ec3e2ed
Message:

Fix passing of PCB pointer from dload. Build dltest (dynamically linked). Some issues with libtest remain.

Files:
1 added
9 edited

Legend:

Unmodified
Added
Removed

  • boot/Makefile.common

    rec3e2ed r1d465bf  
    123123ifeq ($(CONFIG_BUILD_SHARED_LIBS), y)
    124124        RD_LIBS += $(USPACE_PATH)/lib/c/libc.so.0
     125        RD_LIBS += $(USPACE_PATH)/lib/softint/libsoftint.so.0
    125126        RD_APPS += $(USPACE_PATH)/app/dltest/dltest
    126127endif
    … …  
    132133
    133134RD_APPS_NON_ESSENTIAL = \
     135        $(USPACE_PATH)/app/dltest/dltest \
    134136        $(USPACE_PATH)/app/dltest2/dltest2 \
    135137        $(USPACE_PATH)/app/dload/dload \

  • uspace/Makefile.common

    rec3e2ed r1d465bf  
    7676        LARCHIVE = $(LIBRARY).la
    7777        LOUTPUT = $(SLIBRARY)
    78         EXTRA_CLEAN += $(LOUTPUT).map $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
     78        EXTRA_OUTPUT += $(LOUTPUT).disasm
     79        EXTRA_CLEAN += $(LOUTPUT).map $(LOUTPUT).ldisasm \
     80            $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
    7981endif
    8082
    … …  
    9698LIBNET_PREFIX = $(LIB_PREFIX)/net
    9799
     100ifeq ($(DYNAMIC_LINKING),y)
     101BASE_LIBS = $(LIBC_PREFIX)/libc.so.0 $(LIBSOFTINT_PREFIX)/libsoftint.a
     102LFLAGS = -Bdynamic
     103LINKER_SCRIPT ?= $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld
     104else
    98105BASE_LIBS = $(LIBC_PREFIX)/libc.a $(LIBSOFTINT_PREFIX)/libsoftint.a
    99 
    100106LINKER_SCRIPT ?= $(LIBC_PREFIX)/arch/$(UARCH)/_link.ld
     107endif
    101108
    102109ifeq ($(CONFIG_OPTIMIZE_FOR_SIZE),y)
    … …  
    202209endif
    203210
     211ifneq ($(SLIBRARY),)
     212%.disasm: $(LOUTPUT)
     213ifeq ($(CONFIG_LINE_DEBUG),y)
     214        $(OBJDUMP) -d -S $< > $@
     215else
     216        $(OBJDUMP) -d $< > $@
     217endif
     218
    204219$(LOUTPUT): $(LARCHIVE) $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld
    205220        $(LD) -T $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld $(LIB_LFLAGS) $(LARCHIVE) -o $@ -Map $(LOUTPUT).map
     221endif
    206222
    207223$(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld: $(LIBC_PREFIX)/shared/arch/$(UARCH)/_lib.ld.in
     224        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
     225
     226$(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld: $(LIBC_PREFIX)/shared/arch/$(UARCH)/_link.ld.in
    208227        $(CC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@
    209228

  • uspace/app/dload/Makefile

    rec3e2ed r1d465bf  
    3030LIBS =
    3131EXTRA_CFLAGS = -I../../srv/loader/include -I../../lib/c/rtld/include -Iinclude
     32LINKER_SCRIPT = arch/$(UARCH)/_link.ld
     33EXTRA_CLEAN = $(LINKER_SCRIPT)
    3234BINARY = dload
    3335
    … …  
    4042
    4143include $(USPACE_PREFIX)/Makefile.common
     44
     45$(LINKER_SCRIPT): $(LINKER_SCRIPT).in
     46        $(GCC) $(DEFS) $(CFLAGS) -DLIBC_PREFIX=$(LIBC_PREFIX) -E -x c $< | grep -v "^\#" > $@

  • uspace/app/dload/arch/ia32/start.c

    rec3e2ed r1d465bf  
    4141{
    4242        asm (
    43                 "mov %%eax, %%ebx\n"
     43                "mov %%eax, %%edi\n"
    4444                "jmp *%0\n"
    4545                :: "m" (entry), "a" (pcb)

  • uspace/app/dltest/Makefile

    rec3e2ed r1d465bf  
    2929USPACE_PREFIX = ../..
    3030BINARY = dltest
     31DYNAMIC_LINKING = y
    3132
    3233SOURCES = \

  • uspace/lib/c/Makefile

    rec3e2ed r1d465bf  
    152152$(COMMON_HEADER_ARCH): $(COMMON_HEADER)
    153153        ln -sfn ../../../$< $@
     154
     155test:
     156        echo uspace_prefix=$(USPACE_PREFIX)
     157        echo libc_prefix=$(LIBC_PREFIX)
     158        echo linker_script=$(LINKER_SCRIPT)

  • uspace/lib/c/arch/ia32/src/syscall.S

    rec3e2ed r1d465bf  
    3232__syscall_fast_func:
    3333        .long __syscall_slow
     34        .size __syscall_fast_func, . - __syscall_fast_func
    3435
    3536.text

  • uspace/lib/softint/Makefile

    rec3e2ed r1d465bf  
    3131EXTRA_CFLAGS = -Iinclude
    3232LIBRARY = libsoftint
     33SLIBRARY = libsoftint.so.0.0
     34LSONAME = libsoftint.so.0
    3335
    3436SOURCES = \

  • uspace/lib/test/libtest.c

    rec3e2ed r1d465bf  
    3535 */
    3636
    37 //#include <stdio.h>
     37#include <stdio.h>
    3838#include "libtest.h"
    3939
    … …  
    5656int test_fun2(void)
    5757{
    58         return number;
     58        return 42;
     59//      return number;
    5960}
    6061
    … …  
    6566//      return 42;
    6667//      while(1);
    67         return test_fun2();
     68//      return test_fun2();
     69        printf("Hello from libtest/test_func()!\n");
     70        return 42;
    6871}
    6972
Note: See TracChangeset for help on using the changeset viewer.