From 1945532b9dc82b29b0a36c9fb25918dc332ea2fa Mon Sep 17 00:00:00 2001 From: zhuoli Date: Sat, 26 Nov 2022 19:50:38 +0800 Subject: [PATCH 1/2] fixed b739223 from https://gitee.com/zhuoli72/ark_ts2abc/pulls/710 Remove static linkage for ark binaries ISSUE: I630JA Signed-off-by: zhuoli Change-Id: Iad9caf1c57fe4928c62aa5a5873900ed52d51198 --- es2panda/BUILD.gn | 13 ------------- merge_abc/BUILD.gn | 12 ------------ 2 files changed, 25 deletions(-) diff --git a/es2panda/BUILD.gn b/es2panda/BUILD.gn index ae3a711f2f..7acafbb3dd 100644 --- a/es2panda/BUILD.gn +++ b/es2panda/BUILD.gn @@ -435,22 +435,9 @@ ohos_executable("es2panda") { } else { libs = [ libcpp_static_lib ] } - - # for statically linking pthread - ldflags += [ - "-Wl,--whole-archive", - "-lrt", - "-lpthread", - "-Wl,--no-whole-archive", - ] - } - - if (!is_mac) { - static_link = true } if (!use_musl) { - static_link = false ldflags += [ "-lc++" ] } diff --git a/merge_abc/BUILD.gn b/merge_abc/BUILD.gn index be0d3d7297..986d2ccb65 100644 --- a/merge_abc/BUILD.gn +++ b/merge_abc/BUILD.gn @@ -187,25 +187,13 @@ ohos_executable("merge_abc") { defines = [ "PANDA_TARGET_LINUX" ] - # for statically linking pthread - ldflags += [ - "-Wl,--whole-archive", - "-lrt", - "-lpthread", - "-Wl,--no-whole-archive", - ] } else if (is_mac) { defines = [ "PANDA_TARGET_MACOS" ] } else if (is_mingw) { defines = [ "PANDA_TARGET_WINDOWS" ] } - if (!is_mac) { - static_link = true - } - if (!use_musl) { - static_link = false ldflags += [ "-lc++" ] } -- Gitee From 59f5ec3547888e04296f24b09691ecbf31f678ff Mon Sep 17 00:00:00 2001 From: zhuoli Date: Sat, 26 Nov 2022 19:48:05 +0800 Subject: [PATCH 2/2] fixed d57ab88 from https://gitee.com/zhuoli72/ark_ts2abc/pulls/710 Fix missing regKind for regAlloc ISSUE: I630JA Signed-off-by: zhuoli Change-Id: If2adc40dce2416d34cc826403676751c48906e4f --- es2panda/compiler/core/regAllocator.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/es2panda/compiler/core/regAllocator.h b/es2panda/compiler/core/regAllocator.h index 202d43a126..59c9291862 100644 --- a/es2panda/compiler/core/regAllocator.h +++ b/es2panda/compiler/core/regAllocator.h @@ -93,9 +93,8 @@ private: regsKind->push_back(formatItem.Kind()); } - if (formatItem.IsVReg()) { + if (formatItem.IsVReg() && limit_ == 0) { limit_ = 1 << formatItem.Bitwidth(); - break; } } -- Gitee