aarch64: fix conflicting declarations

aarch64_get_extension_string_for_isa_flags is declared in
"aarch64-protos.h", use that instead of re-declaring it improperly.

	* config/aarch64/driver-aarch64.c: Include "aarch64-protos.h".
	(aarch64_get_extension_string_for_isa_flags): Don't declare.

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ae6dd069578d6cada7099208b1010d7736fd5b85..0adda498ccb886a345a2d486e535b9b050d03697 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-06  Andreas Schwab  <schwab@suse.de>
+
+       * config/aarch64/driver-aarch64.c: Include "aarch64-protos.h".
+       (aarch64_get_extension_string_for_isa_flags): Don't declare.
+
 2020-05-06  Richard Biener  <rguenther@suse.de>
 
        PR middle-end/94964

diff --git a/gcc/config/aarch64/driver-aarch64.c b/gcc/config/aarch64/driver-aarch64.c
index 0ccd200e3308bf4e11d5326fbe67fb592eebdcff..d1229e676806f9607c258e5d678fb3175fadf1c2 100644 (file)
--- a/gcc/config/aarch64/driver-aarch64.c
+++ b/gcc/config/aarch64/driver-aarch64.c
@@ -24,10 +24,7 @@
 #include "system.h"
 #include "coretypes.h"
 #include "tm.h"
-
-/* Defined in common/config/aarch64/aarch64-common.c.  */
-std::string aarch64_get_extension_string_for_isa_flags (unsigned long,
-                                                       unsigned long);
+#include "aarch64-protos.h"
 
 struct aarch64_arch_extension
 {