mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
bug 542504 - SIMPLE_PROGRAMS (and CPP_UNIT_TESTS) don't get re-linked in a PGO build. r=mitch, a=mossop
--HG-- extra : rebase_source : b33997adcd4567057adf01d8d3e4ac857e4df502
This commit is contained in:
parent
216546da26
commit
1e6eb58585
@ -323,29 +323,35 @@ ifdef MOZ_PROFILE_GUIDED_OPTIMIZE_DISABLE
|
||||
NO_PROFILE_GUIDED_OPTIMIZE = 1
|
||||
endif
|
||||
|
||||
# No sense in profiling tools
|
||||
ifdef INTERNAL_TOOLS
|
||||
NO_PROFILE_GUIDED_OPTIMIZE = 1
|
||||
endif
|
||||
|
||||
# Don't build SIMPLE_PROGRAMS with PGO, since they don't need it anyway,
|
||||
# and we don't have the same build logic to re-link them in the second pass.
|
||||
ifdef SIMPLE_PROGRAMS
|
||||
NO_PROFILE_GUIDED_OPTIMIZE = 1
|
||||
endif
|
||||
|
||||
# Enable profile-based feedback
|
||||
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
||||
ifdef MOZ_PROFILE_GENERATE
|
||||
# No sense in profiling tools
|
||||
ifndef INTERNAL_TOOLS
|
||||
OS_CFLAGS += $(PROFILE_GEN_CFLAGS)
|
||||
OS_CXXFLAGS += $(PROFILE_GEN_CFLAGS)
|
||||
OS_LDFLAGS += $(PROFILE_GEN_LDFLAGS)
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
AR_FLAGS += -LTCG
|
||||
endif
|
||||
endif # INTERNAL_TOOLS
|
||||
endif # MOZ_PROFILE_GENERATE
|
||||
|
||||
ifdef MOZ_PROFILE_USE
|
||||
ifndef INTERNAL_TOOLS
|
||||
OS_CFLAGS += $(PROFILE_USE_CFLAGS)
|
||||
OS_CXXFLAGS += $(PROFILE_USE_CFLAGS)
|
||||
OS_LDFLAGS += $(PROFILE_USE_LDFLAGS)
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
AR_FLAGS += -LTCG
|
||||
endif
|
||||
endif # INTERNAL_TOOLS
|
||||
endif # MOZ_PROFILE_USE
|
||||
endif # NO_PROFILE_GUIDED_OPTIMIZE
|
||||
|
||||
|
@ -934,7 +934,7 @@ endif # !NO_DIST_INSTALL
|
||||
|
||||
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
||||
ifdef MOZ_PROFILE_USE
|
||||
ifeq ($(OS_ARCH)_$(GNU_CC)$(INTERNAL_TOOLS), WINNT_)
|
||||
ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
|
||||
# When building with PGO, we have to make sure to re-link
|
||||
# in the MOZ_PROFILE_USE phase if we linked in the
|
||||
# MOZ_PROFILE_GENERATE phase. We'll touch this pgo.relink
|
||||
|
@ -323,29 +323,35 @@ ifdef MOZ_PROFILE_GUIDED_OPTIMIZE_DISABLE
|
||||
NO_PROFILE_GUIDED_OPTIMIZE = 1
|
||||
endif
|
||||
|
||||
# No sense in profiling tools
|
||||
ifdef INTERNAL_TOOLS
|
||||
NO_PROFILE_GUIDED_OPTIMIZE = 1
|
||||
endif
|
||||
|
||||
# Don't build SIMPLE_PROGRAMS with PGO, since they don't need it anyway,
|
||||
# and we don't have the same build logic to re-link them in the second pass.
|
||||
ifdef SIMPLE_PROGRAMS
|
||||
NO_PROFILE_GUIDED_OPTIMIZE = 1
|
||||
endif
|
||||
|
||||
# Enable profile-based feedback
|
||||
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
||||
ifdef MOZ_PROFILE_GENERATE
|
||||
# No sense in profiling tools
|
||||
ifndef INTERNAL_TOOLS
|
||||
OS_CFLAGS += $(PROFILE_GEN_CFLAGS)
|
||||
OS_CXXFLAGS += $(PROFILE_GEN_CFLAGS)
|
||||
OS_LDFLAGS += $(PROFILE_GEN_LDFLAGS)
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
AR_FLAGS += -LTCG
|
||||
endif
|
||||
endif # INTERNAL_TOOLS
|
||||
endif # MOZ_PROFILE_GENERATE
|
||||
|
||||
ifdef MOZ_PROFILE_USE
|
||||
ifndef INTERNAL_TOOLS
|
||||
OS_CFLAGS += $(PROFILE_USE_CFLAGS)
|
||||
OS_CXXFLAGS += $(PROFILE_USE_CFLAGS)
|
||||
OS_LDFLAGS += $(PROFILE_USE_LDFLAGS)
|
||||
ifeq (WINNT,$(OS_ARCH))
|
||||
AR_FLAGS += -LTCG
|
||||
endif
|
||||
endif # INTERNAL_TOOLS
|
||||
endif # MOZ_PROFILE_USE
|
||||
endif # NO_PROFILE_GUIDED_OPTIMIZE
|
||||
|
||||
|
@ -934,7 +934,7 @@ endif # !NO_DIST_INSTALL
|
||||
|
||||
ifndef NO_PROFILE_GUIDED_OPTIMIZE
|
||||
ifdef MOZ_PROFILE_USE
|
||||
ifeq ($(OS_ARCH)_$(GNU_CC)$(INTERNAL_TOOLS), WINNT_)
|
||||
ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
|
||||
# When building with PGO, we have to make sure to re-link
|
||||
# in the MOZ_PROFILE_USE phase if we linked in the
|
||||
# MOZ_PROFILE_GENERATE phase. We'll touch this pgo.relink
|
||||
|
Loading…
Reference in New Issue
Block a user