svn commit: r304319 - in head: contrib/llvm/lib/Target/X86 contrib/llvm/tools/clang/lib/Basic lib/clang

[Dimitry Andric]

Author: dim
Date: Wed Aug 17 21:57:11 2016
New Revision: 304319
URL: https://svnweb.freebsd.org/changeset/base/304319

Log:
  Pull in r262772 from upstream clang trunk (by Simon Pilgrim):
  
    [X86] AMD Bobcat CPU (btver1) doesn't support XSAVE
  
    btver1 is a SSSE3/SSE4a only CPU - it doesn't have AVX and doesn't
    support XSAVE.
  
    Differential Revision: http://reviews.llvm.org/D17682
  
  Pull in r262782 from upstream llvm trunk (by Simon Pilgrim):
  
    [X86] AMD Bobcat CPU (btver1) doesn't support XSAVE
  
    btver1 is a SSSE3/SSE4a only CPU - it doesn't have AVX and doesn't
    support XSAVE.
  
    Differential Revision: http://reviews.llvm.org/D17683
  
  This ensures clang does not emit AVX instructions for CPUTYPE=btver1.
  
  Reported by:	Michel Depeige <demik+freebsd at lostwave.net>
  PR:		211864
  MFC after:	3 days

Modified:
  head/contrib/llvm/lib/Target/X86/X86.td
  head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
  head/lib/clang/freebsd_cc_version.h

Modified: head/contrib/llvm/lib/Target/X86/X86.td
==============================================================================
--- head/contrib/llvm/lib/Target/X86/X86.td	Wed Aug 17 21:44:02 2016	(r304318)
+++ head/contrib/llvm/lib/Target/X86/X86.td	Wed Aug 17 21:57:11 2016	(r304319)
@@ -576,7 +576,6 @@ def : Proc<"btver1", [
   FeaturePRFCHW,
   FeatureLZCNT,
   FeaturePOPCNT,
-  FeatureXSAVE,
   FeatureSlowSHLD,
   FeatureLAHFSAHF
 ]>;

Modified: head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Wed Aug 17 21:44:02 2016	(r304318)
+++ head/contrib/llvm/tools/clang/lib/Basic/Targets.cpp	Wed Aug 17 21:57:11 2016	(r304319)
@@ -2731,7 +2731,6 @@ bool X86TargetInfo::initFeatureMap(
     setFeatureEnabledImpl(Features, "prfchw", true);
     setFeatureEnabledImpl(Features, "cx16", true);
     setFeatureEnabledImpl(Features, "fxsr", true);
-    setFeatureEnabledImpl(Features, "xsave", true);
     break;
   case CK_BDVER4:
     setFeatureEnabledImpl(Features, "avx2", true);

Modified: head/lib/clang/freebsd_cc_version.h
==============================================================================
--- head/lib/clang/freebsd_cc_version.h	Wed Aug 17 21:44:02 2016	(r304318)
+++ head/lib/clang/freebsd_cc_version.h	Wed Aug 17 21:57:11 2016	(r304319)
@@ -1,3 +1,3 @@
 /* $FreeBSD$ */
 
-#define	FREEBSD_CC_VERSION		1200000
+#define	FREEBSD_CC_VERSION		1200001