diff options
| author | Andreas Schwab <schwab@suse.de> | 2020-05-04 17:29:11 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@suse.de> | 2020-05-06 14:12:57 +0200 |
| commit | cb5ecbc49b79aa15beb9fee1e3bf85bfc50b538f (patch) | |
| tree | 0a528da8693c6372af798c1607e561c493f5fd83 /gcc | |
| parent | 093d95fe34fd9032fee108e2b06c8a3aa0f52d15 (diff) | |
| download | gcc-cb5ecbc49b79aa15beb9fee1e3bf85bfc50b538f.zip gcc-cb5ecbc49b79aa15beb9fee1e3bf85bfc50b538f.tar.gz gcc-cb5ecbc49b79aa15beb9fee1e3bf85bfc50b538f.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/config/aarch64/driver-aarch64.c | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ae6dd06..0adda49 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 0ccd200..d1229e6 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 { |