mozilla-fix-top-level-asm.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Sun, 20 Oct 2019 14:25:55 +0200
branchfirefox69
changeset 1111 97a6da6d7e29
permissions -rw-r--r--
Firefox 69.0.3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1111
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
From 91bb79836ee274855393bdf6ab10e24899b1b349 Mon Sep 17 00:00:00 2001
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
From: Martin Liska <mliska@suse.cz>
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
Date: Fri, 17 May 2019 14:41:35 +0200
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
Subject: [PATCH] Fix top-level asm issue.
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
---
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
 security/sandbox/linux/moz.build | 5 ++++-
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
 1 file changed, 4 insertions(+), 1 deletion(-)
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
diff --git a/security/sandbox/linux/moz.build b/security/sandbox/linux/moz.build
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
index aae85843e9f6..208368dfd189 100644
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
--- a/security/sandbox/linux/moz.build
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
+++ b/security/sandbox/linux/moz.build
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
@@ -61,7 +61,6 @@ UNIFIED_SOURCES += [
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
     '../chromium/sandbox/linux/bpf_dsl/policy_compiler.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
     '../chromium/sandbox/linux/bpf_dsl/syscall_set.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
     '../chromium/sandbox/linux/seccomp-bpf/die.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
-    '../chromium/sandbox/linux/seccomp-bpf/syscall.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
     'broker/SandboxBrokerCommon.cpp',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
     'Sandbox.cpp',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
     'SandboxBrokerClient.cpp',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
@@ -77,6 +76,7 @@ UNIFIED_SOURCES += [
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
 SOURCES += [
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
     '../chromium/base/strings/safe_sprintf.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
     '../chromium/base/third_party/icu/icu_utf.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
+    '../chromium/sandbox/linux/seccomp-bpf/syscall.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
     '../chromium/sandbox/linux/seccomp-bpf/trap.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
     '../chromium/sandbox/linux/services/syscall_wrappers.cc',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
 ]
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
@@ -96,6 +96,9 @@ if CONFIG['CC_TYPE'] in ('clang', 'gcc'):
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    31
     SOURCES['../chromium/sandbox/linux/services/syscall_wrappers.cc'].flags += [
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    32
         '-Wno-empty-body',
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    33
     ]
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    34
+    SOURCES['../chromium/sandbox/linux/seccomp-bpf/syscall.cc'].flags += [
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    35
+        '-fno-lto'
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    36
+    ]
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    37
 
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    38
 # gcc lto likes to put the top level asm in syscall.cc in a different partition
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    39
 # from the function using it which breaks the build.  Work around that by
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    40
-- 
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    41
2.23.0
97a6da6d7e29 Firefox 69.0.3
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42