From e6495aba760cea887e7ae4d36584078fb6ffc7e6 Mon Sep 17 00:00:00 2001 From: fuqun Date: Wed, 17 Mar 2021 12:20:49 +0800 Subject: [PATCH 1/6] Add TOOL_BIN_PATH and the same tool link on differrent platform --- build/config.gni | 8 ++++---- build/config/BUILDCONFIG.gn | 4 ++-- build/core/maple_variables.mk | 2 +- build/envsetup.sh | 21 ++++++++++++++------- test/maple_aarch64_with_whirl2mpl.sh | 3 ++- testsuite/driver/src/api/clangfe.py | 2 +- testsuite/driver/src/api/linker.py | 2 +- testsuite/driver/src/mod/O0.py | 2 +- testsuite/driver/src/mod/O2.py | 2 +- 9 files changed, 27 insertions(+), 19 deletions(-) diff --git a/build/config.gni b/build/config.gni index b88e558b26..7a75ad3604 100644 --- a/build/config.gni +++ b/build/config.gni @@ -25,10 +25,10 @@ if (OPS_ANDROID == 1) { GN_AR_COMPILER = "${ANDROID_CLANG_PATH}/bin/llvm-ar" GN_RANLIB_COMPILER = "${NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib" } else { - GN_C_COMPILER = "${CLANG_PATH}/clang" - GN_CXX_COMPILER = "${CLANG_PATH}/clang++" - GN_AR_COMPILER = "${CLANG_PATH}/llvm-ar" - GN_RANLIB_COMPILER = "${CLANG_PATH}/llvm-ranlib" + GN_C_COMPILER = "${TOOL_BIN_PATH}/clang" + GN_CXX_COMPILER = "${TOOL_BIN_PATH}/clang++" + GN_AR_COMPILER = "${TOOL_BIN_PATH}/llvm-ar" + GN_RANLIB_COMPILER = "${TOOL_BIN_PATH}/llvm-ranlib" } target_toolchain = "//build/toolchain:clang" diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index dc545010fd..53c57fcb22 100755 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -32,8 +32,8 @@ ANDROID_ROOT = "${MAPLE_ROOT}/android" AOSP_ROOT = "${MAPLE_ROOT}/third_party/aosp_modified" MAPLE_BUILD_TYPE = getenv("MAPLE_BUILD_TYPE") MAPLE_BUILD_OUTPUT = getenv("MAPLE_BUILD_OUTPUT") -CLANG_PATH = getenv("CLANG_PATH") -QEMU_PATH = getenv("QEMU_PATH") +TOOL_BIN_PATH = getenv("TOOL_BIN_PATH") +QEMU_PATH = getenv("TOOL_BIN_PATH") OLD_OS = getenv("OLD_OS") if (OLD_OS == "1") { DESIGNATOR="-Wno-gnu-designator" diff --git a/build/core/maple_variables.mk b/build/core/maple_variables.mk index e6eeac30ac..36e09cbcbb 100644 --- a/build/core/maple_variables.mk +++ b/build/core/maple_variables.mk @@ -56,7 +56,7 @@ LDS := $(MAPLE_ROOT)/src/mrt/maplert/linker/maplelld.so.lds DUPLICATE_DIR := $(MAPLE_ROOT)/src/mrt/codetricks/arch/arm64 ifeq ($(OPS_ANDROID), 0) - QEMU_CLANG_CPP := $(CLANG_PATH)/clang++ + QEMU_CLANG_CPP := $(TOOL_BIN_PATH)/clang++ else QEMU_CLANG_CPP := $(ANDROID_CLANG_PATH)/bin/clang++ endif diff --git a/build/envsetup.sh b/build/envsetup.sh index 5e6a761b92..0fe6487416 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -42,19 +42,26 @@ export GCOV_PREFIX_STRIP=7 # display OS version lsb_release -d +export TOOL_BIN_PATH=${MAPLE_ROOT}/tools/bin +mkdir -p ${TOOL_BIN_PATH} OS_VERSION=`lsb_release -r | sed -e "s/^[^0-9]*//" -e "s/\..*//"` if [ "$OS_VERSION" = "16" ] || [ "$OS_VERSION" = "18" ]; then OLD_OS=1 - CLANG_PATH=${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin - QEMU_PATH=/usr/bin + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang++ ${TOOL_BIN_PATH}/clang++ + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang ${TOOL_BIN_PATH}/clang + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib + ln -s -f /usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 else OLD_OS=0 - CLANG_PATH=/usr/bin - QEMU_PATH=${MAPLE_ROOT}/tools/qemu/package/usr/bin + ln -s -f /usr/bin/clang++ ${TOOL_BIN_PATH}/clang++ + ln -s -f /usr/bin/clang ${TOOL_BIN_PATH}/clang + ln -s -f /usr/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar + ln -s -f /usr/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib + ln -s -f ${MAPLE_ROOT}/tools/qemu/package/usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 fi +ln -s -f ${MAPLE_ROOT}/tools/open64_prebuilt/x86/aarch64/bin/clangfe ${TOOL_BIN_PATH}/clangfe export OLD_OS=${OLD_OS} -export CLANG_PATH=${CLANG_PATH} -export QEMU_PATH=${QEMU_PATH} # support multiple ARCH and BUILD_TYPE @@ -99,7 +106,7 @@ echo "Build: $MAPLE_BUILD_TYPE" export MAPLE_BUILD_OUTPUT=${MAPLE_ROOT}/output/${MAPLE_BUILD_TYPE} export MAPLE_EXECUTE_BIN=${MAPLE_ROOT}/output/${MAPLE_BUILD_TYPE}/bin export TEST_BIN=${CASE_ROOT}/driver/script -export PATH=$PATH:${MAPLE_EXECUTE_BIN}:${TEST_BIN} +export PATH=${TOOL_BIN_PATH}:$PATH:${MAPLE_EXECUTE_BIN}:${TEST_BIN} if [ ! -f $MAPLE_ROOT/tools/qemu/package/usr/bin/qemu-aarch64 ] && [ "$OLD_OS" = "0" ]; then echo " " diff --git a/test/maple_aarch64_with_whirl2mpl.sh b/test/maple_aarch64_with_whirl2mpl.sh index 826a8611d2..9e225204b6 100755 --- a/test/maple_aarch64_with_whirl2mpl.sh +++ b/test/maple_aarch64_with_whirl2mpl.sh @@ -14,8 +14,9 @@ # set -e +set -x -[ -n "$MAPLE_ROOT" ] || { echo MAPLE_ROOT not set. Please source envsetup.sh.; exit 1; } +#[ -n "$MAPLE_ROOT" ] || { echo MAPLE_ROOT not set. Please source envsetup.sh.; exit 1; } CURRDIR=`pwd` rel=`realpath --relative-to=$MAPLE_ROOT $CURRDIR` diff --git a/testsuite/driver/src/api/clangfe.py b/testsuite/driver/src/api/clangfe.py index 8ef7c70f59..22c16a53be 100644 --- a/testsuite/driver/src/api/clangfe.py +++ b/testsuite/driver/src/api/clangfe.py @@ -26,5 +26,5 @@ class Clangfe(ShellOperator): self.infile = infile def get_command(self, variables): - self.command = "${MAPLE_ROOT}/tools/open64_prebuilt/x86/aarch64/bin/clangfe -cc1 -emit-llvm -triple aarch64-linux-gnu -D__clang__ -D__BLOCKS__ -isystem /usr/aarch64-linux-gnu/include -isystem /usr/lib/gcc-cross/aarch64-linux-gnu/" + str(Clangfe.aarch64_linux_gnu_version) + "/include " + self.infile + self.command = "clangfe -cc1 -emit-llvm -triple aarch64-linux-gnu -D__clang__ -D__BLOCKS__ -isystem /usr/aarch64-linux-gnu/include -isystem /usr/lib/gcc-cross/aarch64-linux-gnu/" + str(Clangfe.aarch64_linux_gnu_version) + "/include " + self.infile return super().get_final_command(variables) diff --git a/testsuite/driver/src/api/linker.py b/testsuite/driver/src/api/linker.py index 2bfecfc400..54ba045338 100644 --- a/testsuite/driver/src/api/linker.py +++ b/testsuite/driver/src/api/linker.py @@ -22,5 +22,5 @@ class Linker(ShellOperator): self.lib = lib def get_command(self, variables): - self.command = "${CLANG_PATH}/clang++ -g3 -O2 -x assembler-with-cpp -march=armv8-a -target aarch64-linux-gnu -c ${APP}.VtableImpl.s && ${CLANG_PATH}/clang++ ${APP}.VtableImpl.o -L${OUT_ROOT}/aarch64-clang-release/ops/" + self.lib + " -g3 -O2 -march=armv8-a -target aarch64-linux-gnu -fPIC -shared -o ${APP}.so ${OUT_ROOT}/aarch64-clang-release/ops/mrt_module_init.o -fuse-ld=lld -rdynamic -lcore-all -lcommon-bridge -Wl,-z,notext -Wl,-T${OUT_ROOT}/aarch64-clang-release/ops/linker/maplelld.so.lds" + self.command = "clang++ -g3 -O2 -x assembler-with-cpp -march=armv8-a -target aarch64-linux-gnu -c ${APP}.VtableImpl.s && clang++ ${APP}.VtableImpl.o -L${OUT_ROOT}/aarch64-clang-release/ops/" + self.lib + " -g3 -O2 -march=armv8-a -target aarch64-linux-gnu -fPIC -shared -o ${APP}.so ${OUT_ROOT}/aarch64-clang-release/ops/mrt_module_init.o -fuse-ld=lld -rdynamic -lcore-all -lcommon-bridge -Wl,-z,notext -Wl,-T${OUT_ROOT}/aarch64-clang-release/ops/linker/maplelld.so.lds" return super().get_final_command(variables) diff --git a/testsuite/driver/src/mod/O0.py b/testsuite/driver/src/mod/O0.py index 86d95bbe3e..e39134ec23 100644 --- a/testsuite/driver/src/mod/O0.py +++ b/testsuite/driver/src/mod/O0.py @@ -52,7 +52,7 @@ O0 = { ], "run": [ Mplsh( - qemu="${QEMU_PATH}/qemu-aarch64", + qemu="qemu-aarch64", qemu_libc="/usr/aarch64-linux-gnu", qemu_ld_lib=[ "${OUT_ROOT}/aarch64-clang-release/ops/third_party", diff --git a/testsuite/driver/src/mod/O2.py b/testsuite/driver/src/mod/O2.py index 8cb4987438..18dfb60bd8 100644 --- a/testsuite/driver/src/mod/O2.py +++ b/testsuite/driver/src/mod/O2.py @@ -52,7 +52,7 @@ O2 = { ], "run": [ Mplsh( - qemu="/usr/bin/qemu-aarch64", + qemu="qemu-aarch64", qemu_libc="/usr/aarch64-linux-gnu", qemu_ld_lib=[ "${OUT_ROOT}/aarch64-clang-release/ops/third_party", -- Gitee From e5ead95f497619745e81f5fc63620c2108c47800 Mon Sep 17 00:00:00 2001 From: fuqun Date: Wed, 17 Mar 2021 14:05:58 +0800 Subject: [PATCH 2/6] Add TOOL_BIN_PATH and toolchain links --- build/config.gni | 8 ++++---- build/config/BUILDCONFIG.gn | 4 ++-- build/core/maple_variables.mk | 2 +- build/envsetup.sh | 21 ++++++++++++++------- testsuite/driver/src/api/clangfe.py | 2 +- testsuite/driver/src/api/linker.py | 2 +- testsuite/driver/src/mod/O0.py | 2 +- testsuite/driver/src/mod/O2.py | 2 +- 8 files changed, 25 insertions(+), 18 deletions(-) diff --git a/build/config.gni b/build/config.gni index b88e558b26..7a75ad3604 100644 --- a/build/config.gni +++ b/build/config.gni @@ -25,10 +25,10 @@ if (OPS_ANDROID == 1) { GN_AR_COMPILER = "${ANDROID_CLANG_PATH}/bin/llvm-ar" GN_RANLIB_COMPILER = "${NDK_PATH}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ranlib" } else { - GN_C_COMPILER = "${CLANG_PATH}/clang" - GN_CXX_COMPILER = "${CLANG_PATH}/clang++" - GN_AR_COMPILER = "${CLANG_PATH}/llvm-ar" - GN_RANLIB_COMPILER = "${CLANG_PATH}/llvm-ranlib" + GN_C_COMPILER = "${TOOL_BIN_PATH}/clang" + GN_CXX_COMPILER = "${TOOL_BIN_PATH}/clang++" + GN_AR_COMPILER = "${TOOL_BIN_PATH}/llvm-ar" + GN_RANLIB_COMPILER = "${TOOL_BIN_PATH}/llvm-ranlib" } target_toolchain = "//build/toolchain:clang" diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn index dc545010fd..53c57fcb22 100755 --- a/build/config/BUILDCONFIG.gn +++ b/build/config/BUILDCONFIG.gn @@ -32,8 +32,8 @@ ANDROID_ROOT = "${MAPLE_ROOT}/android" AOSP_ROOT = "${MAPLE_ROOT}/third_party/aosp_modified" MAPLE_BUILD_TYPE = getenv("MAPLE_BUILD_TYPE") MAPLE_BUILD_OUTPUT = getenv("MAPLE_BUILD_OUTPUT") -CLANG_PATH = getenv("CLANG_PATH") -QEMU_PATH = getenv("QEMU_PATH") +TOOL_BIN_PATH = getenv("TOOL_BIN_PATH") +QEMU_PATH = getenv("TOOL_BIN_PATH") OLD_OS = getenv("OLD_OS") if (OLD_OS == "1") { DESIGNATOR="-Wno-gnu-designator" diff --git a/build/core/maple_variables.mk b/build/core/maple_variables.mk index e6eeac30ac..36e09cbcbb 100644 --- a/build/core/maple_variables.mk +++ b/build/core/maple_variables.mk @@ -56,7 +56,7 @@ LDS := $(MAPLE_ROOT)/src/mrt/maplert/linker/maplelld.so.lds DUPLICATE_DIR := $(MAPLE_ROOT)/src/mrt/codetricks/arch/arm64 ifeq ($(OPS_ANDROID), 0) - QEMU_CLANG_CPP := $(CLANG_PATH)/clang++ + QEMU_CLANG_CPP := $(TOOL_BIN_PATH)/clang++ else QEMU_CLANG_CPP := $(ANDROID_CLANG_PATH)/bin/clang++ endif diff --git a/build/envsetup.sh b/build/envsetup.sh index 5e6a761b92..0fe6487416 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -42,19 +42,26 @@ export GCOV_PREFIX_STRIP=7 # display OS version lsb_release -d +export TOOL_BIN_PATH=${MAPLE_ROOT}/tools/bin +mkdir -p ${TOOL_BIN_PATH} OS_VERSION=`lsb_release -r | sed -e "s/^[^0-9]*//" -e "s/\..*//"` if [ "$OS_VERSION" = "16" ] || [ "$OS_VERSION" = "18" ]; then OLD_OS=1 - CLANG_PATH=${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin - QEMU_PATH=/usr/bin + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang++ ${TOOL_BIN_PATH}/clang++ + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang ${TOOL_BIN_PATH}/clang + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib + ln -s -f /usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 else OLD_OS=0 - CLANG_PATH=/usr/bin - QEMU_PATH=${MAPLE_ROOT}/tools/qemu/package/usr/bin + ln -s -f /usr/bin/clang++ ${TOOL_BIN_PATH}/clang++ + ln -s -f /usr/bin/clang ${TOOL_BIN_PATH}/clang + ln -s -f /usr/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar + ln -s -f /usr/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib + ln -s -f ${MAPLE_ROOT}/tools/qemu/package/usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 fi +ln -s -f ${MAPLE_ROOT}/tools/open64_prebuilt/x86/aarch64/bin/clangfe ${TOOL_BIN_PATH}/clangfe export OLD_OS=${OLD_OS} -export CLANG_PATH=${CLANG_PATH} -export QEMU_PATH=${QEMU_PATH} # support multiple ARCH and BUILD_TYPE @@ -99,7 +106,7 @@ echo "Build: $MAPLE_BUILD_TYPE" export MAPLE_BUILD_OUTPUT=${MAPLE_ROOT}/output/${MAPLE_BUILD_TYPE} export MAPLE_EXECUTE_BIN=${MAPLE_ROOT}/output/${MAPLE_BUILD_TYPE}/bin export TEST_BIN=${CASE_ROOT}/driver/script -export PATH=$PATH:${MAPLE_EXECUTE_BIN}:${TEST_BIN} +export PATH=${TOOL_BIN_PATH}:$PATH:${MAPLE_EXECUTE_BIN}:${TEST_BIN} if [ ! -f $MAPLE_ROOT/tools/qemu/package/usr/bin/qemu-aarch64 ] && [ "$OLD_OS" = "0" ]; then echo " " diff --git a/testsuite/driver/src/api/clangfe.py b/testsuite/driver/src/api/clangfe.py index 8ef7c70f59..22c16a53be 100644 --- a/testsuite/driver/src/api/clangfe.py +++ b/testsuite/driver/src/api/clangfe.py @@ -26,5 +26,5 @@ class Clangfe(ShellOperator): self.infile = infile def get_command(self, variables): - self.command = "${MAPLE_ROOT}/tools/open64_prebuilt/x86/aarch64/bin/clangfe -cc1 -emit-llvm -triple aarch64-linux-gnu -D__clang__ -D__BLOCKS__ -isystem /usr/aarch64-linux-gnu/include -isystem /usr/lib/gcc-cross/aarch64-linux-gnu/" + str(Clangfe.aarch64_linux_gnu_version) + "/include " + self.infile + self.command = "clangfe -cc1 -emit-llvm -triple aarch64-linux-gnu -D__clang__ -D__BLOCKS__ -isystem /usr/aarch64-linux-gnu/include -isystem /usr/lib/gcc-cross/aarch64-linux-gnu/" + str(Clangfe.aarch64_linux_gnu_version) + "/include " + self.infile return super().get_final_command(variables) diff --git a/testsuite/driver/src/api/linker.py b/testsuite/driver/src/api/linker.py index 2bfecfc400..54ba045338 100644 --- a/testsuite/driver/src/api/linker.py +++ b/testsuite/driver/src/api/linker.py @@ -22,5 +22,5 @@ class Linker(ShellOperator): self.lib = lib def get_command(self, variables): - self.command = "${CLANG_PATH}/clang++ -g3 -O2 -x assembler-with-cpp -march=armv8-a -target aarch64-linux-gnu -c ${APP}.VtableImpl.s && ${CLANG_PATH}/clang++ ${APP}.VtableImpl.o -L${OUT_ROOT}/aarch64-clang-release/ops/" + self.lib + " -g3 -O2 -march=armv8-a -target aarch64-linux-gnu -fPIC -shared -o ${APP}.so ${OUT_ROOT}/aarch64-clang-release/ops/mrt_module_init.o -fuse-ld=lld -rdynamic -lcore-all -lcommon-bridge -Wl,-z,notext -Wl,-T${OUT_ROOT}/aarch64-clang-release/ops/linker/maplelld.so.lds" + self.command = "clang++ -g3 -O2 -x assembler-with-cpp -march=armv8-a -target aarch64-linux-gnu -c ${APP}.VtableImpl.s && clang++ ${APP}.VtableImpl.o -L${OUT_ROOT}/aarch64-clang-release/ops/" + self.lib + " -g3 -O2 -march=armv8-a -target aarch64-linux-gnu -fPIC -shared -o ${APP}.so ${OUT_ROOT}/aarch64-clang-release/ops/mrt_module_init.o -fuse-ld=lld -rdynamic -lcore-all -lcommon-bridge -Wl,-z,notext -Wl,-T${OUT_ROOT}/aarch64-clang-release/ops/linker/maplelld.so.lds" return super().get_final_command(variables) diff --git a/testsuite/driver/src/mod/O0.py b/testsuite/driver/src/mod/O0.py index 86d95bbe3e..e39134ec23 100644 --- a/testsuite/driver/src/mod/O0.py +++ b/testsuite/driver/src/mod/O0.py @@ -52,7 +52,7 @@ O0 = { ], "run": [ Mplsh( - qemu="${QEMU_PATH}/qemu-aarch64", + qemu="qemu-aarch64", qemu_libc="/usr/aarch64-linux-gnu", qemu_ld_lib=[ "${OUT_ROOT}/aarch64-clang-release/ops/third_party", diff --git a/testsuite/driver/src/mod/O2.py b/testsuite/driver/src/mod/O2.py index b5084aec61..18dfb60bd8 100644 --- a/testsuite/driver/src/mod/O2.py +++ b/testsuite/driver/src/mod/O2.py @@ -52,7 +52,7 @@ O2 = { ], "run": [ Mplsh( - qemu="${QEMU_PATH}/qemu-aarch64", + qemu="qemu-aarch64", qemu_libc="/usr/aarch64-linux-gnu", qemu_ld_lib=[ "${OUT_ROOT}/aarch64-clang-release/ops/third_party", -- Gitee From 539a456917020f36946acfee5f744e5b110f656c Mon Sep 17 00:00:00 2001 From: fuqun Date: Wed, 17 Mar 2021 14:10:57 +0800 Subject: [PATCH 3/6] Delete a modify --- test/maple_aarch64_with_whirl2mpl.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/maple_aarch64_with_whirl2mpl.sh b/test/maple_aarch64_with_whirl2mpl.sh index 9e225204b6..826a8611d2 100755 --- a/test/maple_aarch64_with_whirl2mpl.sh +++ b/test/maple_aarch64_with_whirl2mpl.sh @@ -14,9 +14,8 @@ # set -e -set -x -#[ -n "$MAPLE_ROOT" ] || { echo MAPLE_ROOT not set. Please source envsetup.sh.; exit 1; } +[ -n "$MAPLE_ROOT" ] || { echo MAPLE_ROOT not set. Please source envsetup.sh.; exit 1; } CURRDIR=`pwd` rel=`realpath --relative-to=$MAPLE_ROOT $CURRDIR` -- Gitee From 5b9643aac091fb350b21220c9540f9a73ab6172d Mon Sep 17 00:00:00 2001 From: fuqun Date: Wed, 17 Mar 2021 15:06:16 +0800 Subject: [PATCH 4/6] update tools/setup_tools.sh. Add link in tools/setup_tools.sh. --- tools/setup_tools.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh index a5a29d6153..185cc81ee3 100755 --- a/tools/setup_tools.sh +++ b/tools/setup_tools.sh @@ -157,3 +157,18 @@ if [ ! -f $TOOLS/open64_prebuilt/x86/riscv64/bin/clangfe ]; then mv riscv riscv64 echo Downloaded open64_prebuilt. fi + +if [ "$OLD_OS" == "1" ]; then + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang++ ${TOOL_BIN_PATH}/clang++ + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang ${TOOL_BIN_PATH}/clang + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar + ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib + ln -s -f /usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 +else + ln -s -f /usr/bin/clang++ ${TOOL_BIN_PATH}/clang++ + ln -s -f /usr/bin/clang ${TOOL_BIN_PATH}/clang + ln -s -f /usr/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar + ln -s -f /usr/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib + ln -s -f ${MAPLE_ROOT}/tools/qemu/package/usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 +fi +ln -s -f ${MAPLE_ROOT}/tools/open64_prebuilt/x86/aarch64/bin/clangfe ${TOOL_BIN_PATH}/clangfe \ No newline at end of file -- Gitee From eea1a47af7f2b078f06ffb4c940b0fa3ffdeacc9 Mon Sep 17 00:00:00 2001 From: fuqun Date: Wed, 17 Mar 2021 15:08:36 +0800 Subject: [PATCH 5/6] update build/envsetup.sh. Delete links --- build/envsetup.sh | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/build/envsetup.sh b/build/envsetup.sh index 0fe6487416..8ded25273e 100644 --- a/build/envsetup.sh +++ b/build/envsetup.sh @@ -43,25 +43,12 @@ export GCOV_PREFIX_STRIP=7 lsb_release -d export TOOL_BIN_PATH=${MAPLE_ROOT}/tools/bin -mkdir -p ${TOOL_BIN_PATH} OS_VERSION=`lsb_release -r | sed -e "s/^[^0-9]*//" -e "s/\..*//"` if [ "$OS_VERSION" = "16" ] || [ "$OS_VERSION" = "18" ]; then - OLD_OS=1 - ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang++ ${TOOL_BIN_PATH}/clang++ - ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang ${TOOL_BIN_PATH}/clang - ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar - ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib - ln -s -f /usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 + export OLD_OS=1 else - OLD_OS=0 - ln -s -f /usr/bin/clang++ ${TOOL_BIN_PATH}/clang++ - ln -s -f /usr/bin/clang ${TOOL_BIN_PATH}/clang - ln -s -f /usr/bin/llvm-ar ${TOOL_BIN_PATH}/llvm-ar - ln -s -f /usr/bin/llvm-ranlib ${TOOL_BIN_PATH}/llvm-ranlib - ln -s -f ${MAPLE_ROOT}/tools/qemu/package/usr/bin/qemu-aarch64 ${TOOL_BIN_PATH}/qemu-aarch64 + export OLD_OS=0 fi -ln -s -f ${MAPLE_ROOT}/tools/open64_prebuilt/x86/aarch64/bin/clangfe ${TOOL_BIN_PATH}/clangfe -export OLD_OS=${OLD_OS} # support multiple ARCH and BUILD_TYPE -- Gitee From cd16ac88b4e982ae00d408a5ecb986ca7cc22e5a Mon Sep 17 00:00:00 2001 From: fuqun Date: Wed, 17 Mar 2021 15:09:49 +0800 Subject: [PATCH 6/6] update tools/setup_tools.sh. RT --- tools/setup_tools.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/setup_tools.sh b/tools/setup_tools.sh index 185cc81ee3..f954989caa 100755 --- a/tools/setup_tools.sh +++ b/tools/setup_tools.sh @@ -158,6 +158,7 @@ if [ ! -f $TOOLS/open64_prebuilt/x86/riscv64/bin/clangfe ]; then echo Downloaded open64_prebuilt. fi +mkdir -p ${TOOL_BIN_PATH} if [ "$OLD_OS" == "1" ]; then ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang++ ${TOOL_BIN_PATH}/clang++ ln -s -f ${MAPLE_ROOT}/tools/clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-16.04/bin/clang ${TOOL_BIN_PATH}/clang -- Gitee