Bug 1641785 - Move --with-jitreport-granularity to python configure. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 29 May 2020 12:17:26 +0000
changeset 533084 7259300b087bec02ec5e320795970ab824c0db31
parent 533083 4ad74d4766a1fdd563513ad5eab0ab8575a0d5e1
child 533085 23f9231f76bf57f5b8a1928c575f3ed1c503f44e
push id37462
push usermalexandru@mozilla.com
push dateSat, 30 May 2020 09:46:43 +0000
treeherdermozilla-central@8aaca63ec5c6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1641785
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1641785 - Move --with-jitreport-granularity to python configure. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D77415
build/moz.configure/old.configure
js/moz.configure
js/src/old-configure.in
old-configure.in
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -238,17 +238,16 @@ def old_configure_options(*options):
     '--with-android-distribution-directory',
     '--with-android-max-sdk',
     '--with-android-min-sdk',
     '--with-app-basename',
     '--with-app-name',
     '--with-branding',
     '--with-distribution-id',
     '--with-intl-api',
-    '--with-jitreport-granularity',
     '--with-macbundlename-prefix',
     '--with-nss-exec-prefix',
     '--with-nss-prefix',
     '--with-system-icu',
     '--with-system-libevent',
     '--with-system-nss',
     '--with-system-png',
     '--with-user-appdir',
--- a/js/moz.configure
+++ b/js/moz.configure
@@ -703,8 +703,20 @@ set_config('EDITLINE_LIBS', ['-lreadline
 
 @depends('--enable-readline', editline, when=editline)
 def bundled_editline(readline, editline):
     return editline and not readline
 
 set_config('JS_BUNDLED_EDITLINE', bundled_editline)
 
 set_define('EDITLINE', True, when=editline)
+
+
+# JIT observers
+# =============
+
+js_option('--with-jitreport-granularity', default='3', choices=('0', '1', '2', '3'),
+          help='Default granularity at which to report JIT code to external tools '
+               '(0 - no info, 1 - code ranges for while functions only, '
+               '2 - per-line information, 3 - per-op information)')
+
+set_define('JS_DEFAULT_JITREPORT_GRANULARITY',
+           depends_if('--with-jitreport-granularity')(lambda value: value[0]))
--- a/js/src/old-configure.in
+++ b/js/src/old-configure.in
@@ -1267,33 +1267,16 @@ dnl ====================================
 if test -z "$SKIP_LIBRARY_CHECKS"; then
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
     AC_CHECK_FUNCS(__cxa_demangle, HAVE_DEMANGLE=1, HAVE_DEMANGLE=)
     AC_LANG_RESTORE
 fi
 
 dnl ========================================================
-dnl JIT observers
-dnl ========================================================
-
-MOZ_ARG_WITH_STRING(jitreport-granularity,
-[  --jitreport-granularity=N
-                           Default granularity at which to report JIT code
-                           to external tools
-                             0 - no info
-                             1 - code ranges for whole functions only
-                             2 - per-line information
-                             3 - per-op information],
-  JITREPORT_GRANULARITY=$withval,
-  JITREPORT_GRANULARITY=3)
-
-AC_DEFINE_UNQUOTED(JS_DEFAULT_JITREPORT_GRANULARITY, $JITREPORT_GRANULARITY)
-
-dnl ========================================================
 dnl =
 dnl = Misc. Options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Misc. Options)
 
 if test -z "$SKIP_COMPILER_CHECKS"; then
 
--- a/old-configure.in
+++ b/old-configure.in
@@ -2288,33 +2288,16 @@ dnl ====================================
 if test -z "$SKIP_LIBRARY_CHECKS"; then
     AC_LANG_SAVE
     AC_LANG_CPLUSPLUS
     MOZ_CHECK_HEADER(unwind.h, AC_CHECK_FUNCS(_Unwind_Backtrace))
     AC_LANG_RESTORE
 fi
 
 dnl ========================================================
-dnl JIT observers
-dnl ========================================================
-
-MOZ_ARG_WITH_STRING(jitreport-granularity,
-[  --jitreport-granularity=N
-                           Default granularity at which to report JIT code
-                           to external tools
-                             0 - no info
-                             1 - code ranges for whole functions only
-                             2 - per-line information
-                             3 - per-op information],
-  JITREPORT_GRANULARITY=$withval,
-  JITREPORT_GRANULARITY=3)
-
-AC_DEFINE_UNQUOTED(JS_DEFAULT_JITREPORT_GRANULARITY, $JITREPORT_GRANULARITY)
-
-dnl ========================================================
 dnl =
 dnl = Misc. Options
 dnl =
 dnl ========================================================
 MOZ_ARG_HEADER(Misc. Options)
 
 dnl ========================================================
 dnl = Location of the mozilla user directory (default is ~/.mozilla).],