From c5f91c05acee729b9e2b343989c75fa61120da71 Mon Sep 17 00:00:00 2001 From: arvinzzz Date: Mon, 8 May 2023 22:22:11 +0800 Subject: [PATCH] disable backward cfi for arkcompiler Test: build Issue: I71CPO Signed-off-by: arvinzzz Change-Id: Ib71d6c8f4db95a10574c123c222a935f653b51b9 --- assembler/BUILD.gn | 2 ++ bytecode_optimizer/BUILD.gn | 2 ++ compiler/BUILD.gn | 2 ++ disassembler/BUILD.gn | 2 ++ gn/ark-third-party/icu/BUILD.gn | 5 +++++ gn/ark-third-party/securec/BUILD.gn | 2 ++ gn/ark-third-party/zlib/BUILD.gn | 1 + libark_defect_scan_aux/BUILD.gn | 2 ++ libpandabase/BUILD.gn | 2 ++ libpandafile/BUILD.gn | 2 ++ libziparchive/BUILD.gn | 2 ++ 11 files changed, 24 insertions(+) diff --git a/assembler/BUILD.gn b/assembler/BUILD.gn index 022c1c9073..639a7f4f82 100644 --- a/assembler/BUILD.gn +++ b/assembler/BUILD.gn @@ -90,6 +90,7 @@ source_set("libarkassembler_static") { } ohos_shared_library("libarkassembler") { + stack_protector_ret = false deps = [ ":libarkassembler_static" ] if (!is_standard_system) { @@ -127,6 +128,7 @@ source_set("libarkassembler_frontend_set_static") { } ohos_static_library("libarkassembler_frontend_static") { + stack_protector_ret = false deps = [ ":libarkassembler_frontend_set_static" ] part_name = "runtime_core" diff --git a/bytecode_optimizer/BUILD.gn b/bytecode_optimizer/BUILD.gn index c0dea89a90..c83c879cfb 100644 --- a/bytecode_optimizer/BUILD.gn +++ b/bytecode_optimizer/BUILD.gn @@ -42,6 +42,7 @@ libarkbytecodeopt_configs = [ ] ohos_shared_library("libarkbytecodeopt") { + stack_protector_ret = false sources = libarkbytecodeopt_sources configs = libarkbytecodeopt_configs @@ -69,6 +70,7 @@ ohos_shared_library("libarkbytecodeopt") { } ohos_static_library("libarkbytecodeopt_frontend_static") { + stack_protector_ret = false sources = libarkbytecodeopt_sources configs = libarkbytecodeopt_configs diff --git a/compiler/BUILD.gn b/compiler/BUILD.gn index 221d90b8f0..1ca2799fbf 100644 --- a/compiler/BUILD.gn +++ b/compiler/BUILD.gn @@ -89,6 +89,7 @@ libarkcompiler_configs = [ ] ohos_shared_library("libarkcompiler") { + stack_protector_ret = false sources = libarkcompiler_sources configs = libarkcompiler_configs @@ -145,6 +146,7 @@ ohos_shared_library("libarkcompiler") { } ohos_static_library("libarkcompiler_frontend_static") { + stack_protector_ret = false sources = libarkcompiler_sources configs = libarkcompiler_configs diff --git a/disassembler/BUILD.gn b/disassembler/BUILD.gn index b93fe087e0..c1007f76b3 100644 --- a/disassembler/BUILD.gn +++ b/disassembler/BUILD.gn @@ -52,6 +52,7 @@ foreach(plugin, enabled_plugins) { } ohos_shared_library("arkdisassembler") { + stack_protector_ret = false sources = arkdisassembler_sources include_dirs = [ @@ -87,6 +88,7 @@ ohos_shared_library("arkdisassembler") { } ohos_static_library("arkdisassembler_frontend_static") { + stack_protector_ret = false sources = arkdisassembler_sources include_dirs = [ diff --git a/gn/ark-third-party/icu/BUILD.gn b/gn/ark-third-party/icu/BUILD.gn index cb7df2fd0e..af1bf8d4db 100644 --- a/gn/ark-third-party/icu/BUILD.gn +++ b/gn/ark-third-party/icu/BUILD.gn @@ -24,6 +24,7 @@ config("icu_config") { } ohos_static_library("static_icustubdata") { + stack_protector_ret = false configs = [ ":icu_config", "//build/config/compiler:rtti", @@ -489,6 +490,7 @@ icu_i18n_source = [ ] ohos_shared_library("shared_icuuc") { + stack_protector_ret = false configs = [ ":icu_config", "//build/config/compiler:rtti", @@ -532,6 +534,7 @@ ohos_shared_library("shared_icuuc") { } ohos_shared_library("shared_icui18n") { + stack_protector_ret = false sources = icu_i18n_source configs = [ ":icu_config", @@ -577,6 +580,7 @@ ohos_shared_library("shared_icui18n") { } ohos_static_library("static_icuuc") { + stack_protector_ret = false configs = [ ":icu_config", "//build/config/compiler:rtti", @@ -626,6 +630,7 @@ ohos_static_library("static_icuuc") { } ohos_static_library("static_icui18n") { + stack_protector_ret = false sources = icu_i18n_source configs = [ ":icu_config", diff --git a/gn/ark-third-party/securec/BUILD.gn b/gn/ark-third-party/securec/BUILD.gn index 8ecd4343eb..e3bc056b37 100644 --- a/gn/ark-third-party/securec/BUILD.gn +++ b/gn/ark-third-party/securec/BUILD.gn @@ -61,6 +61,7 @@ libsec_sources = [ ] ohos_static_library("libc_secstatic") { + stack_protector_ret = false sources = libsec_sources public_configs = [ ":libsec_public_config" ] cflags = [ @@ -75,6 +76,7 @@ ohos_static_library("libc_secstatic") { } ohos_shared_library("libc_secshared") { + stack_protector_ret = false sources = libsec_sources public_configs = [ ":libsec_public_config" ] cflags = [ diff --git a/gn/ark-third-party/zlib/BUILD.gn b/gn/ark-third-party/zlib/BUILD.gn index bcb4d4b47b..09b1c802b6 100644 --- a/gn/ark-third-party/zlib/BUILD.gn +++ b/gn/ark-third-party/zlib/BUILD.gn @@ -26,6 +26,7 @@ config("zlib_config") { } ohos_static_library("libz") { + stack_protector_ret = false sources = [ "adler32.c", "compress.c", diff --git a/libark_defect_scan_aux/BUILD.gn b/libark_defect_scan_aux/BUILD.gn index 6b1dcc0bba..cee04e5f03 100644 --- a/libark_defect_scan_aux/BUILD.gn +++ b/libark_defect_scan_aux/BUILD.gn @@ -56,6 +56,7 @@ ark_isa_gen("defectscanaux_intrinsic") { } ohos_shared_library("libark_defect_scan_aux") { + stack_protector_ret = false sources = libarkdefectscanaux_sources configs = [ ":defectscanaux_public_config" ] @@ -75,6 +76,7 @@ ohos_shared_library("libark_defect_scan_aux") { } ohos_static_library("libark_defect_scan_aux_static_test") { + stack_protector_ret = false sources = libarkdefectscanaux_sources configs = [ ":defectscanaux_public_config" ] diff --git a/libpandabase/BUILD.gn b/libpandabase/BUILD.gn index 9c70b42294..de039bba31 100644 --- a/libpandabase/BUILD.gn +++ b/libpandabase/BUILD.gn @@ -192,6 +192,7 @@ source_set("libarkbase_static") { } ohos_shared_library("libarkbase") { + stack_protector_ret = false deps = [ ":libarkbase_static" ] if (!is_mingw && !is_mac) { output_extension = "so" @@ -212,6 +213,7 @@ source_set("libarkbase_frontend_set_static") { } ohos_static_library("libarkbase_frontend_static") { + stack_protector_ret = false deps = [ ":libarkbase_frontend_set_static" ] part_name = "runtime_core" diff --git a/libpandafile/BUILD.gn b/libpandafile/BUILD.gn index b2130f89a6..7ab2d5086d 100644 --- a/libpandafile/BUILD.gn +++ b/libpandafile/BUILD.gn @@ -105,6 +105,7 @@ source_set("libarkfile_static_fuzz") { } ohos_shared_library("libarkfile") { + stack_protector_ret = false deps = [ ":libarkfile_static" ] if (!is_standard_system) { @@ -132,6 +133,7 @@ source_set("libarkfile_frontend_set_static") { } ohos_static_library("libarkfile_frontend_static") { + stack_protector_ret = false deps = [ ":libarkfile_frontend_set_static" ] part_name = "runtime_core" diff --git a/libziparchive/BUILD.gn b/libziparchive/BUILD.gn index 647476a6f9..b387e6e769 100644 --- a/libziparchive/BUILD.gn +++ b/libziparchive/BUILD.gn @@ -48,6 +48,7 @@ source_set("libarkziparchive_static") { } ohos_shared_library("libarkziparchive") { + stack_protector_ret = false deps = [ ":libarkziparchive_static" ] if (!is_standard_system) { @@ -80,6 +81,7 @@ source_set("libarkziparchive_frontend_set_static") { } ohos_static_library("libarkziparchive_frontend_static") { + stack_protector_ret = false deps = [ ":libarkziparchive_frontend_set_static" ] part_name = "runtime_core"