yystopf
/
openharmony_kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!53 Add latest post-review fixes for Qemu ARM Virt support 

Merge pull request !53 from Zbigniew/qemu-arm-dev
This commit is contained in:
openharmony_ci 2020-12-31 21:33:38 +08:00 committed by Gitee
parent 58da2cb0c2 fab70c738d
commit d07637e648
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
kernel/common/los_config.c
View File

@ -130,7 +130,6 @@ extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
extern UINT32 OsSystemInit(VOID); extern UINT32 OsSystemInit(VOID);
extern VOID SystemInit(VOID);
VOID __attribute__((weak)) SystemInit(VOID) VOID __attribute__((weak)) SystemInit(VOID)
{ {

6
shell/full/src/base/show.c
View File

@ -100,16 +100,16 @@ STATIC UINT32 OsShellSourceInit(INT32 consoleId)
ret = LOS_NOK; ret = LOS_NOK;
goto ERR_OUT4; goto ERR_OUT4;
} }
if (consoleId == CONSOLE_TELNET
#if !defined(LOSCFG_PLATFORM_ROOTFS) #if !defined(LOSCFG_PLATFORM_ROOTFS)
/* /*
* In case of ROOTFS disabled but * In case of ROOTFS disabled but
* serial console enabled, it is required * serial console enabled, it is required
* to create Shell task in kernel for it. * to create Shell task in kernel for it.
*/ */
|| consoleId == CONSOLE_SERIAL if (consoleId == CONSOLE_TELNET || consoleId == CONSOLE_SERIAL) {
#else
if (consoleId == CONSOLE_TELNET) {
#endif #endif
) {
ret = OsShellCreateTask(shellCB); ret = OsShellCreateTask(shellCB);
if (ret != LOS_OK) { if (ret != LOS_OK) {
goto ERR_OUT4; goto ERR_OUT4;

4
tools/build/mk/los_config.mk
View File

@ -463,10 +463,14 @@ ifeq ($(LOSCFG_COMPILE_DEBUG), y)
LITEOS_COPTS_OPTION = -g -gdwarf-2 LITEOS_COPTS_OPTION = -g -gdwarf-2
else else
ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y) ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
# WORKAROUND: Disable LTO to avoid undefined __stack_chk_guard # WORKAROUND: Disable LTO to avoid undefined __stack_chk_guard
# problem. "externally_visible" attribute could be # problem. "externally_visible" attribute could be
# a fix for that but it is not known to our LLVM. # a fix for that but it is not known to our LLVM.
LITEOS_COPTS_OPTMIZE = -Oz #-flto LITEOS_COPTS_OPTMIZE = -Oz #-flto
else
LITEOS_COPTS_OPTMIZE = -Oz -flto
endif
else else
LITEOS_COPTS_OPTMIZE = -O2 LITEOS_COPTS_OPTMIZE = -O2
endif endif