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

feat(make): optimize makefiles and remove some unused files

Browse Source 
Signed-off-by: Caoruihong <crh.cao@huawei.com>
Change-Id: Ie2dfa7334417ccd55bd56a19a7882a982ce49cab
This commit is contained in:
Caoruihong
2021-08-03 00:35:23 +08:00
parent 752aa49018
commit 0e260949c9
34 changed files with 345 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/extended/vdso/BUILD.gn
View File

@@ -46,8 +46,10 @@ config("public") {
include_dirs = [ "include" ]
}
copy("copy_ohos_vdso") {
deps = [ "usr:OHOS-vdso" ]
sources = [ get_path_info("usr/", "out_dir") + "/libOHOS-vdso.so" ]
outputs = [ "$root_out_dir/OHOS-vdso.so" ]
if (module_switch) {
copy("copy_ohos_vdso") {
deps = [ "usr:OHOS-vdso" ]
sources = [ get_path_info("usr/", "out_dir") + "/libOHOS-vdso.so" ]
outputs = [ "$root_out_dir/OHOS-vdso.so" ]
}
}

4
kernel/extended/vdso/src/Makefile
View File

@@ -33,8 +33,8 @@ MODULE_NAME := $(notdir $(shell pwd)/../vdso)
LOCAL_SRCS := $(wildcard *.c) $(wildcard *.S)
LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/kernel/base/include -I $(LITEOSTOPDIR)/kernel/extended/include -I $(LITEOSTOPDIR)/kernel/extended/vdso/include
LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/kernel/base/include -I ../include
LOCAL_FLAGS := $(LOCAL_INCLUDE) -DOHOS_VDSO_SO=\"../usr/OHOS-vdso.so\"
LOCAL_FLAGS := $(LOCAL_INCLUDE) -DOHOS_VDSO_SO=\"$(OUT)/lib/OHOS-vdso.so\"
include $(MODULE)

1
kernel/extended/vdso/usr/BUILD.gn
View File

@@ -53,7 +53,6 @@ shared_library("OHOS-vdso") {
defines = [ "_XOPEN_SOURCE=700" ]
ldflags = [
"-Wl,-s",
"-Wl,-Bsymbolic",
"-Wl,-T" + rebase_path("los_vdso.ld", root_build_dir),
]

12
kernel/extended/vdso/usr/Makefile
View File

@@ -29,7 +29,7 @@
include $(LITEOSTOPDIR)/config.mk
VDSO_SO = OHOS-vdso
VDSO_SO = $(OUT)/lib/OHOS-vdso.so
VDSO_SRCS := los_vdso_sys.c
VDSO_INCLUDE := -I $(LITEOSTOPDIR)/kernel/extended/vdso/include \
@@ -41,14 +41,14 @@ VDSO_CCFLAGS := -nostdlib -fPIC -fno-common -fno-strict-aliasing \
$(LITEOS_SSP) $(LITEOS_CORE_COPTS) $(WARNING_AS_ERROR) $(LITEOS_COPTS_OPTMIZE)
ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
VDSO_CCFLAGS += $(LLVM_EXTRA_OPTS) --sysroot=$(SYSROOT_PATH)
VDSO_CCFLAGS += -O2
endif
VDSO_LDFLAGS := -shared -s -Bsymbolic -T los_vdso.ld
VDSO_LDFLAGS := -shared -Wl,-s,-Bsymbolic,-Tlos_vdso.ld
all: $(VDSO_SO)
$(VDSO_SO):
$(HIDE)$(CC) $(VDSO_INCLUDE) $(VDSO_CCFLAGS) -c -o $@.o $(VDSO_SRCS)
$(HIDE)$(LD) $(VDSO_LDFLAGS) -o $@.so $@.o
$(VDSO_SO): $(VDSO_SRCS)
$(HIDE)$(CC) $(VDSO_INCLUDE) $(VDSO_CCFLAGS) $(VDSO_LDFLAGS) -o $@ $^
clean:
$(HIDE)$(RM) -rf *.o *.so
$(HIDE)$(RM) $(VDSO_SO)