-
Notifications
You must be signed in to change notification settings - Fork 0
/
0001-build-import-openSUSE-gcc60-fixes.diff.patch
39 lines (36 loc) · 1.48 KB
/
0001-build-import-openSUSE-gcc60-fixes.diff.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
From 128bc2097534366ef7a051d65efdef02b3dc4841 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 25 Sep 2017 13:20:23 +0200
Subject: [PATCH] build: import openSUSE gcc60-fixes.diff
---
base/numerics/safe_math_shared_impl.h | 3 +--
build/config/compiler/BUILD.gn | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
index 583c487a42ee..c4eac7e1e52b 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
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 2673c6a79889..5c1e34350ac7 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -525,6 +525,7 @@ config("compiler") {
} else {
cflags_cc += [ "-std=gnu++14" ]
}
+ cflags_cc += [ "-fno-delete-null-pointer-checks" ]
} else if (!is_win && !is_nacl) {
if (target_os == "android") {
cxx11_override = use_cxx11_on_android
--
2.14.3