From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 23 Mar 2015 15:49:02 +0000 (+0100)
Subject: re PR bootstrap/65522 (Svn revision 221590 fails bootstrap - ../libiberty/libiberty... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=468489483df36a009216601d2f70c3c8872ca301;p=gcc.git

re PR bootstrap/65522 (Svn revision 221590 fails bootstrap - ../libiberty/libiberty.a(cplus-dem.o): In function `ada_demangle': cplus-dem.c:(.text+0xdb8): multiple definition of `ada_demangle' ada/adadecode.o:adadecode.c:(.text+0x863): first defined here)

	PR bootstrap/65522
	* ipa-devirt.c: Remove duplicate demangle.h include.

	* adadecode.c (ada_demangle): Guard with IN_RTS instead of IN_GCC.

From-SVN: r221599
---

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