diff -r 8df86bf11fc1 -r 4cfe46c9a944 mozilla-fix-top-level-asm.patch --- a/mozilla-fix-top-level-asm.patch Thu Dec 10 14:36:59 2020 +0100 +++ b/mozilla-fix-top-level-asm.patch Sun Dec 27 10:49:49 2020 +0100 @@ -10,48 +10,48 @@ diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build --- a/security/sandbox/linux/moz.build +++ b/security/sandbox/linux/moz.build -@@ -56,32 +56,32 @@ UNIFIED_SOURCES += [ - '../chromium/base/time/time_now_posix.cc', - '../chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc', - '../chromium/sandbox/linux/bpf_dsl/codegen.cc', - '../chromium/sandbox/linux/bpf_dsl/dump_bpf.cc', - '../chromium/sandbox/linux/bpf_dsl/policy.cc', - '../chromium/sandbox/linux/bpf_dsl/policy_compiler.cc', - '../chromium/sandbox/linux/bpf_dsl/syscall_set.cc', - '../chromium/sandbox/linux/seccomp-bpf/die.cc', -- '../chromium/sandbox/linux/seccomp-bpf/syscall.cc', - 'broker/SandboxBrokerCommon.cpp', - 'Sandbox.cpp', - 'SandboxBrokerClient.cpp', - 'SandboxFilter.cpp', - 'SandboxFilterUtil.cpp', - 'SandboxHooks.cpp', - 'SandboxInfo.cpp', - 'SandboxLogging.cpp', - 'SandboxOpenedFiles.cpp', - 'SandboxReporterClient.cpp', +@@ -66,32 +66,32 @@ UNIFIED_SOURCES += [ + "../chromium/base/time/time_now_posix.cc", + "../chromium/sandbox/linux/bpf_dsl/bpf_dsl.cc", + "../chromium/sandbox/linux/bpf_dsl/codegen.cc", + "../chromium/sandbox/linux/bpf_dsl/dump_bpf.cc", + "../chromium/sandbox/linux/bpf_dsl/policy.cc", + "../chromium/sandbox/linux/bpf_dsl/policy_compiler.cc", + "../chromium/sandbox/linux/bpf_dsl/syscall_set.cc", + "../chromium/sandbox/linux/seccomp-bpf/die.cc", +- "../chromium/sandbox/linux/seccomp-bpf/syscall.cc", + "broker/SandboxBrokerCommon.cpp", + "Sandbox.cpp", + "SandboxBrokerClient.cpp", + "SandboxFilter.cpp", + "SandboxFilterUtil.cpp", + "SandboxHooks.cpp", + "SandboxInfo.cpp", + "SandboxLogging.cpp", + "SandboxOpenedFiles.cpp", + "SandboxReporterClient.cpp", ] SOURCES += [ - '../chromium/base/strings/safe_sprintf.cc', - '../chromium/base/third_party/icu/icu_utf.cc', -+ '../chromium/sandbox/linux/seccomp-bpf/syscall.cc', - '../chromium/sandbox/linux/seccomp-bpf/trap.cc', - '../chromium/sandbox/linux/services/syscall_wrappers.cc', + "../chromium/base/strings/safe_sprintf.cc", + "../chromium/base/third_party/icu/icu_utf.cc", ++ "../chromium/sandbox/linux/seccomp-bpf/syscall.cc", + "../chromium/sandbox/linux/seccomp-bpf/trap.cc", + "../chromium/sandbox/linux/services/syscall_wrappers.cc", ] # This copy of SafeSPrintf doesn't need to avoid the Chromium logging # dependency like the one in libxul does, but this way the behavior is # consistent. See also the comment in SandboxLogging.h. - SOURCES['../chromium/base/strings/safe_sprintf.cc'].flags += ['-DNDEBUG'] -@@ -91,16 +91,19 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc') - SOURCES['../chromium/base/third_party/icu/icu_utf.cc'].flags += ['-Wno-implicit-fallthrough'] - SOURCES['../chromium/sandbox/linux/seccomp-bpf/trap.cc'].flags += ['-Wno-unreachable-code-return'] + SOURCES["../chromium/base/strings/safe_sprintf.cc"].flags += ["-DNDEBUG"] +@@ -105,16 +105,19 @@ if CONFIG["CC_TYPE"] in ("clang", "gcc") + "-Wno-unreachable-code-return" + ] - if CONFIG['CC_TYPE'] in ('clang', 'gcc'): - CXXFLAGS += ['-Wno-shadow'] - SOURCES['../chromium/sandbox/linux/services/syscall_wrappers.cc'].flags += [ - '-Wno-empty-body', + if CONFIG["CC_TYPE"] in ("clang", "gcc"): + CXXFLAGS += ["-Wno-shadow"] + SOURCES["../chromium/sandbox/linux/services/syscall_wrappers.cc"].flags += [ + "-Wno-empty-body", ] + SOURCES['../chromium/sandbox/linux/seccomp-bpf/syscall.cc'].flags += [ + '-fno-lto' @@ -60,7 +60,7 @@ # gcc lto likes to put the top level asm in syscall.cc in a different partition # from the function using it which breaks the build. Work around that by # forcing there to be only one partition. - for f in CONFIG['OS_CXXFLAGS']: - if f.startswith('-flto') and CONFIG['CC_TYPE'] != 'clang': - LDFLAGS += ['--param lto-partitions=1'] + for f in CONFIG["OS_CXXFLAGS"]: + if f.startswith("-flto") and CONFIG["CC_TYPE"] != "clang": + LDFLAGS += ["--param lto-partitions=1"]