From 969c1eec0cf7e26415e78b245a008921ae078e29 Mon Sep 17 00:00:00 2001 From: liwentao_uiw Date: Sun, 26 Feb 2023 18:31:11 +0800 Subject: [PATCH] [Verification] make llvm-project build compatible with ohos-musl (linux 1.2.3, liteos 1.2.0) Signed-off-by: liwentao_uiw Change-Id: Ifd2332c34a08619ae231d5b502d6113ccbbd69ba --- llvm-build/Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/llvm-build/Makefile b/llvm-build/Makefile index c45575a8a990..91abe993fa77 100644 --- a/llvm-build/Makefile +++ b/llvm-build/Makefile @@ -58,6 +58,9 @@ LINUXDIR = $(TOPDIR)/kernel/linux/linux-5.10 TARGETS = $(if $(wildcard $(LITEOSADIR)),liteos_a_user,) TARGETS += $(if $(wildcard $(LINUXDIR)),linux_user,) +TARGETS_COPY_LITEOS = $(if $(wildcard $(LITEOSADIR)),liteos_a_user,) +TARGETS_COPY_LINUX = $(if $(wildcard $(LITEOSADIR)),linux_user,) + define LINUX_TYPES_H #ifndef _LINUX_TYPES_H #define _LINUX_TYPES_H @@ -108,7 +111,8 @@ endif endif endif -.PHONY: $(TARGETS:%=musl_copy_for_%) +.PHONY: $(TARGETS_COPY_LITEOS:%=musl_copy_for_%) +.PHONY: $(TARGETS_COPY_LINUX:%=musl_copy_for_%) .PHONY: $(TARGETS:%=musl_patch_for_%) .PHONY: $(TARGETS:%=musl_install_for_%) .PHONY: $(TARGETS:%=musl_header_install_for_%) @@ -119,10 +123,16 @@ endif all: $(TARGETS:%=musl_install_for_%) -$(TARGETS:%=musl_copy_for_%): +$(TARGETS_COPY_LITEOS:%=musl_copy_for_%): $(HIDE) mkdir -p $@ $(HIDE) cp -rfu $(MUSLDIR)/[!p]* $@ +$(TARGETS_COPY_LINUX:%=musl_copy_for_%): + $(HIDE) mkdir -p $@ + $(HIDE) cp -rfu $(MUSLDIR)/musl_1.2.3/[!p]* $@ + $(HIDE) cp -rfu $(MUSLDIR)/porting $@ + $(HIDE) rm -rf $@/src/math/x86_64/remquol.c + optimized_routines_install_for_liteos_a_user: musl_copy_for_liteos_a_user ifneq ($(ARCH),) $(HIDE) cp -rfp $(OPTRTDIR)/string/$(ARCH)/* $