5 files changed, 0 insertions, 45 deletions
diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build
index 102ebb44b..71f9a86de 100644
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@@ -135,11 +135,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3':
         'mozgtk_stub',
     ]
 
-if CONFIG['MOZ_JPROF']:
-    USE_LIBS += [
-        'jprof',
-    ]
-
 if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT'] or \
         CONFIG['MOZ_TREE_FREETYPE']:
     USE_LIBS += [
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index b9a687323..0ed17410a 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -22,19 +22,6 @@ def systrace(value, target):
 
 set_define('MOZ_USE_SYSTRACE', systrace)
 
-
-option('--enable-jprof', env='MOZ_JPROF',
-       help='Enable jprof profiling tool (needs mozilla/tools/jprof)')
-
-@depends('--enable-jprof')
-def jprof(value):
-    if value:
-        return True
-
-set_config('MOZ_JPROF', jprof)
-set_define('MOZ_JPROF', jprof)
-imply_option('--enable-profiling', jprof)
-
 @depends(target)
 def sps_profiler(target):
     if target.os == 'Android':
diff --git a/toolkit/toolkit.mozbuild b/toolkit/toolkit.mozbuild
index 98c109c1b..b4aebbef0 100644
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -103,10 +103,6 @@ else:
 
 # toolkit
 
-# This must precede xpfe.
-if CONFIG['MOZ_JPROF']:
-    DIRS += ['/tools/jprof']
-
 DIRS += [
     '/tools/power',
     '/tools/profiler',
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 2050b9671..e43aea926 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -182,10 +182,6 @@
 #include "mozilla/Logging.h"
 #endif
 
-#ifdef MOZ_JPROF
-#include "jprof.h"
-#endif
-
 #include "base/command_line.h"
 #include "GTestRunner.h"
 
@@ -1513,11 +1509,6 @@ static nsresult LaunchChild(nsINativeAppSupport* aNative,
   // Restart this process by exec'ing it into the current process
   // if supported by the platform.  Otherwise, use NSPR.
 
-#ifdef MOZ_JPROF
-  // make sure JPROF doesn't think we're E10s
-  unsetenv("JPROF_SLAVE");
-#endif
-
   if (aBlankCommandLine) {
     gRestartArgc = 1;
     gRestartArgv[gRestartArgc] = nullptr;
@@ -3393,11 +3384,6 @@ XREMain::XRE_mainStartup(bool* aExitFlag)
   XRE_InstallX11ErrorHandler();
 #endif
 
-  // Call the code to install our handler
-#ifdef MOZ_JPROF
-  setupProfilingStuff();
-#endif
-
   rv = NS_CreateNativeAppSupport(getter_AddRefs(mNativeApp));
   if (NS_FAILED(rv))
     return 1;
diff --git a/toolkit/xre/nsEmbedFunctions.cpp b/toolkit/xre/nsEmbedFunctions.cpp
index f62dbdd6d..1498b0d17 100644
--- a/toolkit/xre/nsEmbedFunctions.cpp
+++ b/toolkit/xre/nsEmbedFunctions.cpp
@@ -82,10 +82,6 @@
 using mozilla::_ipdltest::IPDLUnitTestProcessChild;
 #endif  // ifdef MOZ_IPDL_TESTS
 
-#ifdef MOZ_JPROF
-#include "jprof.h"
-#endif
-
 using namespace mozilla;
 
 using mozilla::ipc::BrowserProcessSubThread;
@@ -250,11 +246,6 @@ XRE_InitChildProcess(int aArgc,
   NS_ENSURE_ARG_POINTER(aArgv[0]);
   MOZ_ASSERT(aChildData);
 
-#ifdef MOZ_JPROF
-  // Call the code to install our handler
-  setupProfilingStuff();
-#endif
-
 #if !defined(MOZ_WIDGET_ANDROID)
   // On non-Fennec Gecko, the GMPLoader code resides in plugin-container,
   // and we must forward it through to the GMP code here.