r173926 - in /branches/google/gcc-4_6: ./ Chang...

[ppluzhnikov@gcc.gnu.org]

Author: ppluzhnikov
Date: Thu May 19 21:58:33 2011
New Revision: 173926

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=173926
Log:
2011-05-19  Paul Pluzhnikov  <ppluzhnikov@google.com>

	Merge from google/integration via
	svnmerge.py merge -S google/integration -r 173923

	* libstdc++-v3/libsupc++/Makefile.am: Add -fno-omit-frame-pointer
	to vterminate.
	* libstdc++-v3/libsupc++/Makefile.in: Regenerate.


Modified:
    branches/google/gcc-4_6/libstdc++-v3/libsupc++/Makefile.am
    branches/google/gcc-4_6/libstdc++-v3/libsupc++/Makefile.in

Changes in other areas also in this revision:
Modified:
    branches/google/gcc-4_6/   (props changed)
    branches/google/gcc-4_6/ChangeLog.google-integration
    branches/google/gcc-4_6/gcc/testsuite/gcc.target/powerpc/ppc-round.c   (props changed)
    branches/google/gcc-4_6/libjava/classpath/   (props changed)

Propchange: branches/google/gcc-4_6/
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/
            ('svnmerge-integrated' modified)

Propchange: branches/google/gcc-4_6/gcc/testsuite/gcc.target/powerpc/ppc-round.c
            ('svn:mergeinfo' modified)

Propchange: branches/google/gcc-4_6/libjava/classpath/
            ('svn:mergeinfo' modified)