зеркало из https://github.com/mozilla/gecko-dev.git
Bug 744444 - Part 2: delete quantify target and related support; r=ted
This commit is contained in:
Родитель
921b036082
Коммит
c220ef11a3
|
@ -639,7 +639,6 @@ MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
|
||||||
# Win32 options
|
# Win32 options
|
||||||
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
||||||
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
||||||
MOZ_QUANTIFY = @MOZ_QUANTIFY@
|
|
||||||
MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
|
MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
|
||||||
WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
|
WIN32_REDIST_DIR = @WIN32_REDIST_DIR@
|
||||||
MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@
|
MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@
|
||||||
|
|
|
@ -221,17 +221,6 @@ OS_LDFLAGS += -DEBUG -OPT:REF
|
||||||
endif
|
endif
|
||||||
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.
|
# Handle trace-malloc in optimized builds.
|
||||||
# No opt to give sane callstacks.
|
# No opt to give sane callstacks.
|
||||||
|
@ -403,7 +392,6 @@ MY_RULES := $(DEPTH)/config/myrules.mk
|
||||||
# Default command macros; can be overridden in <arch>.mk.
|
# Default command macros; can be overridden in <arch>.mk.
|
||||||
#
|
#
|
||||||
CCC = $(CXX)
|
CCC = $(CXX)
|
||||||
QUANTIFY = quantify $(QUANTIFYOPTIONS)
|
|
||||||
XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
|
XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
|
||||||
|
|
||||||
# Java macros
|
# Java macros
|
||||||
|
|
|
@ -954,16 +954,6 @@ else
|
||||||
endif
|
endif
|
||||||
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
|
ifdef DTRACE_PROBE_OBJ
|
||||||
EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
|
EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
|
||||||
OBJS += $(DTRACE_PROBE_OBJ)
|
OBJS += $(DTRACE_PROBE_OBJ)
|
||||||
|
|
|
@ -7571,14 +7571,6 @@ if test -n "$_ENABLE_CODESIGHS"; then
|
||||||
fi
|
fi
|
||||||
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 ========================================================
|
||||||
dnl = Enable Radio Interface for B2G (Gonk usually)
|
dnl = Enable Radio Interface for B2G (Gonk usually)
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
|
|
|
@ -309,7 +309,6 @@ MOZILLA_OFFICIAL = @MOZILLA_OFFICIAL@
|
||||||
# Win32 options
|
# Win32 options
|
||||||
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
MOZ_BROWSE_INFO = @MOZ_BROWSE_INFO@
|
||||||
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
MOZ_TOOLS_DIR = @MOZ_TOOLS_DIR@
|
||||||
MOZ_QUANTIFY = @MOZ_QUANTIFY@
|
|
||||||
MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
|
MSMANIFEST_TOOL = @MSMANIFEST_TOOL@
|
||||||
MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@
|
MOZ_GLUE_LDFLAGS = @MOZ_GLUE_LDFLAGS@
|
||||||
MOZ_GLUE_PROGRAM_LDFLAGS = @MOZ_GLUE_PROGRAM_LDFLAGS@
|
MOZ_GLUE_PROGRAM_LDFLAGS = @MOZ_GLUE_PROGRAM_LDFLAGS@
|
||||||
|
|
|
@ -221,17 +221,6 @@ OS_LDFLAGS += -DEBUG -OPT:REF
|
||||||
endif
|
endif
|
||||||
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.
|
# Handle trace-malloc in optimized builds.
|
||||||
# No opt to give sane callstacks.
|
# No opt to give sane callstacks.
|
||||||
|
@ -403,7 +392,6 @@ MY_RULES := $(DEPTH)/config/myrules.mk
|
||||||
# Default command macros; can be overridden in <arch>.mk.
|
# Default command macros; can be overridden in <arch>.mk.
|
||||||
#
|
#
|
||||||
CCC = $(CXX)
|
CCC = $(CXX)
|
||||||
QUANTIFY = quantify $(QUANTIFYOPTIONS)
|
|
||||||
XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
|
XPIDL_LINK = $(PYTHON) $(LIBXUL_DIST)/sdk/bin/xpt.py link
|
||||||
|
|
||||||
# Java macros
|
# Java macros
|
||||||
|
|
|
@ -954,16 +954,6 @@ else
|
||||||
endif
|
endif
|
||||||
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
|
ifdef DTRACE_PROBE_OBJ
|
||||||
EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
|
EXTRA_DEPS += $(DTRACE_PROBE_OBJ)
|
||||||
OBJS += $(DTRACE_PROBE_OBJ)
|
OBJS += $(DTRACE_PROBE_OBJ)
|
||||||
|
|
|
@ -4366,14 +4366,6 @@ dnl =
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
MOZ_ARG_HEADER(Profiling and Instrumenting)
|
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 ========================================================
|
||||||
dnl = Support for demangling undefined symbols
|
dnl = Support for demangling undefined symbols
|
||||||
dnl ========================================================
|
dnl ========================================================
|
||||||
|
|
Загрузка…
Ссылка в новой задаче