From 9a60b229e8e64f37baf6ac78e0550291f542a9cc Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Sun, 16 Dec 2007 00:08:47 +0100 Subject: [PATCH] re PR bootstrap/34003 (gcc trunk unable to bootstrap itself; Unsatisfied symbols: ggc_free) PR bootstrap/34003 * c-decl.c (merge_decls): Copy RTL from olddecl to newdecl. * config/pa/pa.c (pa_encode_section_info): If !first, preserve SYMBOL_FLAG_REFERENCED flag. * gcc.dg/pr34003-1.c: New test. * gcc.dg/pr34003-2.c: New. From-SVN: r130979 --- gcc/ChangeLog | 7 +++++++ gcc/c-decl.c | 3 +++ gcc/config/pa/pa.c | 8 ++++++++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.dg/pr34003-1.c | 8 ++++++++ gcc/testsuite/gcc.dg/pr34003-2.c | 20 ++++++++++++++++++++ 6 files changed, 52 insertions(+) create mode 100644 gcc/testsuite/gcc.dg/pr34003-1.c create mode 100644 gcc/testsuite/gcc.dg/pr34003-2.c diff --git a/gcc/ChangeLog b/gcc/ChangeLog index dc72887a10cc..054ef8f2caf4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2007-12-16 Jakub Jelinek + + PR bootstrap/34003 + * c-decl.c (merge_decls): Copy RTL from olddecl to newdecl. + * config/pa/pa.c (pa_encode_section_info): If !first, preserve + SYMBOL_FLAG_REFERENCED flag. + 2007-12-15 Alexandre Oliva * tree.c (type_hash_add): Fix whitespace. diff --git a/gcc/c-decl.c b/gcc/c-decl.c index 1da57c2c9982..033ff2eec49a 100644 --- a/gcc/c-decl.c +++ b/gcc/c-decl.c @@ -1670,6 +1670,9 @@ merge_decls (tree newdecl, tree olddecl, tree newtype, tree oldtype) } } + /* Keep the old rtl since we can safely use it. */ + if (HAS_RTL_P (olddecl)) + COPY_DECL_RTL (olddecl, newdecl); /* Merge the type qualifiers. */ if (TREE_READONLY (newdecl)) diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index b1f3a0036532..b4d890c930c4 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -7834,6 +7834,12 @@ hppa_encode_label (rtx sym) static void pa_encode_section_info (tree decl, rtx rtl, int first) { + int old_referenced = 0; + + if (!first && MEM_P (rtl) && GET_CODE (XEXP (rtl, 0)) == SYMBOL_REF) + old_referenced + = SYMBOL_REF_FLAGS (XEXP (rtl, 0)) & SYMBOL_FLAG_REFERENCED; + default_encode_section_info (decl, rtl, first); if (first && TEXT_SPACE_P (decl)) @@ -7842,6 +7848,8 @@ pa_encode_section_info (tree decl, rtx rtl, int first) if (TREE_CODE (decl) == FUNCTION_DECL) hppa_encode_label (XEXP (rtl, 0)); } + else if (old_referenced) + SYMBOL_REF_FLAGS (XEXP (rtl, 0)) |= old_referenced; } /* This is sort of inverse to pa_encode_section_info. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3ceb531d389c..b3dc9af77650 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2007-12-16 Jakub Jelinek + + PR bootstrap/34003 + * gcc.dg/pr34003-1.c: New test. + * gcc.dg/pr34003-2.c: New. + 2007-12-15 Hans-Peter Nilsson * gcc.target/cris/peep2-xsrand.c, gcc.target/cris/asmreg-1.c, diff --git a/gcc/testsuite/gcc.dg/pr34003-1.c b/gcc/testsuite/gcc.dg/pr34003-1.c new file mode 100644 index 000000000000..ff97fe6d23e6 --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr34003-1.c @@ -0,0 +1,8 @@ +/* PR bootstrap/34003 */ +/* { dg-do link } */ +/* { dg-options "-O0" } */ +/* { dg-additional-sources "pr34003-2.c" } */ + +extern void foo (void); +int bar (void) { foo (); return 1; } +extern void foo (void); diff --git a/gcc/testsuite/gcc.dg/pr34003-2.c b/gcc/testsuite/gcc.dg/pr34003-2.c new file mode 100644 index 000000000000..a5330567f50b --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr34003-2.c @@ -0,0 +1,20 @@ +/* PR bootstrap/34003 */ +/* { dg-do compile } */ +/* { dg-options "-O0" } */ + +extern void abort (void); + +int seen = 0; + +void foo (void) +{ + ++seen; +} + +int main (void) +{ + extern int bar (void); + if (bar () != 1 || seen != 1) + abort (); + return 0; +} -- 2.47.2