[dragonegg] r195416 - Merging r195404:

[Bill Wendling]

Author: void
Date: Thu Nov 21 23:19:10 2013
New Revision: 195416

URL: http://llvm.org/viewvc/llvm-project?rev=195416&view=rev
Log:
Merging r195404:
------------------------------------------------------------------------
r195404 | pcc | 2013-11-21 17:47:05 -0800 (Thu, 21 Nov 2013) | 1 line

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

Modified:
    dragonegg/branches/release_34/   (props changed)
    dragonegg/branches/release_34/src/x86/Target.cpp

Propchange: dragonegg/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 21 23:19:10 2013
@@ -1 +1 @@
-/dragonegg/trunk:195356
+/dragonegg/trunk:195356,195404

Modified: dragonegg/branches/release_34/src/x86/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/dragonegg/branches/release_34/src/x86/Target.cpp?rev=195416&r1=195415&r2=195416&view=diff
==============================================================================
--- dragonegg/branches/release_34/src/x86/Target.cpp (original)
+++ dragonegg/branches/release_34/src/x86/Target.cpp Thu Nov 21 23:19:10 2013
@@ -1948,7 +1948,7 @@ void llvm_x86_set_subtarget_features(std
   F.AddFeature("3dnowa", TARGET_3DNOW_A);
   F.AddFeature("aes", TARGET_AES);
   F.AddFeature("avx", TARGET_AVX);
-  F.AddFeature("cmpxchg16b", TARGET_CMPXCHG16B);
+  F.AddFeature("cx16", TARGET_CMPXCHG16B);
   F.AddFeature("fma", TARGET_FMA);
   F.AddFeature("fma4", TARGET_FMA4);
   F.AddFeature("mmx", TARGET_MMX);