summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-07-02 03:21:58 +0000
committerEric Fiselier <eric@efcs.ca>2016-07-02 03:21:58 +0000
commit3a0485427fccf1e17efdd5903fdf8a6a891b89b3 (patch)
tree06d68df3fa075ae75f2bde725177d60c94248766
parentf447e62e1d1007778cfc55c9df2111c8ac104e23 (diff)
downloadbcm5719-llvm-3a0485427fccf1e17efdd5903fdf8a6a891b89b3.tar.gz
bcm5719-llvm-3a0485427fccf1e17efdd5903fdf8a6a891b89b3.zip
Remove workarounds for C++17 inline variable ABI break. It has been fixed in clang.
llvm-svn: 274419
-rw-r--r--libcxx/src/chrono.cpp7
-rw-r--r--libcxx/src/experimental/filesystem/path.cpp4
2 files changed, 0 insertions, 11 deletions
diff --git a/libcxx/src/chrono.cpp b/libcxx/src/chrono.cpp
index 266eed84ea8..62149fbf420 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 1229fafca7c..38c449832f6 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
{
OpenPOWER on IntegriCloud