From: Andreas Schwab <schwab@suse.de>
Date: Mon, 4 May 2020 15:29:11 +0000 (+0200)
Subject: aarch64: fix conflicting declarations
X-Git-Tag: misc/first-auto-changelog~481
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb5ecbc49b79aa15beb9fee1e3bf85bfc50b538f;p=thirdparty%2Fgcc.git

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 ae6dd069578d..0adda498ccb8 100644
--- 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 0ccd200e3308..d1229e676806 100644
--- 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
 {