Changeset 444 for trunk/params-soft.mk

Timestamp:

May 16, 2018, 8:31:35 PM (6 years ago)

Author:

satin@…

Message:

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

File:

• trunk/params-soft.mk (modified) (2 diffs)

trunk/params-soft.mk

@@ -1 +1 @@
 
 #put your absolute path to almos-mkh dir here
-ALMOS-MKH_DIR = /Users/alain/soc/almos-mkh
+ALMOSMKH_DIR = /Users/alain/soc/almos-mkh
 
 LIBC_NAME = mini-libc
@@ -11 +11 @@
 LIBPTHREAD_NAME = mini-libpthread
 
-ifeq ($(ALMOS-MKH_DIR),)
-$(error Please define ALMOS-MKH_DIR parameter in params-soft.mk!)
+ifeq ($(ALMOSMKH_DIR),)
+$(error Please define ALMOSMKH_DIR parameter in params-soft.mk!)
 endif
 
 
 ifeq ($(LIBC_NAME), mini-libc)
-  LIBC_PATH = $(ALMOS-MKH_DIR)/libs/mini-libc/
+  LIBC_PATH = $(ALMOSMKH_DIR)/libs/mini-libc/
+  LIBC = $(LIBC_PATH)/build/lib/
+  LIBC_INCLUDE = $(LIBC_PATH)/build/include/
 endif
 ifeq ($(LIBC_NAME), newlib)
-  LIBC_PATH = $(ALMOS-MKH_DIR)/libs/newlib/
+  ifeq ($(ARCH_NAME), tsar_mips32)
+    ARCH_NEWLIB=mipsel
+  endif
+  #TODO for x86
+  LIBC_PATH = $(ALMOSMKH_DIR)/libs/newlib/
+  LIBC = $(LIBC_PATH)/build/$(ARCH_NEWLIB)-almosmkh/lib/
+  LIBC_INCLUDE = $(LIBC_PATH)/build/$(ARCH_NEWLIB)-almosmkh/include/
 endif
 
 ifeq ($(LIBPTHREAD_NAME), mini-libpthread)
-  LIBPTHREAD_PATH = $(ALMOS-MKH_DIR)/libs/mini-libpthread/
+  LIBPTHREAD_PATH = $(ALMOSMKH_DIR)/libs/mini-libpthread/
 endif
 
+LIBALMOSMKH_PATH = $(ALMOSMKH_DIR)/libs/libalmos-mkh
 #Define path to .a and headers files for libc and libpthread
-LIBC = $(LIBC_PATH)/build/lib/
-LIBC_INCLUDE = $(LIBC_PATH)/build/include/
 LIBPTHREAD = $(LIBPTHREAD_PATH)/build/lib/
 LIBPTHREAD_INCLUDE = $(LIBPTHREAD_PATH)/build/include/
+LIBALMOSMKH = $(LIBALMOSMKH_PATH)/build/lib/
+LIBALMOSMKH_INCLUDE = $(LIBALMOSMKH_PATH)/build/include/
 
 
-HAL  = $(ALMOS-MKH_DIR)/hal
-KERNEL = $(ALMOS-MKH_DIR)/kernel
+HAL  = $(ALMOSMKH_DIR)/hal
+KERNEL = $(ALMOSMKH_DIR)/kernel
+SHARED_INCLUDE = $(KERNEL)/syscalls/shared_include/