6 --- |
6 --- |
7 security/sandbox/linux/moz.build | 5 ++++- |
7 security/sandbox/linux/moz.build | 5 ++++- |
8 1 file changed, 4 insertions(+), 1 deletion(-) |
8 1 file changed, 4 insertions(+), 1 deletion(-) |
9 |
9 |
10 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build |
10 diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build |
11 index aae85843e9f6..208368dfd189 100644 |
|
12 --- a/security/sandbox/linux/moz.build |
11 --- a/security/sandbox/linux/moz.build |
13 +++ b/security/sandbox/linux/moz.build |
12 +++ b/security/sandbox/linux/moz.build |
14 @@ -61,7 +61,6 @@ UNIFIED_SOURCES += [ |
13 @@ -56,32 +56,32 @@ UNIFIED_SOURCES += [ |
|
14 '../chromium/base/time/time_now_posix.cc', |
|
15 '../chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc', |
|
16 '../chromium/sandbox/linux/bpf_dsl/codegen.cc', |
|
17 '../chromium/sandbox/linux/bpf_dsl/dump_bpf.cc', |
|
18 '../chromium/sandbox/linux/bpf_dsl/policy.cc', |
15 '../chromium/sandbox/linux/bpf_dsl/policy_compiler.cc', |
19 '../chromium/sandbox/linux/bpf_dsl/policy_compiler.cc', |
16 '../chromium/sandbox/linux/bpf_dsl/syscall_set.cc', |
20 '../chromium/sandbox/linux/bpf_dsl/syscall_set.cc', |
17 '../chromium/sandbox/linux/seccomp-bpf/die.cc', |
21 '../chromium/sandbox/linux/seccomp-bpf/die.cc', |
18 - '../chromium/sandbox/linux/seccomp-bpf/syscall.cc', |
22 - '../chromium/sandbox/linux/seccomp-bpf/syscall.cc', |
19 'broker/SandboxBrokerCommon.cpp', |
23 'broker/SandboxBrokerCommon.cpp', |
20 'Sandbox.cpp', |
24 'Sandbox.cpp', |
21 'SandboxBrokerClient.cpp', |
25 'SandboxBrokerClient.cpp', |
22 @@ -77,6 +76,7 @@ UNIFIED_SOURCES += [ |
26 'SandboxFilter.cpp', |
|
27 'SandboxFilterUtil.cpp', |
|
28 'SandboxHooks.cpp', |
|
29 'SandboxInfo.cpp', |
|
30 'SandboxLogging.cpp', |
|
31 'SandboxOpenedFiles.cpp', |
|
32 'SandboxReporterClient.cpp', |
|
33 ] |
|
34 |
23 SOURCES += [ |
35 SOURCES += [ |
24 '../chromium/base/strings/safe_sprintf.cc', |
36 '../chromium/base/strings/safe_sprintf.cc', |
25 '../chromium/base/third_party/icu/icu_utf.cc', |
37 '../chromium/base/third_party/icu/icu_utf.cc', |
26 + '../chromium/sandbox/linux/seccomp-bpf/syscall.cc', |
38 + '../chromium/sandbox/linux/seccomp-bpf/syscall.cc', |
27 '../chromium/sandbox/linux/seccomp-bpf/trap.cc', |
39 '../chromium/sandbox/linux/seccomp-bpf/trap.cc', |
28 '../chromium/sandbox/linux/services/syscall_wrappers.cc', |
40 '../chromium/sandbox/linux/services/syscall_wrappers.cc', |
29 ] |
41 ] |
30 @@ -96,6 +96,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'): |
42 |
|
43 # This copy of SafeSPrintf doesn't need to avoid the Chromium logging |
|
44 # dependency like the one in libxul does, but this way the behavior is |
|
45 # consistent. See also the comment in SandboxLogging.h. |
|
46 SOURCES['../chromium/base/strings/safe_sprintf.cc'].flags += ['-DNDEBUG'] |
|
47 @@ -91,16 +91,19 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc') |
|
48 SOURCES['../chromium/base/third_party/icu/icu_utf.cc'].flags += ['-Wno-implicit-fallthrough'] |
|
49 SOURCES['../chromium/sandbox/linux/seccomp-bpf/trap.cc'].flags += ['-Wno-unreachable-code-return'] |
|
50 |
|
51 if CONFIG['CC_TYPE'] in ('clang', 'gcc'): |
|
52 CXXFLAGS += ['-Wno-shadow'] |
31 SOURCES['../chromium/sandbox/linux/services/syscall_wrappers.cc'].flags += [ |
53 SOURCES['../chromium/sandbox/linux/services/syscall_wrappers.cc'].flags += [ |
32 '-Wno-empty-body', |
54 '-Wno-empty-body', |
33 ] |
55 ] |
34 + SOURCES['../chromium/sandbox/linux/seccomp-bpf/syscall.cc'].flags += [ |
56 + SOURCES['../chromium/sandbox/linux/seccomp-bpf/syscall.cc'].flags += [ |
35 + '-fno-lto' |
57 + '-fno-lto' |
36 + ] |
58 + ] |
37 |
59 |
38 # gcc lto likes to put the top level asm in syscall.cc in a different partition |
60 # gcc lto likes to put the top level asm in syscall.cc in a different partition |
39 # from the function using it which breaks the build. Work around that by |
61 # from the function using it which breaks the build. Work around that by |
40 -- |
62 # forcing there to be only one partition. |
41 2.23.0 |
63 for f in CONFIG['OS_CXXFLAGS']: |
42 |
64 if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang': |
|
65 LDFLAGS += ['--param lto-partitions=1'] |
|
66 |