diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-23 15:49:02 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-03-23 15:49:02 +0000 |
| commit | 3dc4e652da19afc1349dfee4bfb6609093ae605a (patch) | |
| tree | 6301713ab4847b274e57c7194ebfcb68cc257a95 | |
| parent | c0ec2fc2c0f0de7423ea09f55e08aec9be81305f (diff) | |
| download | gcc-3dc4e652da19afc1349dfee4bfb6609093ae605a.tar.gz | |
PR bootstrap/65522
* ipa-devirt.c: Remove duplicate demangle.h include.
* adadecode.c (ada_demangle): Guard with IN_RTS instead of IN_GCC.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221599 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/adadecode.c | 4 | ||||
| -rw-r--r-- | gcc/ipa-devirt.c | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a5eb8c49630..ae062f89810 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,8 @@ 2015-03-23 Jakub Jelinek <jakub@redhat.com> + PR bootstrap/65522 + * ipa-devirt.c: Remove duplicate demangle.h include. + PR target/65504 * config/i386/i386.c (ix86_copy_addr_to_reg): Set REG_POINTER on the pseudo. diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1d391324e20..3d02cb1cc2d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2015-03-23 Jakub Jelinek <jakub@redhat.com> + + PR bootstrap/65522 + * adadecode.c (ada_demangle): Guard with IN_RTS instead of IN_GCC. + 2015-03-20 Eric Botcazou <ebotcazou@adacore.com> PR ada/65451 diff --git a/gcc/ada/adadecode.c b/gcc/ada/adadecode.c index 25694819afc..d6935ca206b 100644 --- a/gcc/ada/adadecode.c +++ b/gcc/ada/adadecode.c @@ -6,7 +6,7 @@ * * * C Implementation File * * * - * Copyright (C) 2001-2012, Free Software Foundation, Inc. * + * Copyright (C) 2001-2015, Free Software Foundation, Inc. * * * * GNAT is free software; you can redistribute it and/or modify it under * * terms of the GNU General Public License as published by the Free Soft- * @@ -368,7 +368,7 @@ __gnat_decode (const char *coded_name, char *ada_name, int verbose) extern "C" { #endif -#ifdef IN_GCC +#ifdef IN_RTS char * ada_demangle (const char *coded_name) { diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c index 5e08431d427..cf8138a1be5 100644 --- a/gcc/ipa-devirt.c +++ b/gcc/ipa-devirt.c @@ -166,7 +166,6 @@ along with GCC; see the file COPYING3. If not see #include "gimple-pretty-print.h" #include "stor-layout.h" #include "intl.h" -#include "demangle.h" /* Hash based set of pairs of types. */ typedef struct |