Skip to content

Commit 177411a

Browse files
author
Adam Cozzette
authored
Merge pull request #12634 from acozzette/cherrypick-musttail-22
Turn off `clang::musttail` on i386
2 parents 91d1bcb + 5381f40 commit 177411a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/google/protobuf/port_def.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ static_assert(PROTOBUF_CPLUSPLUS_MIN(201402L), "Protobuf only supports C++14 and
294294
#ifdef PROTOBUF_TAILCALL
295295
#error PROTOBUF_TAILCALL was previously defined
296296
#endif
297-
#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
298-
!defined(_ARCH_PPC) && !defined(__wasm__) && \
299-
!(defined(_MSC_VER) && defined(_M_IX86)) && \
297+
#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) && \
298+
!defined(_ARCH_PPC) && !defined(__wasm__) && \
299+
!(defined(_MSC_VER) && defined(_M_IX86)) && !defined(__i386__) && \
300300
!(defined(__NDK_MAJOR__) && __NDK_MAJOR <= 24)
301301
# ifndef PROTO2_OPENSOURCE
302302
// Compilation fails on ARM32: b/195943306

0 commit comments

Comments
 (0)