Merge pull request #12634 from acozzette/cherrypick-musttail-22

Turn off `clang::musttail` on i386
pull/12663/head
Adam Cozzette 2 years ago committed by GitHub
commit 177411a88c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/google/protobuf/port_def.inc

@ -296,7 +296,7 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
#endif #endif
#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \ #if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
!defined(_ARCH_PPC) && !defined(__wasm__) && \ !defined(_ARCH_PPC) && !defined(__wasm__) && \
!(defined(_MSC_VER) && defined(_M_IX86)) && \ !(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__) && \
!(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24) !(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
# ifndef PROTO2_OPENSOURCE # ifndef PROTO2_OPENSOURCE
// Compilation fails on ARM32: b/195943306 // Compilation fails on ARM32: b/195943306

Loading…
Cancel
Save