Fix the previously rebased patched
This commit is contained in:
parent
1b0a93bc23
commit
2cfc18c994
@ -1,13 +1,15 @@
|
|||||||
diff -up chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h
|
diff -up chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h
|
||||||
--- chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath 2019-09-12 09:55:13.041038765 +0200
|
--- chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath 2019-09-13 14:17:22.726738088 +0200
|
||||||
+++ chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h 2019-09-12 10:11:14.088101504 +0200
|
+++ chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h 2019-09-13 14:31:37.686898493 +0200
|
||||||
@@ -24,8 +24,7 @@
|
@@ -23,9 +23,8 @@
|
||||||
|
// Where available use builtin math overflow support on Clang and GCC.
|
||||||
#elif !defined(__native_client__) && \
|
#elif !defined(__native_client__) && \
|
||||||
((defined(__clang__) && \
|
((defined(__clang__) && \
|
||||||
((__clang_major__ > 3) || \
|
- ((__clang_major__ > 3) || \
|
||||||
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
|
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
|
||||||
- (defined(__GNUC__) && __GNUC__ >= 5))
|
- (defined(__GNUC__) && __GNUC__ >= 5))
|
||||||
+ (__clang_major__ == 3 && __clang_minor__ >= 4)))
|
+ (__clang_major__ > 3) || \
|
||||||
|
+ (__clang_major__ == 3 && __clang_minor__ >= 4)))
|
||||||
#include "base/numerics/safe_math_clang_gcc_impl.h"
|
#include "base/numerics/safe_math_clang_gcc_impl.h"
|
||||||
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
|
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
|
||||||
#else
|
#else
|
||||||
|
Loading…
Reference in New Issue
Block a user