a3bc9c3699
- fix build problems on i586, caused by too large unified compile units Server build is still running, let's see... OBS-URL: https://build.opensuse.org/request/show/361943 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=486
29 lines
1.8 KiB
Diff
29 lines
1.8 KiB
Diff
From: Andreas Stieger <astieger@suse.com>
|
|
Date: Fri, 26 Feb 2016 16:20:09 +0000
|
|
Subject: For UnifiedBindings*.cpp files, reduce number of files per unified file
|
|
Upstream: no
|
|
|
|
home/abuild/rpmbuild/BUILD/obj/dom/bindings/UnifiedBindings16.cpp
|
|
[ 1589s] UnifiedBindings17.o
|
|
[ 1612s] [ 1567.621989] Out of memory: Kill process 19849 (cc1plus) score 170 or sacrifice child
|
|
[ 1612s] [ 1567.625099] Killed process 19849 (cc1plus) total-vm:905704kB, anon-rss:102500kB, file-rss:156kB
|
|
[ 1616s] {standard input}: Assembler messages:
|
|
[ 1616s] {standard input}:316015: Warning: end of file not at end of a line; newline inserted
|
|
[ 1635s] {standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive
|
|
[ 1636s] c++: internal compiler error: Killed (program cc1plus)
|
|
[ 1636s] Please submit a full bug report,
|
|
|
|
Index: mozilla/python/mozbuild/mozbuild/backend/common.py
|
|
===================================================================
|
|
--- mozilla.orig/python/mozbuild/mozbuild/backend/common.py 2016-02-26 17:19:30.331667693 +0100
|
|
+++ mozilla/python/mozbuild/mozbuild/backend/common.py 2016-02-26 17:19:39.792569676 +0100
|
|
@@ -333,7 +333,7 @@ class CommonBackend(BuildBackend):
|
|
unified_source_mapping = list(group_unified_files(webidls.all_regular_cpp_basenames(),
|
|
unified_prefix='UnifiedBindings',
|
|
unified_suffix='cpp',
|
|
- files_per_unified_file=32))
|
|
+ files_per_unified_file=16))
|
|
self._write_unified_files(unified_source_mapping, bindings_dir,
|
|
poison_windows_h=True)
|
|
self._handle_webidl_build(bindings_dir, unified_source_mapping,
|