Merging r195356:
------------------------------------------------------------------------
r195356 | chapuni | 2013-11-21 05:40:40 -0800 (Thu, 21 Nov 2013) | 1 line

Debug.cpp: Try to unbreak build corresponding to llvm's r195055.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/dragonegg/branches/release_34@195387 91177308-0d34-0410-b5e6-96231b3b80d8
Merging r195404:
------------------------------------------------------------------------
r195404 | pcc | 2013-11-21 17:47:05 -0800 (Thu, 21 Nov 2013) | 1 line

The cmpxchg16 feature has been renamed cx16.
------------------------------------------------------------------------


git-svn-id: https://llvm.org/svn/llvm-project/dragonegg/branches/release_34@195416 91177308-0d34-0410-b5e6-96231b3b80d8