Remove "native_client" references
As seen in https://crrev.com/1484985 in Chromium. Also apply
https://crrev.com/1485045 to simplify safe_math_shared_impl.h.
Change-Id: If64b46522468466dec2df30af4f2d0bb71dd4ac0
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/134551
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/core/fxcrt/numerics/safe_conversions.h b/core/fxcrt/numerics/safe_conversions.h
index 7041c81..188a88a 100644
--- a/core/fxcrt/numerics/safe_conversions.h
+++ b/core/fxcrt/numerics/safe_conversions.h
@@ -14,7 +14,7 @@
#include "core/fxcrt/numerics/safe_conversions_impl.h" // IWYU pragma: export
-#if defined(__ARMEL__) && !defined(__native_client__)
+#if defined(__ARMEL__)
#include "core/fxcrt/numerics/safe_conversions_arm_impl.h" // IWYU pragma: export
#define BASE_HAS_OPTIMIZED_SAFE_CONVERSIONS (1)
#else
diff --git a/core/fxcrt/numerics/safe_math_clang_gcc_impl.h b/core/fxcrt/numerics/safe_math_clang_gcc_impl.h
index ca21d40..58419d5 100644
--- a/core/fxcrt/numerics/safe_math_clang_gcc_impl.h
+++ b/core/fxcrt/numerics/safe_math_clang_gcc_impl.h
@@ -14,7 +14,7 @@
#include "core/fxcrt/numerics/safe_conversions.h"
-#if !defined(__native_client__) && (defined(__ARMEL__) || defined(__arch64__))
+#if defined(__ARMEL__) || defined(__arch64__)
#include "core/fxcrt/numerics/safe_math_arm_impl.h" // IWYU pragma: export
#define BASE_HAS_ASSEMBLER_SAFE_MATH (1)
#else
diff --git a/core/fxcrt/numerics/safe_math_shared_impl.h b/core/fxcrt/numerics/safe_math_shared_impl.h
index ffdef70..4231f04 100644
--- a/core/fxcrt/numerics/safe_math_shared_impl.h
+++ b/core/fxcrt/numerics/safe_math_shared_impl.h
@@ -16,16 +16,9 @@
#if defined(__asmjs__) || defined(__wasm__)
// Optimized safe math instructions are incompatible with asmjs.
#define BASE_HAS_OPTIMIZED_SAFE_MATH (0)
-// Where available use builtin math overflow support on Clang and GCC.
-#elif !defined(__native_client__) && \
- ((defined(__clang__) && \
- ((__clang_major__ > 3) || \
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
- (defined(__GNUC__) && __GNUC__ >= 5))
+#else
#include "core/fxcrt/numerics/safe_math_clang_gcc_impl.h" // IWYU pragma: export
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
-#else
-#define BASE_HAS_OPTIMIZED_SAFE_MATH (0)
#endif
namespace pdfium {
