tag 1a8ffacc92b7e3052682ad3716a6c0015070928e
tagger Tom Stellard <thomas.stellard@amd.com> Sat Nov 21 01:32:21 2015 +0000
object c3ab51cd9267db85a55ba0bb2ac03db453bd0316

Creating release candidate rc2 from release_371 branch

llvm-svn: 253754
llvm-svn: 253753
llvm-svn: 253752
llvm-svn: 253751
llvm-svn: 253750
llvm-svn: 253749
llvm-svn: 253748
llvm-svn: 253747
llvm-svn: 253746
llvm-svn: 253744
llvm-svn: 253743

commit c3ab51cd9267db85a55ba0bb2ac03db453bd0316
author Tom Stellard <thomas.stellard@amd.com> Sat Nov 21 01:08:13 2015 +0000
committer Tom Stellard <thomas.stellard@amd.com> Sat Nov 21 01:08:13 2015 +0000
tree 4e7eba2f27fa170b325b551153541485135ab3f6
parent 99224f9e42706a78d21b1b23f00a92ef8f84ee42

Merging r247435:

------------------------------------------------------------------------
r247435 | david.majnemer | 2015-09-11 13:34:34 -0400 (Fri, 11 Sep 2015) | 8 lines

[X86] Make sure startproc/endproc are paired

We used different conditions to determine if we should emit startproc vs
endproc.  Use the same condition to ensure that they will always be
paired.

This fixes PR24374.

------------------------------------------------------------------------

llvm-svn: 253742