Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Kernel Liteos A
提交
83bff88f
K
Kernel Liteos A
项目概览
OpenHarmony
/
Kernel Liteos A
9 个月 前同步成功
通知
450
Star
414
Fork
55
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
4
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
K
Kernel Liteos A
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
4
Issue
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
83bff88f
编写于
8月 24, 2021
作者:
O
openharmony_ci
提交者:
Gitee
8月 24, 2021
浏览文件
操作
浏览文件
下载
差异文件
!567 优化编译脚本删除冗余选项
Merge pull request !567 from Caoruihong/opt_make
上级
5369b6aa
181322a3
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
30 addition
and
71 deletion
+30
-71
.gitignore
.gitignore
+0
-1
BUILD.gn
BUILD.gn
+4
-7
Makefile
Makefile
+1
-1
arch/arm/arm.mk
arch/arm/arm.mk
+0
-2
kernel/user/BUILD.gn
kernel/user/BUILD.gn
+15
-17
kernel/user/Makefile
kernel/user/Makefile
+1
-10
tools/build/mk/los_config.mk
tools/build/mk/los_config.mk
+9
-33
未找到文件。
.gitignore
浏览文件 @
83bff88f
...
...
@@ -17,7 +17,6 @@ tags
# Menuconfig temp files
/config.h
/defconfig
/.config
/.config.old
...
...
BUILD.gn
浏览文件 @
83bff88f
...
...
@@ -262,14 +262,11 @@ config("los_common") {
}
if (defined(LOSCFG_THUMB)) {
cflags += [
"-mthumb",
"-Wa,-mimplicit-it=thumb",
]
cflags += [ "-mthumb" ]
if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
# llvm-as do not support "-mimplicit-it=thumb" option currently,
# so we remove it temporary.
cflags
-
= [ "-Wa,-mimplicit-it=thumb" ]
cflags += [ "-mimplicit-it=thumb" ]
} else {
cflags
+
= [ "-Wa,-mimplicit-it=thumb" ]
}
}
...
...
Makefile
浏览文件 @
83bff88f
...
...
@@ -28,6 +28,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
LITEOSTOPDIR
:=
$(
realpath
$(
dir
$(
firstword
$(MAKEFILE_LIST)
)))
export
LITEOSTOPDIR
APPS
=
apps
ROOTFS
=
rootfs
...
...
@@ -64,7 +65,6 @@ LITEOS_MENUCONFIG_H ?= $(LITEOSTOPDIR)/config.h
LITEOS_CONFIG_FILE
?=
$(LITEOSTOPDIR)
/.config
# export los_config.mk related environment variables
export
LITEOSTOPDIR
export
LITEOS_MENUCONFIG_H
export
LITEOS_CONFIG_FILE
...
...
arch/arm/arm.mk
浏览文件 @
83bff88f
...
...
@@ -66,8 +66,6 @@ LITEOS_GCCLIB := $(subst cortex-,,$(LOSCFG_ARCH_CPU))_softfp_$(LOSCFG_
endif
LITEOS_CORE_COPTS
=
$(
or
$(ARCH_CFLAGS)
,
$(LITEOS_CPU_OPTS)
$(LITEOS_FLOAT_OPTS)
$(LITEOS_FPU_OPTS)
)
LITEOS_INTERWORK
+=
$(LITEOS_CORE_COPTS)
LITEOS_NODEBUG
+=
$(LITEOS_CORE_COPTS)
LITEOS_ASOPTS
+=
$(LITEOS_CPU_OPTS)
LITEOS_CXXOPTS_BASE
+=
$(LITEOS_CORE_COPTS)
...
...
kernel/user/BUILD.gn
浏览文件 @
83bff88f
...
...
@@ -30,38 +30,36 @@
import("//kernel/liteos_a/liteos.gni")
module_name = "userinit"
executab
le(module_name) {
kernel_modu
le(module_name) {
sources = [ "src/los_user_init.c" ]
include_dirs = [
"include",
"$LITEOSTOPDIR/syscall",
]
}
configs = []
configs += [
"$LITEOSTOPDIR:public",
"$LITEOSTOPDIR:los_config",
]
config("public") {
}
userinit = "lib$module_name.O"
executable(userinit) {
output_dir = target_out_dir
deps = [ ":$module_name" ]
configs = []
configs += [ "$LITEOSTOPDIR:los_config" ]
ldflags = [
"-static",
"-Wl,-r",
]
}
output_dir = target_out_dir
copy("copy_userinit") {
deps = [ ":$userinit" ]
sources = [ "$target_out_dir/unstripped/bin/$userinit" ]
outputs = [ "$root_out_dir/$userinit" ]
}
group("user") {
public_deps = [ ":$module_name" ]
deps = [ ":copy_userinit" ]
}
config("public") {
}
copy("copy_userinit") {
deps = [ ":$module_name" ]
sources = [ "$target_out_dir/unstripped/bin/$module_name" ]
outputs = [ "$root_out_dir/lib$module_name.O" ]
}
kernel/user/Makefile
浏览文件 @
83bff88f
...
...
@@ -32,17 +32,8 @@ include $(LITEOSTOPDIR)/config.mk
MODULE_NAME
:=
userinit
LOCAL_INCLUDE
:=
\
-I
$(LITEOSTOPDIR)
/kernel/base/include
\
-I
$(LITEOSTOPDIR)
/kernel/include
\
-I
$(LITEOSTOPDIR)
/kernel/extended/include
\
-I
$(LITEOSTOPDIR)
/syscall
\
-I
$(LITEOSTOPDIR)
/fs/vfs
\
-I
$(LITEOSTHIRDPARTY)
/FatFs/source
\
-I
$(LITEOSTOPDIR)
/fs/proc/include
\
-I
$(LITEOSTOPDIR)
/fs/jffs2/include
\
-I
$(LITEOSTOPDIR)
/fs/nfs/include
\
-I
$(LITEOSTOPDIR)
/bsd/compat/linuxkpi/include
\
-I
$(LITEOSTOPDIR)
/kernel/user/include
-I
include
LOCAL_SRCS
:=
$(
wildcard
src/
*
.c
)
\
$(
wildcard
src/
*
.S
)
...
...
tools/build/mk/los_config.mk
浏览文件 @
83bff88f
...
...
@@ -56,16 +56,11 @@ LITEOS_CPU_TYPE :=
LITEOS_ASOPTS
:=
LITEOS_COPTS_BASE
:=
LITEOS_COPTS_EXTRA
:=
LITEOS_COPTS_EXTRA_INTERWORK
:=
LITEOS_COPTS_DEBUG
:=
LITEOS_COPTS_NODEBUG
:=
LITEOS_INTERWORK
:=
LITEOS_CXXOPTS
:=
LITEOS_CXXOPTS_BASE
:=
LITEOS_LD_OPTS
:=
LITEOS_GCOV_OPTS
:=
## dynload ld options ##
LITEOS_DYNLOADOPTS
:=
## macro define ##
LITEOS_CMACRO
:=
LITEOS_CXXMACRO
:=
...
...
@@ -77,7 +72,6 @@ LITEOS_LD_SCRIPT :=
## c as cxx ld flags ##
LITEOS_ASFLAGS
:=
LITEOS_CFLAGS
:=
LITEOS_CFLAGS_INTERWORK
:=
LITEOS_LDFLAGS
:=
LITEOS_CXXFLAGS
:=
## depended lib ##
...
...
@@ -395,7 +389,7 @@ endif
ifeq
($(LOSCFG_DRIVERS_VIDEO), y)
LITEOS_BASELIB
+=
-lvideo
LIB_SUBDIRS
+=
$(LITEOSTOPDIR)
/drivers/char/video
LITEOS_VIDEO_INCLUDE
+=
-I
$(LITEOST
OPDIR)
/../../third_party
/NuttX/include/nuttx/video
LITEOS_VIDEO_INCLUDE
+=
-I
$(LITEOST
HIRDPARTY)
/NuttX/include/nuttx/video
endif
############################## Driver Option End #######################################
...
...
@@ -426,6 +420,10 @@ ifeq ($(LOSCFG_COMPRESS), y)
LIB_SUBDIRS
+=
tools/compress
endif
ifneq
($(LOSCFG_DEBUG_VERSION), y)
LITEOS_COPTS_DEBUG
+=
-DNDEBUG
endif
ifeq
($(LOSCFG_COMPILE_DEBUG), y)
LITEOS_COPTS_OPTMIZE
=
-O0
LITEOS_COPTS_OPTION
=
-g
-gdwarf-2
...
...
@@ -435,13 +433,10 @@ else
else
LITEOS_COPTS_OPTMIZE
=
-O2
endif
LITEOS_COPTS_OPTMIZE_NODEBUG
=
-O0
endif
LITEOS_COPTS_DEBUG
+=
$(LITEOS_COPTS_OPTION)
$(LITEOS_COPTS_OPTMIZE)
LITEOS_INTERWORK
+=
$(LITEOS_COPTS_OPTION)
$(LITEOS_COPTS_OPTMIZE)
LITEOS_CXXOPTS_BASE
+=
$(LITEOS_COPTS_OPTION)
$(LITEOS_COPTS_OPTMIZE)
LITEOS_ASOPTS
+=
$(LITEOS_COPTS_OPTION)
LITEOS_NODEBUG
+=
$(LITEOS_COPTS_OPTMIZE_NODEBUG)
ifeq
($(LOSCFG_SHELL), y)
LITEOS_BASELIB
+=
-lshell
...
...
@@ -577,11 +572,11 @@ endif
endif
LITEOS_COPTS_EXTRA
+=
-fno-short-enums
ifeq
($(LOSCFG_THUMB), y)
LITEOS_COPTS_EXTRA_INTERWORK
:=
$(LITEOS_COPTS_EXTRA)
-mthumb
-Wa
,-mimplicit-it
=
thumb
LITEOS_C
MACRO
+=
-DLOSCFG_INTERWORK_THUMB
ifeq
($(LOSCFG_COMPILER_CLANG_LLVM), y)
LITEOS_C
FLAGS_INTERWORK
:=
-mthumb
-mimplicit-it
=
thumb
else
LITEOS_C
OPTS_EXTRA_INTERWORK
:=
$(LITEOS_COPTS_EXTRA)
#-fno-inline
LITEOS_C
FLAGS_INTERWORK
:=
-mthumb
-Wa
,-mimplicit-it
=
thumb
endif
endif
# kernel configuration macros
...
...
@@ -591,12 +586,7 @@ ifneq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
LITEOS_LD_OPTS
+=
-nostartfiles
endif
LITEOS_LD_OPTS
+=
-static
--gc-sections
LITEOS_LD_OPTS
+=
$(LITEOS_DYNLOADOPTS)
LITEOS_LD_PATH
+=
-L
$(OUT)
/lib
ifeq
($(LOSCFG_VENDOR) ,y)
LITEOS_LD_PATH
+=
-L
$(OUT)
/lib/rdk
-L
$(OUT)
/lib/sdk
\
-L
$(OUT)
/lib/main_server
endif
ifeq
($(LOSCFG_COMPILER_CLANG_LLVM), y)
LITEOS_LD_SCRIPT
:=
-T
$(LITEOSTOPDIR)
/tools/build/liteos_llvm.ld
...
...
@@ -614,17 +604,3 @@ LITEOS_BASELIB += $(shell $(_CC) "-print-file-name=libgcc_eh.a")
endif
LITEOS_BASELIB
+=
$(
shell
$(_CC)
"-print-libgcc-file-name"
)
LITEOS_LIB_INCLUDE
+=
-isystem
$(
shell
$(_CC)
"-print-file-name=include"
)
LITEOS_CXXINCLUDE
=
$(LITEOS_INCLUDE)
LITEOS_COPTS_NODEBUG
:=
$(LITEOS_NODEBUG)
$(LITEOS_COPTS_BASE)
$(LITEOS_COPTS_EXTRA)
LITEOS_COPTS_INTERWORK
:=
$(LITEOS_INTERWORK)
$(LITEOS_COPTS_BASE)
$(LITEOS_COPTS_EXTRA_INTERWORK)
LITEOS_BASE_INCLUDE
:=
$(LITEOS_KERNEL_INCLUDE)
$(LITEOS_PLATFORM_INCLUDE)
\
$(LITEOS_LIB_INCLUDE)
$(LITEOS_FS_INCLUDE)
\
$(LITEOS_EXTKERNEL_INCLUDE)
\
$(LITEOS_COMPAT_INCLUDE)
$(LITEOS_DRIVERS_INCLUDE)
\
$(LOSCFG_TOOLS_DEBUG_INCLUDE)
$(LITEOS_NET_INCLUDE)
LITEOS_CFLAGS_INTERWORK
:=
$(LITEOS_COPTS_INTERWORK)
$(LITEOS_CMACRO)
\
$(LITEOS_IMAGE_MACRO)
$(LITEOS_BASE_INCLUDE)
LITEOS_CFLAGS_NODEBUG
:=
$(LITEOS_COPTS_NODEBUG)
$(LITEOS_CMACRO)
\
$(LITEOS_IMAGE_MACRO)
$(LITEOS_BASE_INCLUDE)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录