aarch64: fix conflicting declarations

Message ID mvmy2q7puqp.fsf@suse.de
State New
Headers show
Series
  • aarch64: fix conflicting declarations
Related show

Commit Message

Andreas Schwab May 4, 2020, 3:47 p.m.
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.
---
 gcc/config/aarch64/driver-aarch64.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

-- 
2.26.2


-- 
Andreas Schwab, SUSE Labs, schwab@suse.de
GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7
"And now for something completely different."

Comments

Richard Sandiford May 6, 2020, 11:43 a.m. | #1
Andreas Schwab <schwab@suse.de> writes:
> 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.


OK, thanks.

Richard

Patch

diff --git a/gcc/config/aarch64/driver-aarch64.c b/gcc/config/aarch64/driver-aarch64.c
index 0ccd200e330..d1229e67680 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
 {