File gcc60-fixes.diff of Package chromium-ffmpeg-extra

File gcc60-fixes.diff of Package chromium-ffmpeg-extra (Revision 93de8f5e85618d0f70a23b7fb2c40df0)

Currently displaying revision 93de8f5e85618d0f70a23b7fb2c40df0 , Show latest

--- a/build/config/compiler/BUILD.gn    2016-08-14 09:59:05.527738286 +0200
+++ b/build/config/compiler/BUILD.gn    2016-08-14 09:59:56.340463935 +0200
@@ -389,6 +389,7 @@
     # TODO(thakis): Eventually switch this to c++11 instead,
     # http://crbug.com/427584
     cflags_cc += [ "-std=gnu++11" ]
+    cflags_cc += [ "-fno-delete-null-pointer-checks" ]
   } else if (!is_win && !is_nacl) {
     # TODO(mcgrathr) - the NaCl GCC toolchain doesn't support either gnu++11
     # or c++11; we technically don't need this toolchain any more, but there

diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
index 99f230ce7e9a..de2415d402f5 100644
--- a/base/numerics/safe_math_shared_impl.h
+++ b/base/numerics/safe_math_shared_impl.h
@@ -21,8 +21,7 @@
 #if !defined(__native_client__) &&                         \
     ((defined(__clang__) &&                                \
       ((__clang_major__ > 3) ||                            \
-       (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
-     (defined(__GNUC__) && __GNUC__ >= 5))
+       (__clang_major__ == 3 && __clang_minor__ >= 4))))
 #include "base/numerics/safe_math_clang_gcc_impl.h"
 #define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
 #else