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