Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-25 08:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix clang compile time warning about optarg parameter shadowing optarg global variable.

Browse Source
This commit is contained in:
Nick Clifton
2024-12-05 09:58:06 +00:00
parent 38b2f5b99b
commit a042adc985
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ld/emultempl/aarch64elf.em
View File

@@ -354,34 +354,34 @@ aarch64_elf_create_output_section_statements (void)
} }
static bool static bool
aarch64_parse_feature_report_option (const char *optarg, aarch64_parse_feature_report_option (const char *_optarg,
const char *report_opt, const char *report_opt,
const size_t report_opt_len, const size_t report_opt_len,
aarch64_feature_marking_report *level) aarch64_feature_marking_report *level)
{ {
if (strncmp (optarg, report_opt, report_opt_len) != 0) if (strncmp (_optarg, report_opt, report_opt_len) != 0)
return false; return false;
if (strlen (optarg) == report_opt_len if (strlen (_optarg) == report_opt_len
|| strcmp (optarg + report_opt_len, "=warning") == 0) || strcmp (_optarg + report_opt_len, "=warning") == 0)
*level = MARKING_WARN; *level = MARKING_WARN;
else if (strcmp (optarg + report_opt_len, "=none") == 0) else if (strcmp (_optarg + report_opt_len, "=none") == 0)
*level = MARKING_NONE; *level = MARKING_NONE;
else if (strcmp (optarg + report_opt_len, "=error") == 0) else if (strcmp (_optarg + report_opt_len, "=error") == 0)
*level = MARKING_ERROR; *level = MARKING_ERROR;
else else
einfo (_("%X%P: error: unrecognized value '-z %s'\n"), optarg); einfo (_("%X%P: error: unrecognized value '-z %s'\n"), _optarg);
return true; return true;
} }
static bool static bool
aarch64_parse_bti_report_option (const char *optarg) aarch64_parse_bti_report_option (const char *_optarg)
{ {
#define BTI_REPORT "bti-report" #define BTI_REPORT "bti-report"
#define BTI_REPORT_LEN COMPILE_TIME_STRLEN (BTI_REPORT) #define BTI_REPORT_LEN COMPILE_TIME_STRLEN (BTI_REPORT)
return aarch64_parse_feature_report_option (optarg, BTI_REPORT, return aarch64_parse_feature_report_option (_optarg, BTI_REPORT,
BTI_REPORT_LEN, &sw_protections.bti_report); BTI_REPORT_LEN, &sw_protections.bti_report);
#undef BTI_REPORT #undef BTI_REPORT
@@ -389,12 +389,12 @@ aarch64_parse_bti_report_option (const char *optarg)
} }
static bool static bool
aarch64_parse_gcs_report_option (const char *optarg) aarch64_parse_gcs_report_option (const char *_optarg)
{ {
#define GCS_REPORT "gcs-report" #define GCS_REPORT "gcs-report"
#define GCS_REPORT_LEN COMPILE_TIME_STRLEN (GCS_REPORT) #define GCS_REPORT_LEN COMPILE_TIME_STRLEN (GCS_REPORT)
return aarch64_parse_feature_report_option (optarg, GCS_REPORT, return aarch64_parse_feature_report_option (_optarg, GCS_REPORT,
GCS_REPORT_LEN, &sw_protections.gcs_report); GCS_REPORT_LEN, &sw_protections.gcs_report);
#undef GCS_REPORT #undef GCS_REPORT
@@ -402,22 +402,22 @@ aarch64_parse_gcs_report_option (const char *optarg)
} }
static bool static bool
aarch64_parse_gcs_option (const char *optarg) aarch64_parse_gcs_option (const char *_optarg)
{ {
#define GCS "gcs" #define GCS "gcs"
#define GCS_LEN COMPILE_TIME_STRLEN (GCS) #define GCS_LEN COMPILE_TIME_STRLEN (GCS)
if (strncmp (optarg, GCS, GCS_LEN) != 0) if (strncmp (_optarg, GCS, GCS_LEN) != 0)
return false; return false;
if (strcmp (optarg + GCS_LEN, "=always") == 0) if (strcmp (_optarg + GCS_LEN, "=always") == 0)
sw_protections.gcs_type = GCS_ALWAYS; sw_protections.gcs_type = GCS_ALWAYS;
else if (strcmp (optarg + GCS_LEN, "=never") == 0) else if (strcmp (_optarg + GCS_LEN, "=never") == 0)
sw_protections.gcs_type = GCS_NEVER; sw_protections.gcs_type = GCS_NEVER;
else if (strcmp (optarg + GCS_LEN, "=implicit") == 0) else if (strcmp (_optarg + GCS_LEN, "=implicit") == 0)
sw_protections.gcs_type = GCS_IMPLICIT; sw_protections.gcs_type = GCS_IMPLICIT;
else else
einfo (_("%X%P: error: unrecognized value '-z %s'\n"), optarg); einfo (_("%X%P: error: unrecognized value '-z %s'\n"), _optarg);
return true; return true;