[llvm-branch-commits] [llvm-branch] r181399 - Merging r181313:

[Bill Wendling]

Author: void
Date: Wed May  8 04:15:09 2013
New Revision: 181399

URL: http://llvm.org/viewvc/llvm-project?rev=181399&view=rev
Log:
Merging r181313:
------------------------------------------------------------------------
r181313 | mkuper | 2013-05-07 07:05:33 -0700 (Tue, 07 May 2013) | 1 line

Re-enable AVX detection on x64 platforms.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_33/   (props changed)
    llvm/branches/release_33/lib/Target/X86/X86Subtarget.cpp

Propchange: llvm/branches/release_33/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May  8 04:15:09 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,181296
+/llvm/trunk:155241,181296,181313

Modified: llvm/branches/release_33/lib/Target/X86/X86Subtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_33/lib/Target/X86/X86Subtarget.cpp?rev=181399&r1=181398&r2=181399&view=diff
==============================================================================
--- llvm/branches/release_33/lib/Target/X86/X86Subtarget.cpp (original)
+++ llvm/branches/release_33/lib/Target/X86/X86Subtarget.cpp Wed May  8 04:15:09 2013
@@ -171,7 +171,8 @@ bool X86Subtarget::IsLegalToCallImmediat
 }
 
 static bool OSHasAVXSupport() {
-#if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)
+#if defined(i386) || defined(__i386__) || defined(__x86__) || defined(_M_IX86)\
+    || defined(__x86_64__) || defined(_M_AMD64) || defined (_M_X64)
 #if defined(__GNUC__)
   // Check xgetbv; this uses a .byte sequence instead of the instruction
   // directly because older assemblers do not include support for xgetbv and