Ignore:
Timestamp:
May 16, 2018, 8:31:35 PM (4 years ago)
Author:
satin@…
Message:

add newlib,libalmos-mkh, restructure shared_syscalls.h and mini-libc

Location:
trunk/libs/mini-libpthread
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/libs/mini-libpthread/Makefile

    r440 r444  
    99
    1010SRCS = pthread.c
    11 OBJS = $(addprefix build/, $(SRCS:.c=.o)) \
    12        $(HAL_ARCH)/build/core/hal_user.o
    13 OBJS_LIBC = ../mini-libc/build/malloc.o ../mini-libc/build/stdlib.o ../mini-libc/build/stdio.o
     11OBJS = $(addprefix build/, $(SRCS:.c=.o))
     12#       $(HAL_ARCH)/build/core/hal_user.o
    1413
    15 INCLUDES = -I. -I$(KERNEL)/syscalls -I$(HAL)/generic -I../mini-libc
     14INCLUDES = -I. -I$(HAL)/generic -I$(LIBC_INCLUDE) -I$(LIBALMOSMKH_INCLUDE) -I$(SHARED_INCLUDE)
    1615
    17 libs : build/lib/libpthread.a
     16libs : build/lib/libpthread.a headers
    1817
    1918build :
     
    3231        $(DU) -D $@ > $@.txt
    3332
     33headers: build
     34        cp $(SRCS:.c=.h) build/include/.
     35
     36
    3437build/lib/libpthread.a: build $(OBJS)
    35         $(AR) rc $@ $(OBJS) $(OBJS_LIBC)
     38        $(AR) rc $@ $(OBJS) #$(OBJS_LIBC)
    3639        $(RANLIB) $@
    37         cp $(SRCS:.c=.h) $(HAL)/generic/hal_user.h $(KERNEL)/syscalls/shared_syscalls.h build/include/.
    3840
    39 .PHONY = build clean
     41.PHONY = build clean headers
    4042
    4143
    4244clean:
    43         rm -f build/*.o build/*.txt build/include/* build/lib/*
     45        rm -rf build/
  • trunk/libs/mini-libpthread/pthread.c

    r440 r444  
    2222 */
    2323
    24 #include <shared_syscalls.h>
    2524#include <hal_user.h>
    2625#include <stdio.h>
    2726#include <stdlib.h>
    28 #include <malloc.h>
    2927#include <pthread.h>
     28#include <assert.h>
     29#include <almos-mkh.h>
     30#include <syscalls_numbers.h>
    3031
    3132#define PTHREAD_MUTEX_DEBUG     0
  • trunk/libs/mini-libpthread/pthread.h

    r439 r444  
    2525#define _PTHREAD_H_
    2626
    27 #include <shared_syscalls.h>
     27#include <almos-mkh/pthread.h>
     28
    2829
    2930//////////////////////////////////////////////////////////////////////////////////////////////
     
    7778int pthread_exit( void * exit_value );
    7879
     80
     81
     82// TODO n'existe pas dans pthread
    7983/*********************************************************************************************
    8084 * This function calls the scheduler for the core running the calling thread.
     
    247251
    248252
    249 #endif  // _STDIO_H_
     253#endif  // _PTHREAD_H_
Note: See TracChangeset for help on using the changeset viewer.