From 3a0485427fccf1e17efdd5903fdf8a6a891b89b3 Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Sat, 2 Jul 2016 03:21:58 +0000
Subject: [PATCH] Remove workarounds for C++17 inline variable ABI break. It
 has been fixed in clang.

llvm-svn: 274419
---
 libcxx/src/chrono.cpp                       | 7 -------
 libcxx/src/experimental/filesystem/path.cpp | 4 ----
 2 files changed, 11 deletions(-)

diff --git a/libcxx/src/chrono.cpp b/libcxx/src/chrono.cpp
index 266eed84ea8e..62149fbf420c 100644
--- a/libcxx/src/chrono.cpp
+++ b/libcxx/src/chrono.cpp
@@ -32,9 +32,6 @@ namespace chrono
 // system_clock
 
 const bool system_clock::is_steady;
-// Make is_steady non-discardable in C++17
-// See PR28395 (https://llvm.org/bugs/show_bug.cgi?id=28395)
-static const bool& __is_steady_force_use1 __attribute__((used)) = system_clock::is_steady;
 
 system_clock::time_point
 system_clock::now() _NOEXCEPT
@@ -71,10 +68,6 @@ system_clock::from_time_t(time_t t) _NOEXCEPT
 //  instead.
 
 const bool steady_clock::is_steady;
-// Make is_steady non-discardable in C++17
-// See PR28395 (https://llvm.org/bugs/show_bug.cgi?id=28395)
-static const bool& __is_steady_force_use2 __attribute__((used)) = steady_clock::is_steady;
-
 
 #ifdef CLOCK_MONOTONIC
 
diff --git a/libcxx/src/experimental/filesystem/path.cpp b/libcxx/src/experimental/filesystem/path.cpp
index 1229fafca7cf..38c449832f6e 100644
--- a/libcxx/src/experimental/filesystem/path.cpp
+++ b/libcxx/src/experimental/filesystem/path.cpp
@@ -13,10 +13,6 @@
 _LIBCPP_BEGIN_NAMESPACE_EXPERIMENTAL_FILESYSTEM
 
 _LIBCPP_CONSTEXPR path::value_type path::preferred_separator;
-// Make preferred_separator non-discardable in C++17
-// See PR28395 (https://llvm.org/bugs/show_bug.cgi?id=28395)
-static const path::value_type&
-    __preferred_sep_force_use __attribute__((used)) = path::preferred_separator;
 
 namespace { namespace parser
 {