From 8c11658b5d2032b20b6f0450962c6518b56d9af3 Mon Sep 17 00:00:00 2001
From: Reid Kleckner <rnk@google.com>
Date: Fri, 7 Sep 2018 21:47:00 +0000
Subject: [PATCH] [benchmark] Re-enable benchmarks on all platforms including
 Windows

The assertion in MCCodeView.cpp was resolved in r340878.

This reverts both r340905 and r340836, making benchmarks build by
default everywhere.

llvm-svn: 341716
---
 CMakeLists.txt | 7 +------
 docs/CMake.rst | 3 +--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 177e43e49ea..22e22c8aa7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -495,12 +495,7 @@ option(LLVM_INCLUDE_GO_TESTS "Include the Go bindings tests in test build target
 
 option(LLVM_BUILD_BENCHMARKS "Add LLVM benchmark targets to the list of default
 targets. If OFF, benchmarks still could be built using Benchmarks target." OFF)
-option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks
-can't be built. This is set to OFF for Windows." ON)
-
-if (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-  set(LLVM_INCLUDE_BENCHMARKS OFF)
-endif()
+option(LLVM_INCLUDE_BENCHMARKS "Generate benchmark targets. If OFF, benchmarks can't be built." ON)
 
 option (LLVM_BUILD_DOCS "Build the llvm documentation." OFF)
 option (LLVM_INCLUDE_DOCS "Generate build targets for llvm documentation." ON)
diff --git a/docs/CMake.rst b/docs/CMake.rst
index a26f612945a..f4f67db4d7e 100644
--- a/docs/CMake.rst
+++ b/docs/CMake.rst
@@ -254,8 +254,7 @@ LLVM-specific variables
   Adds benchmarks to the list of default targets. Defaults to OFF.
 
 **LLVM_INCLUDE_BENCHMARKS**:BOOL
-  Generate build targets for the LLVM benchmarks. Defaults to ON, but is set
-  to OFF on Windows.
+  Generate build targets for the LLVM benchmarks. Defaults to ON.
 
 **LLVM_APPEND_VC_REV**:BOOL
   Embed version control revision info (svn revision number or Git revision id).