Index: lib/Basic/Targets.cpp
===================================================================
--- lib/Basic/Targets.cpp
+++ lib/Basic/Targets.cpp
@@ -2780,7 +2780,6 @@
     setFeatureEnabledImpl(Features, "prfchw", true);
     setFeatureEnabledImpl(Features, "cx16", true);
     setFeatureEnabledImpl(Features, "fxsr", true);
-    setFeatureEnabledImpl(Features, "xsave", true);
     break;
   case CK_BDVER4:
     setFeatureEnabledImpl(Features, "avx2", true);
Index: test/Preprocessor/predefined-arch-macros.c
===================================================================
--- test/Preprocessor/predefined-arch-macros.c
+++ test/Preprocessor/predefined-arch-macros.c
@@ -1474,13 +1474,12 @@
 // CHECK_BTVER1_M32: #define __SSE2__ 1
 // CHECK_BTVER1_M32: #define __SSE3__ 1
 // CHECK_BTVER1_M32: #define __SSE4A__ 1
-// CHECK_BTVER1_M32: #define __SSE_MATH__ 1
-// CHECK_BTVER1_M32: #define __SSE__ 1
-// CHECK_BTVER1_M32: #define __SSSE3__ 1
-// CHECK_BTVER1_M32: #define __XSAVE__ 1
-// CHECK_BTVER1_M32: #define __btver1 1
-// CHECK_BTVER1_M32: #define __btver1__ 1
-// CHECK_BTVER1_M32: #define __i386 1
+// CHECK_BTVER1_M32: #define __SSE_MATH__ 1
+// CHECK_BTVER1_M32: #define __SSE__ 1
+// CHECK_BTVER1_M32: #define __SSSE3__ 1
+// CHECK_BTVER1_M32: #define __btver1 1
+// CHECK_BTVER1_M32: #define __btver1__ 1
+// CHECK_BTVER1_M32: #define __i386 1
 // CHECK_BTVER1_M32: #define __i386__ 1
 // CHECK_BTVER1_M32: #define __tune_btver1__ 1
 // RUN: %clang -march=btver1 -m64 -E -dM %s -o - 2>&1 \
@@ -1496,13 +1495,12 @@
 // CHECK_BTVER1_M64: #define __SSE2__ 1
 // CHECK_BTVER1_M64: #define __SSE3__ 1
 // CHECK_BTVER1_M64: #define __SSE4A__ 1
-// CHECK_BTVER1_M64: #define __SSE_MATH__ 1
-// CHECK_BTVER1_M64: #define __SSE__ 1
-// CHECK_BTVER1_M64: #define __SSSE3__ 1
-// CHECK_BTVER1_M64: #define __XSAVE__ 1
-// CHECK_BTVER1_M64: #define __amd64 1
-// CHECK_BTVER1_M64: #define __amd64__ 1
-// CHECK_BTVER1_M64: #define __btver1 1
+// CHECK_BTVER1_M64: #define __SSE_MATH__ 1
+// CHECK_BTVER1_M64: #define __SSE__ 1
+// CHECK_BTVER1_M64: #define __SSSE3__ 1
+// CHECK_BTVER1_M64: #define __amd64 1
+// CHECK_BTVER1_M64: #define __amd64__ 1
+// CHECK_BTVER1_M64: #define __btver1 1
 // CHECK_BTVER1_M64: #define __btver1__ 1
 // CHECK_BTVER1_M64: #define __tune_btver1__ 1
 // CHECK_BTVER1_M64: #define __x86_64 1