mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-03-21 23:30:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source 
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
This commit is contained in:
Jakub Jelinek 2015-03-23 16:49:02 +01:00 committed by Jakub Jelinek
parent d2e7014272
commit 468489483d
4 changed files with 10 additions and 3 deletions

3
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.

5
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

4
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)
{

1
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