mozilla-reduce-rust-debuginfo.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Mon, 09 Aug 2021 09:14:17 +0200
branchfirefox90
changeset 1159 c4aba2fa0908
parent 1154 71a92b4d0527
child 1160 b28cf22ff7cf
permissions -rw-r--r--
90.0.2
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
# HG changeset patch
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
# User msirringhaus@suse.de
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
# Date 1560754926 -7200
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
#      Mon Jun 17 09:02:06 2019 +0200
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
# Node ID 428161c3b9599083e1b8710eda1760f1f707ab11
1159
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1154
diff changeset
     6
# Parent  d55730171edb1935dec80234eba336787ff0e4e8
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
#Description: reduce the rust debuginfo level on selected architectures where
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
# compiling with debuginfo=2 causes the OOM killer to interrupt the build on
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
# launchpad builders. Initially this was only on 32 bit architectures, but with
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
# firefox 63 it started happening frequently on arm64 and ppc64el too.
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
1159
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1154
diff changeset
    12
diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1154
diff changeset
    13
--- a/build/moz.configure/rust.configure
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1154
diff changeset
    14
+++ b/build/moz.configure/rust.configure
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1154
diff changeset
    15
@@ -603,18 +603,19 @@ set_config("CARGO_PROFILE_DEV_OPT_LEVEL"
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
 
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
 
1152
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    18
 @depends(
1154
71a92b4d0527 Firefox 85.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1152
diff changeset
    19
     rustc_opt_level,
71a92b4d0527 Firefox 85.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1152
diff changeset
    20
     debug_rust,
71a92b4d0527 Firefox 85.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1152
diff changeset
    21
     target,
71a92b4d0527 Firefox 85.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1152
diff changeset
    22
     "--enable-debug-symbols",
71a92b4d0527 Firefox 85.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1152
diff changeset
    23
     "--enable-frame-pointers",
71a92b4d0527 Firefox 85.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1152
diff changeset
    24
+    host,
1152
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    25
 )
1154
71a92b4d0527 Firefox 85.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1152
diff changeset
    26
-def rust_compile_flags(opt_level, debug_rust, target, debug_symbols, frame_pointers):
71a92b4d0527 Firefox 85.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1152
diff changeset
    27
+def rust_compile_flags(opt_level, debug_rust, target, debug_symbols, frame_pointers, host):
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
     # Cargo currently supports only two interesting profiles for building:
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    29
     # development and release. Those map (roughly) to --enable-debug and
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    30
     # --disable-debug in Gecko, respectively.
1112
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    31
     #
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    32
     # But we'd also like to support an additional axis of control for
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    33
     # optimization level. Since Cargo only supports 2 profiles, we're in
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    34
     # a bit of a bind.
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    35
     #
1159
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1154
diff changeset
    36
@@ -627,16 +628,18 @@ def rust_compile_flags(opt_level, debug_
1112
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    37
 
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    38
     # opt-level=0 implies -C debug-assertions, which may not be desired
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    39
     # unless Rust debugging is enabled.
1152
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    40
     if opt_level == "0" and not debug_rust:
1112
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    41
         debug_assertions = False
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    42
 
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    43
     if debug_symbols:
1152
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    44
         debug_info = "2"
1097
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    45
+        if host.bitness == 32 or host.cpu == 'aarch64' or host.cpu == 'ppc64':
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    46
+            debug_info = '1'
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    47
 
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    48
     opts = []
840132a4a9b3 Firefox 68.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    49
 
1112
8a4f5aea2475 Firefox 70.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1097
diff changeset
    50
     if debug_assertions is not None:
1152
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    51
         opts.append("debug-assertions=%s" % ("yes" if debug_assertions else "no"))
4cfe46c9a944 Firefox 84.0
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1123
diff changeset
    52
     if debug_info is not None:
1159
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1154
diff changeset
    53
         opts.append("debuginfo=%s" % debug_info)
Wolfgang Rosenauer <wr@rosenauer.org>
parents: 1154
diff changeset
    54
     if frame_pointers: