public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc(refs/vendors/ARM/heads/gcs-13)] aarch64, arm: Remove accepted_branch_protection_string
@ 2024-02-14 15:36 Szabolcs Nagy
0 siblings, 0 replies; only message in thread
From: Szabolcs Nagy @ 2024-02-14 15:36 UTC (permalink / raw)
To: gcc-cvs
https://gcc.gnu.org/g:dff7cb99117846cbb14fc9af9e3796f9fb986d4b
commit dff7cb99117846cbb14fc9af9e3796f9fb986d4b
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Mon Jun 12 13:02:08 2023 +0100
aarch64,arm: Remove accepted_branch_protection_string
On aarch64 this caused ICE with pragma push_options since
commit ae54c1b09963779c5c3914782324ff48af32e2f1
Author: Wilco Dijkstra <wilco.dijkstra@arm.com>
CommitDate: 2022-06-01 18:13:57 +0100
AArch64: Cleanup option processing code
The failure is at pop_options:
internal compiler error: ‘global_options’ are modified in local context
On arm the variable was unused.
gcc/ChangeLog:
* config/aarch64/aarch64.cc (aarch64_override_options_after_change_1):
Do not override branch_protection options.
(aarch64_override_options): Remove accepted_branch_protection_string.
* config/arm/aarch-common.cc (BRANCH_PROTECT_STR_MAX): Remove.
(aarch_parse_branch_protection): Remove
accepted_branch_protection_string.
* config/arm/arm.cc: Likewise.
(cherry picked from commit d83acace704927ee351968258c8a8cd39e305d03)
Diff:
---
gcc/config/aarch64/aarch64.cc | 10 +---------
gcc/config/arm/aarch-common.cc | 16 ----------------
gcc/config/arm/arm.cc | 2 --
3 files changed, 1 insertion(+), 27 deletions(-)
diff --git a/gcc/config/aarch64/aarch64.cc b/gcc/config/aarch64/aarch64.cc
index 410e0b38ece9..6c91d80dd2f9 100644
--- a/gcc/config/aarch64/aarch64.cc
+++ b/gcc/config/aarch64/aarch64.cc
@@ -320,8 +320,6 @@ bool aarch64_pcrelative_literal_loads;
/* Global flag for whether frame pointer is enabled. */
bool aarch64_use_frame_pointer;
-char *accepted_branch_protection_string = NULL;
-
/* Support for command line parsing of boolean flags in the tuning
structures. */
struct aarch64_flag_desc
@@ -17833,12 +17831,6 @@ aarch64_adjust_generic_arch_tuning (struct tune_params ¤t_tune)
static void
aarch64_override_options_after_change_1 (struct gcc_options *opts)
{
- if (accepted_branch_protection_string)
- {
- opts->x_aarch64_branch_protection_string
- = xstrdup (accepted_branch_protection_string);
- }
-
/* PR 70044: We have to be careful about being called multiple times for the
same function. This means all changes should be repeatable. */
@@ -18434,7 +18426,7 @@ aarch64_override_options (void)
/* Return address signing is currently not supported for ILP32 targets. For
LP64 targets use the configured option in the absence of a command-line
option for -mbranch-protection. */
- if (!TARGET_ILP32 && accepted_branch_protection_string == NULL)
+ if (!TARGET_ILP32 && aarch64_branch_protection_string == NULL)
{
#ifdef TARGET_ENABLE_PAC_RET
aarch_ra_sign_scope = AARCH_FUNCTION_NON_LEAF;
diff --git a/gcc/config/arm/aarch-common.cc b/gcc/config/arm/aarch-common.cc
index 5b96ff4c2e89..cbc7f68a8bf6 100644
--- a/gcc/config/arm/aarch-common.cc
+++ b/gcc/config/arm/aarch-common.cc
@@ -659,9 +659,6 @@ arm_md_asm_adjust (vec<rtx> &outputs, vec<rtx> & /*inputs*/,
return saw_asm_flag ? seq : NULL;
}
-#define BRANCH_PROTECT_STR_MAX 255
-extern char *accepted_branch_protection_string;
-
static enum aarch_parse_opt_result
aarch_handle_no_branch_protection (char* str, char* rest)
{
@@ -812,19 +809,6 @@ aarch_parse_branch_protection (const char *const_str, char** last_str)
else
*last_str = NULL;
}
-
- if (res == AARCH_PARSE_OK)
- {
- /* If needed, alloc the accepted string then copy in const_str.
- Used by override_option_after_change_1. */
- if (!accepted_branch_protection_string)
- accepted_branch_protection_string
- = (char *) xmalloc (BRANCH_PROTECT_STR_MAX + 1);
- strncpy (accepted_branch_protection_string, const_str,
- BRANCH_PROTECT_STR_MAX + 1);
- /* Forcibly null-terminate. */
- accepted_branch_protection_string[BRANCH_PROTECT_STR_MAX] = '\0';
- }
return res;
}
diff --git a/gcc/config/arm/arm.cc b/gcc/config/arm/arm.cc
index bf7ff9a97048..5f45bd10f202 100644
--- a/gcc/config/arm/arm.cc
+++ b/gcc/config/arm/arm.cc
@@ -2420,8 +2420,6 @@ const struct tune_params arm_fa726te_tune =
tune_params::SCHED_AUTOPREF_OFF
};
-char *accepted_branch_protection_string = NULL;
-
/* Auto-generated CPU, FPU and architecture tables. */
#include "arm-cpu-data.h"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2024-02-14 15:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-14 15:36 [gcc(refs/vendors/ARM/heads/gcs-13)] aarch64, arm: Remove accepted_branch_protection_string Szabolcs Nagy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).