r174830 - in /branches/pph/gcc: ChangeLog.pph c...

[dnovillo at gcc dot gnu dot org]

Author: dnovillo
Date: Thu Jun  9 00:36:20 2011
New Revision: 174830

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=174830
Log:
	Fix spurious differences with trunk.

	* c-parser.c (c_parser_declaration_or_fndef): Remove call to
	timevar_push.
	* ggc-page.c (ggc_collect): Change timevar_start to
	timevar_push and timevar_stop to timevar_pop.
	* ggc-zone.c (ggc_collect): Likewise.
	* langhooks-def.h (LANG_HOOKS_INITIALIZER): Remove ',' at the
	end.
	* lto-streamer-out.c (lto_output_tree_header): Remove
	assertion.
	* timevar.def (TV_GC): Revert to trunk version.
	* toplev.c (compile_file): Remove some timevar_start and
	timevar_stop calls.
	(do_compile): Likewise.

cp/ChangeLog.pph

	* call.c: Do not include pph.h.
	(implicit_conversion): Remove unnecessary braces.
	(build_new_op_1): Likewise.
	* cp-gimplify.c (cp_genericize): Remove FIXME comment.
	* cp-lang.c: Do not include pph.h.
	* decl.c (duplicate_decls): Rename from duplicate_decls_internal.
	(xref_tag_1): Remove FIXME comment.
	* Make-lang.in (cp/cp-lang.o): Remove $(CXX_PPH_H) dependency.
	(cp/decl.o): Remove $(CXX_PPH_H) and langhooks.h dependencies.
	(cp/pt.o): Remove $(CXX_PPH_H) dependency.
	* pt.c: Do not include pph.h.
	* rtti.c (create_pseudo_type_info): Remove setting of
	DECL_ARTIFICIAL.

Modified:
    branches/pph/gcc/ChangeLog.pph
    branches/pph/gcc/c-parser.c
    branches/pph/gcc/cp/ChangeLog.pph
    branches/pph/gcc/cp/Make-lang.in
    branches/pph/gcc/cp/call.c
    branches/pph/gcc/cp/cp-gimplify.c
    branches/pph/gcc/cp/cp-lang.c
    branches/pph/gcc/cp/decl.c
    branches/pph/gcc/cp/pt.c
    branches/pph/gcc/cp/rtti.c
    branches/pph/gcc/ggc-page.c
    branches/pph/gcc/ggc-zone.c
    branches/pph/gcc/langhooks-def.h
    branches/pph/gcc/lto-streamer-out.c
    branches/pph/gcc/timevar.def
    branches/pph/gcc/toplev.c