Bug 1557762 - ensure we define NS_FREE_PERMANENT_DATA for single-stage pgo builds, r=chmanchester

Differential Revision: https://phabricator.services.mozilla.com/D35469

--HG--
extra : moz-landing-system : lando

config/config.mk

@@ -133,6 +133,7 @@ endif
 # Enable profile-based feedback
 ifneq (1,$(NO_PROFILE_GUIDED_OPTIMIZE))
 ifdef MOZ_PROFILE_GENERATE
+PGO_CFLAGS += -DNS_FREE_PERMANENT_DATA=1
 PGO_CFLAGS += $(if $(filter $(notdir $<),$(notdir $(NO_PROFILE_GUIDED_OPTIMIZE))),,$(PROFILE_GEN_CFLAGS))
 PGO_LDFLAGS += $(PROFILE_GEN_LDFLAGS)
 ifeq (WINNT,$(OS_ARCH))

xpcom/base/nscore.h

@@ -172,11 +172,13 @@
  * if we're using _exit. Bug 1555974 covers improving this.
  *
  */
+#ifndef NS_FREE_PERMANENT_DATA
 #if defined(NS_BUILD_REFCNT_LOGGING) || defined(MOZ_VALGRIND) || \
     defined(MOZ_ASAN) || defined(MOZ_CODE_COVERAGE) ||           \
     defined(MOZ_PROFILE_GENERATE)
 #  define NS_FREE_PERMANENT_DATA
 #endif
+#endif
 
 /**
  * NS_NO_VTABLE is emitted by xpidl in interface declarations whenever