Bug 1339075 - stylo: don't force mozjemalloc on Tier3 platforms. r=froydnj draft
authorJan Beich <jbeich@FreeBSD.org>
Wed, 22 Feb 2017 08:22:08 +0000
changeset 488404 fc35511ffd6c8761500a09d482bf2b19888ebfd0
parent 488125 7abeac2f2d668554f0093fc0bdb1488f9a77d16e
child 546713 5473cfe82912ce27f35717ce74575f2785f7c77f
push id46511
push userbmo:jbeich@FreeBSD.org
push dateThu, 23 Feb 2017 02:11:09 +0000
reviewersfroydnj
bugs1339075
milestone54.0a1
Bug 1339075 - stylo: don't force mozjemalloc on Tier3 platforms. r=froydnj MozReview-Commit-ID: 91ONYHQ9zzU
toolkit/moz.configure
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -665,19 +665,21 @@ def stylo(stylo_enabled, bindgen_config_
 
 set_config('MOZ_STYLO', delayed_getattr(stylo, 'enabled'))
 set_define('MOZ_STYLO', delayed_getattr(stylo, 'enabled'))
 
 set_config('MOZ_LIBCLANG_PATH', delayed_getattr(stylo, 'libclang_path'))
 set_config('MOZ_CLANG_PATH', delayed_getattr(stylo, 'clang_path'))
 set_config('MOZ_STYLO_BINDGEN', delayed_getattr(stylo, 'bindgen_enabled'))
 
-@depends(stylo, dmd)
-def jemalloc(stylo, dmd):
-    if stylo:
+@depends(stylo, target, dmd)
+def jemalloc(stylo, target, dmd):
+    if stylo and target.kernel in ('Darwin', 'Linux', 'WINNT'):
+        # Avoid a moving performance target if the default allocator
+        # is changed on Tier1 platforms (see bug 1291356).
         return 'moz'
     elif dmd:
         return True
 
 imply_option('--enable-jemalloc', jemalloc,
              reason='--enable-dmd or --enable-stylo')
 
 option('--with-servo', env='SERVO_TARGET_DIR', nargs=1,