A couple of conflicts in the merge, but nothing too big. Bootstrapped and tested on x86_64.
gcc/ChangeLog.pph Mainline merge r167963. * BASE-VER: Update revision stamp. libcpp/ChangeLog.pph * internal.h (struct cpp_lookaside): Rename field flag_pth_debug to pth_debug_level. gcc/cp/ChangeLog.pph * pph.c (pph_find_exposed_for, pph_get_decl_exposure): Replace uses of DECL_INTEGRAL_CONSTANT_VAR_P with decl_constant_var_p. Diego.