summaryrefslogtreecommitdiffstats
path: root/libcxx/src
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-09-03 07:05:40 +0000
committerEric Fiselier <eric@efcs.ca>2016-09-03 07:05:40 +0000
commitebbcfe7bfcb7dbb95432cc498e271be5d698d18e (patch)
tree30ef2aeb1a08f85ad7c3776a21db925fbf555f1b /libcxx/src
parent2510a316773cb7128554bcecc8d209abef326c78 (diff)
downloadbcm5719-llvm-ebbcfe7bfcb7dbb95432cc498e271be5d698d18e.tar.gz
bcm5719-llvm-ebbcfe7bfcb7dbb95432cc498e271be5d698d18e.zip
memory_resource still needs init_priority when built with GCC 4.9
llvm-svn: 280585
Diffstat (limited to 'libcxx/src')
-rw-r--r--libcxx/src/experimental/memory_resource.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/libcxx/src/experimental/memory_resource.cpp b/libcxx/src/experimental/memory_resource.cpp
index c0880597537..3e87a2dedde 100644
--- a/libcxx/src/experimental/memory_resource.cpp
+++ b/libcxx/src/experimental/memory_resource.cpp
@@ -72,10 +72,8 @@ union ResourceInitHelper {
// Only in C++11 is "init_priority" needed to ensure initialization order.
#if _LIBCPP_STD_VER > 11
_LIBCPP_SAFE_STATIC
-#else
- __attribute__((init_priority (101)))
#endif
-ResourceInitHelper res_init;
+ResourceInitHelper res_init __attribute__((init_priority (101)));
} // end namespace
OpenPOWER on IntegriCloud