author | Wolfgang Rosenauer <wr@rosenauer.org> |
Fri, 09 Feb 2018 13:28:07 +0100 | |
changeset 1031 | 4b419fce88dc |
parent 1006 | 5ba9b67de554 |
child 1045 | f645c886d36b |
permissions | -rw-r--r-- |
903 | 1 |
From: Andreas Stieger <astieger@suse.com> |
2 |
Date: Fri, 26 Feb 2016 16:20:09 +0000 |
|
3 |
Subject: For UnifiedBindings*.cpp files, reduce number of files per unified file |
|
4 |
Upstream: no |
|
5 |
||
6 |
home/abuild/rpmbuild/BUILD/obj/dom/bindings/UnifiedBindings16.cpp |
|
7 |
[ 1589s] UnifiedBindings17.o |
|
8 |
[ 1612s] [ 1567.621989] Out of memory: Kill process 19849 (cc1plus) score 170 or sacrifice child |
|
9 |
[ 1612s] [ 1567.625099] Killed process 19849 (cc1plus) total-vm:905704kB, anon-rss:102500kB, file-rss:156kB |
|
10 |
[ 1616s] {standard input}: Assembler messages: |
|
11 |
[ 1616s] {standard input}:316015: Warning: end of file not at end of a line; newline inserted |
|
12 |
[ 1635s] {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive |
|
13 |
[ 1636s] c++: internal compiler error: Killed (program cc1plus) |
|
14 |
[ 1636s] Please submit a full bug report, |
|
15 |
||
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
16 |
diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
17 |
--- a/python/mozbuild/mozbuild/backend/common.py |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
18 |
+++ b/python/mozbuild/mozbuild/backend/common.py |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
19 |
@@ -386,17 +386,17 @@ class CommonBackend(BuildBackend): |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
20 |
) |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
21 |
self._handle_generated_sources(manager.expected_build_output_files()) |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
22 |
# Bindings are compiled in unified mode to speed up compilation and |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
23 |
# to reduce linker memory size. Note that test bindings are separated |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
24 |
# from regular ones so tests bindings aren't shipped. |
903 | 25 |
unified_source_mapping = list(group_unified_files(webidls.all_regular_cpp_basenames(), |
26 |
unified_prefix='UnifiedBindings', |
|
27 |
unified_suffix='cpp', |
|
28 |
- files_per_unified_file=32)) |
|
29 |
+ files_per_unified_file=16)) |
|
30 |
self._write_unified_files(unified_source_mapping, bindings_dir, |
|
31 |
poison_windows_h=True) |
|
32 |
self._handle_webidl_build(bindings_dir, unified_source_mapping, |
|
1006
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
33 |
webidls, |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
34 |
manager.expected_build_output_files(), |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
35 |
manager.GLOBAL_DEFINE_FILES) |
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
36 |
|
5ba9b67de554
full rebase incl. fixing KDE variants of UI definitions
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
903
diff
changeset
|
37 |
def _write_unified_file(self, unified_file, source_filenames, |