提交 78906f4a 编写于 作者: O openharmony_ci 提交者: Gitee

!406 修正最小编译时的错误

Merge pull request !406 from Caoruihong/qemu_mini
...@@ -45,6 +45,8 @@ endif ...@@ -45,6 +45,8 @@ endif
#only enable for qemu now #only enable for qemu now
ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y) ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
ifeq ($(LOSCFG_SHELL), y)
APP_SUBDIRS += mksh APP_SUBDIRS += mksh
APP_SUBDIRS += toybox APP_SUBDIRS += toybox
endif endif
endif
...@@ -1168,7 +1168,7 @@ __attribute__((noinline)) VOID LOS_Panic(const CHAR *fmt, ...) ...@@ -1168,7 +1168,7 @@ __attribute__((noinline)) VOID LOS_Panic(const CHAR *fmt, ...)
} }
/* stack protector */ /* stack protector */
UINT32 __stack_chk_guard = 0xd00a0dff; USED UINT32 __stack_chk_guard = 0xd00a0dff;
VOID __stack_chk_fail(VOID) VOID __stack_chk_fail(VOID)
{ {
......
...@@ -32,9 +32,9 @@ ...@@ -32,9 +32,9 @@
#include <sys/statfs.h> #include <sys/statfs.h>
#include <sys/mount.h> #include <sys/mount.h>
#include "proc_fs.h" #include "proc_fs.h"
#include "los_trace.h"
#ifdef LOSCFG_KERNEL_TRACE #ifdef LOSCFG_KERNEL_TRACE
#include "los_trace.h"
static int KernelTraceProcFill(struct SeqBuf *m, void *v) static int KernelTraceProcFill(struct SeqBuf *m, void *v)
{ {
(void)v; (void)v;
......
...@@ -1413,6 +1413,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task ...@@ -1413,6 +1413,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task
LOS_MpSchedule(taskCB->currCpu); LOS_MpSchedule(taskCB->currCpu);
} else } else
#endif #endif
#ifdef LOSCFG_KERNEL_VM
{ {
ret = OsTaskKillUnsafe(taskCB->taskID, SIGKILL); ret = OsTaskKillUnsafe(taskCB->taskID, SIGKILL);
if (ret != LOS_OK) { if (ret != LOS_OK) {
...@@ -1420,6 +1421,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task ...@@ -1420,6 +1421,7 @@ STATIC VOID OsExitGroupActiveTaskKilled(LosProcessCB *processCB, LosTaskCB *task
taskCB->processID, OsCurrTaskGet()->taskID, taskCB->taskID, ret); taskCB->processID, OsCurrTaskGet()->taskID, taskCB->taskID, ret);
} }
} }
#endif
if (!(taskCB->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN)) { if (!(taskCB->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN)) {
taskCB->taskStatus |= OS_TASK_FLAG_PTHREAD_JOIN; taskCB->taskStatus |= OS_TASK_FLAG_PTHREAD_JOIN;
......
...@@ -45,7 +45,9 @@ ...@@ -45,7 +45,9 @@
#include "los_cpup_pri.h" #include "los_cpup_pri.h"
#endif #endif
#ifdef LOSCFG_KERNEL_TRACE
#include "los_trace.h" #include "los_trace.h"
#endif
#ifdef __cplusplus #ifdef __cplusplus
#if __cplusplus #if __cplusplus
......
...@@ -101,11 +101,13 @@ STATIC UINT32 OsPendingTaskWake(LosTaskCB *taskCB, INT32 signo) ...@@ -101,11 +101,13 @@ STATIC UINT32 OsPendingTaskWake(LosTaskCB *taskCB, INT32 signo)
case OS_TASK_WAIT_SIGNAL: case OS_TASK_WAIT_SIGNAL:
OsSigWaitTaskWake(taskCB, signo); OsSigWaitTaskWake(taskCB, signo);
break; break;
#ifdef LOSCFG_KERNEL_LITEIPC
case OS_TASK_WAIT_LITEIPC: case OS_TASK_WAIT_LITEIPC:
taskCB->ipcStatus &= ~IPC_THREAD_STATUS_PEND; taskCB->ipcStatus &= ~IPC_THREAD_STATUS_PEND;
OsTaskWakeClearPendMask(taskCB); OsTaskWakeClearPendMask(taskCB);
OsSchedTaskWake(taskCB); OsSchedTaskWake(taskCB);
break; break;
#endif
case OS_TASK_WAIT_FUTEX: case OS_TASK_WAIT_FUTEX:
OsFutexNodeDeleteFromFutexHash(&taskCB->futex, TRUE, NULL, NULL); OsFutexNodeDeleteFromFutexHash(&taskCB->futex, TRUE, NULL, NULL);
OsTaskWakeClearPendMask(taskCB); OsTaskWakeClearPendMask(taskCB);
......
...@@ -41,7 +41,9 @@ ...@@ -41,7 +41,9 @@
#include "los_vm_fault.h" #include "los_vm_fault.h"
#include "los_process_pri.h" #include "los_process_pri.h"
#include "los_vm_lock.h" #include "los_vm_lock.h"
#ifdef LOSCFG_FS_VFS
#include "vnode.h" #include "vnode.h"
#endif
#ifndef UNUSED #ifndef UNUSED
#define UNUSED(x) (VOID)x #define UNUSED(x) (VOID)x
......
...@@ -62,7 +62,9 @@ ...@@ -62,7 +62,9 @@
#endif #endif
#include <sys/wait.h> #include <sys/wait.h>
#include "sys/resource.h" #include "sys/resource.h"
#ifdef LOSCFG_FS_VFS
#include "vnode.h" #include "vnode.h"
#endif
/* process */ /* process */
extern unsigned int SysGetGroupId(void); extern unsigned int SysGetGroupId(void);
......
...@@ -2,6 +2,7 @@ LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7=y ...@@ -2,6 +2,7 @@ LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7=y
LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board" LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board"
# LOSCFG_HRTIMER_ENABLE is not set # LOSCFG_HRTIMER_ENABLE is not set
# LOSCFG_IRQ_USE_STANDALONE_STACK is not set # LOSCFG_IRQ_USE_STANDALONE_STACK is not set
# LOSCFG_BLACKBOX is not set
# LOSCFG_KERNEL_MMU is not set # LOSCFG_KERNEL_MMU is not set
# LOSCFG_KERNEL_EXTKERNEL is not set # LOSCFG_KERNEL_EXTKERNEL is not set
# LOSCFG_BASE_CORE_HILOG is not set # LOSCFG_BASE_CORE_HILOG is not set
......
LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7=y
LOSCFG_BOARD_CONFIG_PATH="device/qemu/arm_virt/liteos_a/config/board"
# LOSCFG_HRTIMER_ENABLE is not set
# LOSCFG_IRQ_USE_STANDALONE_STACK is not set
# LOSCFG_BLACKBOX is not set
# LOSCFG_KERNEL_MMU is not set
# LOSCFG_KERNEL_EXTKERNEL is not set
# LOSCFG_BASE_CORE_HILOG is not set
# LOSCFG_LIB_ZLIB is not set
# LOSCFG_FS_VFS is not set
# LOSCFG_NET_LWIP_SACK is not set
# LOSCFG_PLATFORM_ADAPT is not set
# LOSCFG_ENABLE_MAGICKEY is not set
# LOSCFG_DRIVERS is not set
# LOSCFG_SECURITY is not set
...@@ -198,9 +198,11 @@ ifeq ($(LOSCFG_KERNEL_VDSO), y) ...@@ -198,9 +198,11 @@ ifeq ($(LOSCFG_KERNEL_VDSO), y)
LITEOS_VDSO_INCLUDE += -I $(LITEOSTOPDIR)/kernel/extended/vdso/include LITEOS_VDSO_INCLUDE += -I $(LITEOSTOPDIR)/kernel/extended/vdso/include
endif endif
ifeq ($(LOSCFG_KERNEL_TRACE), y)
LITEOS_BASELIB += -ltrace LITEOS_BASELIB += -ltrace
LIB_SUBDIRS += kernel/extended/trace LIB_SUBDIRS += kernel/extended/trace
LITEOS_TRACE_INCLUDE += -I $(LITEOSTOPDIR)/kernel/extended/trace LITEOS_TRACE_INCLUDE += -I $(LITEOSTOPDIR)/kernel/extended/trace
endif
ifeq ($(LOSCFG_KERNEL_LITEIPC), y) ifeq ($(LOSCFG_KERNEL_LITEIPC), y)
LITEOS_BASELIB += -lliteipc LITEOS_BASELIB += -lliteipc
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册