diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2014-05-06 14:01:45 -0700 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2014-05-06 14:01:45 -0700 |
| commit | 0db5dc3a0df36251eac3ea8ad6bf852acb2f819d (patch) | |
| tree | b254238be8ce014a2eaab5f3e7d064379563907a /lib/AST | |
| parent | 9596f4e867095c9f1741601615a8d2bcb097772e (diff) | |
| parent | dc171d8a2090ca1d46be0f164801edf8721ec5cc (diff) | |
Merge branch 'incoming'1.17.0
Diffstat (limited to 'lib/AST')
| -rw-r--r-- | lib/AST/ASTContext.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp index 176aec53a2..b77977f7fd 100644 --- a/lib/AST/ASTContext.cpp +++ b/lib/AST/ASTContext.cpp @@ -651,6 +651,7 @@ CXXABI *ASTContext::createCXXABI(const TargetInfo &T) { case TargetCXXABI::GenericARM: case TargetCXXABI::iOS: return CreateARMCXXABI(*this); + case TargetCXXABI::Emscripten: // Same as Itanium at this level case TargetCXXABI::GenericAArch64: // Same as Itanium at this level case TargetCXXABI::GenericItanium: return CreateItaniumCXXABI(*this); @@ -7940,6 +7941,7 @@ MangleContext *ASTContext::createMangleContext() { case TargetCXXABI::GenericAArch64: case TargetCXXABI::GenericItanium: case TargetCXXABI::GenericARM: + case TargetCXXABI::Emscripten: case TargetCXXABI::iOS: return createItaniumMangleContext(*this, getDiagnostics()); case TargetCXXABI::Microsoft: |