From b84e158df7ff87d16141d798a47de3dc430036df Mon Sep 17 00:00:00 2001 From: Benjamin Kramer Date: Mon, 26 Feb 2018 11:07:25 +0000 Subject: [PATCH] [WebAssembly] Relax constexpr for old standard libraries. This will still be constexpr when the standard library supports it, but doesn't force constexpr. Old libraries will get a global constructor, which is not too bad. llvm-svn: 326080 --- .../Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp b/llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp index e2b518104d19..97d33c4e4762 100644 --- a/llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp +++ b/llvm/lib/Target/WebAssembly/WebAssemblyRuntimeLibcallSignatures.cpp @@ -465,7 +465,7 @@ ManagedStatic RuntimeLibcallSignatures; struct StaticLibcallNameMap { StringMap Map; StaticLibcallNameMap() { - static constexpr std::pair NameLibcalls[] = { + static const std::pair NameLibcalls[] = { #define HANDLE_LIBCALL(code, name) {(const char *)name, RTLIB::code}, #include "llvm/CodeGen/RuntimeLibcalls.def" #undef HANDLE_LIBCALL