3 files changed, 0 insertions, 36 deletions
diff --git a/toolkit/components/aboutmemory/content/aboutMemory.js b/toolkit/components/aboutmemory/content/aboutMemory.js
index c62416dc5..dcc1ce3ac 100644
--- a/toolkit/components/aboutmemory/content/aboutMemory.js
+++ b/toolkit/components/aboutmemory/content/aboutMemory.js
@@ -367,22 +367,6 @@ function onLoad()
   appendButton(row4, GCAndCCAllLogDesc,
                saveGCLogAndVerboseCCLog, "Save verbose", 'saveLogsVerbose');
 
-  // Three cases here:
-  // - DMD is disabled (i.e. not built): don't show the button.
-  // - DMD is enabled but is not running: show the button, but disable it.
-  // - DMD is enabled and is running: show the button and enable it.
-  if (gMgr.isDMDEnabled) {
-    let row5 = appendElement(ops, "div", "opsRow");
-
-    appendElementWithText(row5, "div", "opsRowLabel", "Save DMD output");
-    let enableButtons = gMgr.isDMDRunning;
-
-    let dmdButton =
-      appendButton(row5, enableButtons ? DMDEnabledDesc : DMDDisabledDesc,
-                   doDMD, "Save");
-    dmdButton.disabled = !enableButtons;
-  }
-
   // Generate the main div, where content ("section" divs) will go.  It's
   // hidden at first.
 
diff --git a/toolkit/moz.configure b/toolkit/moz.configure
index 854814292..b9a687323 100644
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -52,22 +52,6 @@ set_config('MOZ_ENABLE_PROFILER_SPS', sps_profiler_define)
 set_define('MOZ_ENABLE_PROFILER_SPS', sps_profiler_define)
 
 
-option('--enable-dmd', env='MOZ_DMD',
-       help='Enable Dark Matter Detector (heap profiler). '
-            'Also enables jemalloc, replace-malloc and profiling')
-
-@depends('--enable-dmd')
-def dmd(value):
-    if value:
-        return True
-
-set_config('MOZ_DMD', dmd)
-set_define('MOZ_DMD', dmd)
-add_old_configure_assignment('MOZ_DMD', dmd)
-imply_option('--enable-profiling', dmd)
-imply_option('--enable-jemalloc', dmd)
-imply_option('--enable-replace-malloc', dmd)
-
 # JACK cubeb backend
 # ==============================================================
 option('--enable-jack', env='MOZ_JACK',
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
index 9abfd855a..25103ff37 100644
--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -349,10 +349,6 @@ ifndef MOZ_PKG_MANIFEST
   NO_PKG_FILES += ssltunnel*
 endif
 
-ifdef MOZ_DMD
-  NO_PKG_FILES += SmokeDMD
-endif
-
 DEFINES += -DDLL_PREFIX=$(DLL_PREFIX) -DDLL_SUFFIX=$(DLL_SUFFIX) -DBIN_SUFFIX=$(BIN_SUFFIX)
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))