r227167 - in /branches/gupc/gcc: ChangeLog.upc ...

[gfunck@gcc.gnu.org]

Author: gfunck
Date: Tue Aug 25 14:01:21 2015
New Revision: 227167

URL: https://gcc.gnu.org/viewcvs?rev=227167&root=gcc&view=rev
Log:
	* dwarf2out.c (type_main_variant): Add back static prototype
	to match trunk.
	* fold-const.c (fold_unary_loc): Re-arrange terms in
	if-statement to match trunk.

Modified:
    branches/gupc/gcc/ChangeLog.upc
    branches/gupc/gcc/DATESTAMP
    branches/gupc/gcc/dwarf2out.c
    branches/gupc/gcc/fold-const.c