From 07d7f4b18c596feb3bdf6de55ef78c014512320a Mon Sep 17 00:00:00 2001 From: harry_jzj Date: Wed, 28 May 2025 18:46:50 +0800 Subject: [PATCH 1/3] [lld]add ld option --- lld/ELF/Driver.cpp | 3 ++- lld/ELF/Options.td | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index daf16ed3ca44..56b0761f4776 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -1126,7 +1126,8 @@ static void readConfigs(opt::InputArgList &args) { config->filterList = args::getStrings(args, OPT_filter); config->fini = args.getLastArgValue(OPT_fini, "_fini"); config->fixCortexA53Errata843419 = args.hasArg(OPT_fix_cortex_a53_843419) && - !args.hasArg(OPT_relocatable); + !args.hasArg(OPT_relocatable) && + !args.hasArg(OPT_ignore_fix_cortex_a53_843419); config->fixCortexA8 = args.hasArg(OPT_fix_cortex_a8) && !args.hasArg(OPT_relocatable); config->fortranCommon = diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td index 4e6c20f5c7f6..43530472a440 100644 --- a/lld/ELF/Options.td +++ b/lld/ELF/Options.td @@ -216,6 +216,9 @@ defm fini: Eq<"fini", "Specify a finalizer function">, MetaVarName<"">; def fix_cortex_a53_843419: F<"fix-cortex-a53-843419">, HelpText<"Apply fixes for AArch64 Cortex-A53 erratum 843419">; +def ignore_fix_cortex_a53_843419: F<"ignore-fix-cortex-a53-843419">, + HelpText<"Ignore apply fixes for AArch64 Cortex-A53 erratum 843419">; + def fix_cortex_a8: F<"fix-cortex-a8">, HelpText<"Apply fixes for ARM Cortex-A8 erratum 657417">; -- Gitee From 83badf1664c6388a9a4c1c2f351907384c029236 Mon Sep 17 00:00:00 2001 From: harry_jzj Date: Wed, 28 May 2025 18:46:50 +0800 Subject: [PATCH 2/3] [lld]add ld option Signed-off-by: harry_jzj --- lld/ELF/Driver.cpp | 3 ++- lld/ELF/Options.td | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index daf16ed3ca44..56b0761f4776 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -1126,7 +1126,8 @@ static void readConfigs(opt::InputArgList &args) { config->filterList = args::getStrings(args, OPT_filter); config->fini = args.getLastArgValue(OPT_fini, "_fini"); config->fixCortexA53Errata843419 = args.hasArg(OPT_fix_cortex_a53_843419) && - !args.hasArg(OPT_relocatable); + !args.hasArg(OPT_relocatable) && + !args.hasArg(OPT_ignore_fix_cortex_a53_843419); config->fixCortexA8 = args.hasArg(OPT_fix_cortex_a8) && !args.hasArg(OPT_relocatable); config->fortranCommon = diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td index 4e6c20f5c7f6..43530472a440 100644 --- a/lld/ELF/Options.td +++ b/lld/ELF/Options.td @@ -216,6 +216,9 @@ defm fini: Eq<"fini", "Specify a finalizer function">, MetaVarName<"">; def fix_cortex_a53_843419: F<"fix-cortex-a53-843419">, HelpText<"Apply fixes for AArch64 Cortex-A53 erratum 843419">; +def ignore_fix_cortex_a53_843419: F<"ignore-fix-cortex-a53-843419">, + HelpText<"Ignore apply fixes for AArch64 Cortex-A53 erratum 843419">; + def fix_cortex_a8: F<"fix-cortex-a8">, HelpText<"Apply fixes for ARM Cortex-A8 erratum 657417">; -- Gitee From 88d59fd4336e302990b79da9c7d5da41049a3db9 Mon Sep 17 00:00:00 2001 From: harry_jzj Date: Wed, 28 May 2025 11:42:41 +0000 Subject: [PATCH 3/3] Revert "[lld]add ld option" This reverts commit 83badf1664c6388a9a4c1c2f351907384c029236. --- lld/ELF/Driver.cpp | 3 +-- lld/ELF/Options.td | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lld/ELF/Driver.cpp b/lld/ELF/Driver.cpp index 56b0761f4776..daf16ed3ca44 100644 --- a/lld/ELF/Driver.cpp +++ b/lld/ELF/Driver.cpp @@ -1126,8 +1126,7 @@ static void readConfigs(opt::InputArgList &args) { config->filterList = args::getStrings(args, OPT_filter); config->fini = args.getLastArgValue(OPT_fini, "_fini"); config->fixCortexA53Errata843419 = args.hasArg(OPT_fix_cortex_a53_843419) && - !args.hasArg(OPT_relocatable) && - !args.hasArg(OPT_ignore_fix_cortex_a53_843419); + !args.hasArg(OPT_relocatable); config->fixCortexA8 = args.hasArg(OPT_fix_cortex_a8) && !args.hasArg(OPT_relocatable); config->fortranCommon = diff --git a/lld/ELF/Options.td b/lld/ELF/Options.td index 43530472a440..4e6c20f5c7f6 100644 --- a/lld/ELF/Options.td +++ b/lld/ELF/Options.td @@ -216,9 +216,6 @@ defm fini: Eq<"fini", "Specify a finalizer function">, MetaVarName<"">; def fix_cortex_a53_843419: F<"fix-cortex-a53-843419">, HelpText<"Apply fixes for AArch64 Cortex-A53 erratum 843419">; -def ignore_fix_cortex_a53_843419: F<"ignore-fix-cortex-a53-843419">, - HelpText<"Ignore apply fixes for AArch64 Cortex-A53 erratum 843419">; - def fix_cortex_a8: F<"fix-cortex-a8">, HelpText<"Apply fixes for ARM Cortex-A8 erratum 657417">; -- Gitee