diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in index 0e949d0d25dd..7077b14a57a8 100644 --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in @@ -639,7 +639,6 @@ MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@ # Win32 options MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@ MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@ -MOZ_QUANTIFY = @MOZ_QUANTIFY@ MSMANIFEST_TOOL = @MSMANIFEST_TOOL@ WIN32_REDIST_DIR = @WIN32_REDIST_DIR@ MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@ diff --git a/config/config.mk b/config/config.mk index 11fe77c5bfb7..325a94e336cd 100644 --- a/config/config.mk +++ b/config/config.mk @@ -221,17 +221,6 @@ OS_LDFLAGS += -DEBUG -OPT:REF endif endif -ifdef MOZ_QUANTIFY -# -FIXED:NO is needed for Quantify to work, but it increases the size -# of executables, so only use it if building for Quantify. -WIN32_EXE_LDFLAGS += -FIXED:NO - -# We need -OPT:NOICF to prevent identical methods from being merged together. -# Otherwise, Quantify doesn't know which method was actually called when it's -# showing you the profile. -OS_LDFLAGS += -OPT:NOICF -endif - # # Handle trace-malloc in optimized builds. # No opt to give sane callstacks. @@ -403,7 +392,6 @@ MY_RULES := $(DEPTH)/config/myrules.mk # Default command macros; can be overridden in .mk. # CCC = $(CXX) -QUANTIFY = quantify $(QUANTIFYOPTIONS) XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link # Java macros diff --git a/config/rules.mk b/config/rules.mk index 3a6926d166f3..67144140de0b 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -954,16 +954,6 @@ else endif endif -quantify: $(PROGRAM) -ifeq ($(CPP_PROG_LINK),1) - $(QUANTIFY) $(CCC) -o $^.quantify $(CXXFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) -else - $(QUANTIFY) $(CC) -o $^.quantify $(CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) -endif -ifndef NO_DIST_INSTALL - $(INSTALL) $(IFLAGS2) $^.quantify $(FINAL_TARGET) -endif - ifdef DTRACE_PROBE_OBJ EXTRA_DEPS += $(DTRACE_PROBE_OBJ) OBJS += $(DTRACE_PROBE_OBJ) diff --git a/configure.in b/configure.in index 2974616486b8..18c556a53ee8 100644 --- a/configure.in +++ b/configure.in @@ -7571,14 +7571,6 @@ if test -n "$_ENABLE_CODESIGHS"; then fi fi -dnl ======================================================== -dnl = Support for Quantify (Windows) -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(quantify, -[ --enable-quantify Enable Quantify support (Windows only) ], - MOZ_QUANTIFY=1, - MOZ_QUANTIFY= ) - dnl ======================================================== dnl = Enable Radio Interface for B2G (Gonk usually) dnl ======================================================== diff --git a/js/src/config/autoconf.mk.in b/js/src/config/autoconf.mk.in index 0af49d2d802a..865c9dcf092c 100644 --- a/js/src/config/autoconf.mk.in +++ b/js/src/config/autoconf.mk.in @@ -309,7 +309,6 @@ MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@ # Win32 options MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@ MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@ -MOZ_QUANTIFY = @MOZ_QUANTIFY@ MSMANIFEST_TOOL = @MSMANIFEST_TOOL@ MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@ MOZ_GLUE_PROGRAM_LDFLAGS = @MOZ_GLUE_PROGRAM_LDFLAGS@ diff --git a/js/src/config/config.mk b/js/src/config/config.mk index 11fe77c5bfb7..325a94e336cd 100644 --- a/js/src/config/config.mk +++ b/js/src/config/config.mk @@ -221,17 +221,6 @@ OS_LDFLAGS += -DEBUG -OPT:REF endif endif -ifdef MOZ_QUANTIFY -# -FIXED:NO is needed for Quantify to work, but it increases the size -# of executables, so only use it if building for Quantify. -WIN32_EXE_LDFLAGS += -FIXED:NO - -# We need -OPT:NOICF to prevent identical methods from being merged together. -# Otherwise, Quantify doesn't know which method was actually called when it's -# showing you the profile. -OS_LDFLAGS += -OPT:NOICF -endif - # # Handle trace-malloc in optimized builds. # No opt to give sane callstacks. @@ -403,7 +392,6 @@ MY_RULES := $(DEPTH)/config/myrules.mk # Default command macros; can be overridden in .mk. # CCC = $(CXX) -QUANTIFY = quantify $(QUANTIFYOPTIONS) XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link # Java macros diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 3a6926d166f3..67144140de0b 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -954,16 +954,6 @@ else endif endif -quantify: $(PROGRAM) -ifeq ($(CPP_PROG_LINK),1) - $(QUANTIFY) $(CCC) -o $^.quantify $(CXXFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) -else - $(QUANTIFY) $(CC) -o $^.quantify $(CFLAGS) $(PROGOBJS) $(LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) -endif -ifndef NO_DIST_INSTALL - $(INSTALL) $(IFLAGS2) $^.quantify $(FINAL_TARGET) -endif - ifdef DTRACE_PROBE_OBJ EXTRA_DEPS += $(DTRACE_PROBE_OBJ) OBJS += $(DTRACE_PROBE_OBJ) diff --git a/js/src/configure.in b/js/src/configure.in index 500b94a0d79e..1140756a6727 100644 --- a/js/src/configure.in +++ b/js/src/configure.in @@ -4366,14 +4366,6 @@ dnl = dnl ======================================================== MOZ_ARG_HEADER(Profiling and Instrumenting) -dnl ======================================================== -dnl = Support for Quantify (Windows) -dnl ======================================================== -MOZ_ARG_ENABLE_BOOL(quantify, -[ --enable-quantify Enable Quantify support (Windows only) ], - MOZ_QUANTIFY=1, - MOZ_QUANTIFY= ) - dnl ======================================================== dnl = Support for demangling undefined symbols dnl ========================================================