summaryrefslogtreecommitdiffstats
path: root/libcxx
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-07-01 23:41:48 +0000
committerEric Fiselier <eric@efcs.ca>2016-07-01 23:41:48 +0000
commitfa10f41f3eed1087ccd1c97c029ff3f5133b7df5 (patch)
treee5f767875fb94f47b7fd41fbb90d95f420e7fe31 /libcxx
parentd3ac6ae7d337ae96f1e65c4a5dca06c59ae99f45 (diff)
downloadbcm5719-llvm-fa10f41f3eed1087ccd1c97c029ff3f5133b7df5.tar.gz
bcm5719-llvm-fa10f41f3eed1087ccd1c97c029ff3f5133b7df5.zip
Add another workaround for C++17 inline variable ABI breakage.
llvm-svn: 274408
Diffstat (limited to 'libcxx')
-rw-r--r--libcxx/src/experimental/filesystem/path.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/libcxx/src/experimental/filesystem/path.cpp b/libcxx/src/experimental/filesystem/path.cpp
index 9c72abd7cd0..1229fafca7c 100644
--- a/libcxx/src/experimental/filesystem/path.cpp
+++ b/libcxx/src/experimental/filesystem/path.cpp
@@ -13,7 +13,10 @@
_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