Merge commit '18f7655178a6' from llvm.org/main into next

Author: git apple-llvm automerger

clang/lib/Basic/Targets/OSTargets.h

@@ -1005,6 +1005,7 @@ class LLVM_LIBRARY_VISIBILITY EmscriptenTargetInfo
     // Emscripten's ABI is unstable and we may change this back to 128 to match
     // the WebAssembly default in the future.
     this->LongDoubleAlign = 64;
+    this->Float128Align = 64;
   }
 };
 

clang/lib/CodeGen/CodeGenModule.cpp

@@ -388,8 +388,7 @@ static void checkDataLayoutConsistency(const TargetInfo &Target,
           llvm::Type::getFloatingPointTy(Context, *Target.LongDoubleFormat),
           Target.LongDoubleAlign);
   }
-  // FIXME: Wasm has a mismatch in f128 alignment between Clang and LLVM.
-  if (Target.hasFloat128Type() && !Triple.isWasm())
+  if (Target.hasFloat128Type())
     Check("__float128", llvm::Type::getFP128Ty(Context), Target.Float128Align);
   if (Target.hasIbm128Type())
     Check("__ibm128", llvm::Type::getPPC_FP128Ty(Context), Target.Ibm128Align);