From cb5ecbc49b79aa15beb9fee1e3bf85bfc50b538f Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Mon, 4 May 2020 17:29:11 +0200 Subject: [PATCH] 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. --- gcc/ChangeLog | 5 +++++ gcc/config/aarch64/driver-aarch64.c | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae6dd069578..0adda498ccb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2020-05-06 Andreas Schwab + + * config/aarch64/driver-aarch64.c: Include "aarch64-protos.h". + (aarch64_get_extension_string_for_isa_flags): Don't declare. + 2020-05-06 Richard Biener PR middle-end/94964 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 { -- 2.30.2