mozilla-reduce-files-per-UnifiedBindings.patch
author Wolfgang Rosenauer <wr@rosenauer.org>
Thu, 02 Nov 2017 18:15:18 +0100
changeset 1003 b1170eeb30b1
parent 903 83801946c93f
child 1006 5ba9b67de554
permissions -rw-r--r--
merge latest changes from firefox56 branch update to 57b13
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
903
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     1
From: Andreas Stieger <astieger@suse.com>
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     2
Date: Fri, 26 Feb 2016 16:20:09 +0000
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     3
Subject: For UnifiedBindings*.cpp files, reduce number of files per unified file
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     4
Upstream: no
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     5
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     6
home/abuild/rpmbuild/BUILD/obj/dom/bindings/UnifiedBindings16.cpp
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     7
[ 1589s] UnifiedBindings17.o
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     8
[ 1612s] [ 1567.621989] Out of memory: Kill process 19849 (cc1plus) score 170 or sacrifice child
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
     9
[ 1612s] [ 1567.625099] Killed process 19849 (cc1plus) total-vm:905704kB, anon-rss:102500kB, file-rss:156kB
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    10
[ 1616s] {standard input}: Assembler messages:
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    11
[ 1616s] {standard input}:316015: Warning: end of file not at end of a line; newline inserted
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    12
[ 1635s] {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    13
[ 1636s] c++: internal compiler error: Killed (program cc1plus)
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    14
[ 1636s] Please submit a full bug report,
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    15
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    16
Index: mozilla/python/mozbuild/mozbuild/backend/common.py
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    17
===================================================================
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    18
--- mozilla.orig/python/mozbuild/mozbuild/backend/common.py	2016-02-26 17:19:30.331667693 +0100
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    19
+++ mozilla/python/mozbuild/mozbuild/backend/common.py	2016-02-26 17:19:39.792569676 +0100
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    20
@@ -333,7 +333,7 @@ class CommonBackend(BuildBackend):
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    21
         unified_source_mapping = list(group_unified_files(webidls.all_regular_cpp_basenames(),
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    22
                                                           unified_prefix='UnifiedBindings',
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    23
                                                           unified_suffix='cpp',
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    24
-                                                          files_per_unified_file=32))
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    25
+                                                          files_per_unified_file=16))
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    26
         self._write_unified_files(unified_source_mapping, bindings_dir,
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    27
                                   poison_windows_h=True)
83801946c93f 44.0.2 release
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
diff changeset
    28
         self._handle_webidl_build(bindings_dir, unified_source_mapping,