Merged from trunk:
gcc:
2013-04-10  Joern Rennecke <joern.rennecke@embecosm.com>

        PR tree-optimization/55524
        * tree-ssa-math-opts.c
        (convert_mult_to_fma): Don't use an fms construct
        when we don't have an fms operation, but fnma, and it looks
        likely that we'll be able to use the latter.

gcc/testsuite:
2013-04-10  Joern Rennecke <joern.rennecke@embecosm.com>

        PR tree-optimization/55524
        * gcc.target/epiphany/fnma-1.c: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@197668 138bc75d-0d04-0410-961f-82ee72b054a4

Conflicts:
	gcc/ChangeLog
	gcc/testsuite/ChangeLog : entried moved to ChangeLog.epiphany
Merged from trunk:
2013-05-03  Joern Rennecke <joern.rennecke@embecosm.com>

        PR tree-optimization/57027
        * tree-ssa-math-opts.c (convert_mult_to_fma): When checking for
        fnms opportunity, check we got the prerequisite kind of tree / gimple
        before using accessor functions.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@198577 138bc75d-0d04-0410-961f-82ee72b054a4

Conflicts:
	gcc/ChangeLog: entry moved to ChangeLog.epiphany