From 1ec77eedd529f81b1dc99cda9818f1ef9e952b96 Mon Sep 17 00:00:00 2001
From: Matthew Malcomson <matthew.malcomson@arm.com>
Date: Fri, 24 May 2019 10:39:38 +0000
Subject: [PATCH] [aarch64] Change two function declaration types
Commit r271514 missed changing the type of two functions in
aarch64-protos.h. The function definitions had been updated to use
uint64_t while the function declarations had been missed.
They were missed since I only tested the patch on aarch64 where
`unsigned long` is the same as `uint64_t`.
This patch updates these declarations in aarch64-protos.h.
Tested by building an aarch64 cross-compiler on arm-none-linux-gnu (so
that `unsigned long` and `uint64_t` are different and would give error
messages), and bootstrapping on aarch64-none-linux-gnu.
Also manually tested command line options to see that
-march=armv8-a+typo prints out the expected flags while using the new
feature flags does not complain about missing flags.
gcc/ChangeLog:
2019-05-24 Matthew Malcomson <matthew.malcomson@arm.com>
PR target/90588
* common/config/aarch64/aarch64-common.c
(aarch64_rewrite_selected_cpu): Change local temporary variable
type from unsigned long to uint64_t.
* config/aarch64/aarch64-protos.h (aarch64_parse_extension,
aarch64_get_extension_string_for_isa_flags): Change declaration to
match new definition by replacing unsigned long with uint64_t.
From-SVN: r271599
---
gcc/ChangeLog | 10 ++++++++++
gcc/common/config/aarch64/aarch64-common.c | 2 +-
gcc/config/aarch64/aarch64-protos.h | 5 ++---
3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0cf0edbd36e7..daaa8c8f7c5d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2019-05-24 Matthew Malcomson <matthew.malcomson@arm.com>
+
+ PR target/90588
+ * common/config/aarch64/aarch64-common.c
+ (aarch64_rewrite_selected_cpu): Change local temporary variable
+ type from unsigned long to uint64_t.
+ * config/aarch64/aarch64-protos.h (aarch64_parse_extension,
+ aarch64_get_extension_string_for_isa_flags): Change declaration to
+ match new definition by replacing unsigned long with uint64_t.
+
2019-05-24 Jakub Jelinek <jakub@redhat.com>
PR target/90568
diff --git a/gcc/common/config/aarch64/aarch64-common.c b/gcc/common/config/aarch64/aarch64-common.c
index f90510565898..07c032539513 100644
--- a/gcc/common/config/aarch64/aarch64-common.c
+++ b/gcc/common/config/aarch64/aarch64-common.c
@@ -541,7 +541,7 @@ aarch64_rewrite_selected_cpu (const char *name)
|| a_to_an->arch == aarch64_no_arch)
fatal_error (input_location, "unknown value %qs for %<-mcpu%>", name);
- unsigned long extensions = p_to_a->flags;
+ uint64_t extensions = p_to_a->flags;
aarch64_parse_extension (extension_str.c_str (), &extensions, NULL);
std::string outstr = a_to_an->arch_name
diff --git a/gcc/config/aarch64/aarch64-protos.h b/gcc/config/aarch64/aarch64-protos.h
index b6c0d0a8eb6c..a0723266f224 100644
--- a/gcc/config/aarch64/aarch64-protos.h
+++ b/gcc/config/aarch64/aarch64-protos.h
@@ -624,11 +624,10 @@ bool aarch64_handle_option (struct gcc_options *, struct gcc_options *,
const struct cl_decoded_option *, location_t);
const char *aarch64_rewrite_selected_cpu (const char *name);
enum aarch64_parse_opt_result aarch64_parse_extension (const char *,
- unsigned long *,
+ uint64_t *,
std::string *);
void aarch64_get_all_extension_candidates (auto_vec<const char *> *candidates);
-std::string aarch64_get_extension_string_for_isa_flags (unsigned long,
- unsigned long);
+std::string aarch64_get_extension_string_for_isa_flags (uint64_t, uint64_t);
/* Defined in aarch64-d.c */
extern void aarch64_d_target_versions (void);
--
GitLab