From f50e1c662a1b6e0daca141b9176416571da2a9c1 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Thu, 16 Aug 2018 16:44:36 +0900
Subject: [PATCH] Bug 1483779 - Enable PGO on clang-cl 32-bits builds. r=dmajor

--HG--
extra : source : 5fcbe08fb321a5076f56c380b554c63068efbb00
---
 Makefile.in                             | 3 ---
 build/moz.configure/toolchain.configure | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f94f29d67893..6f5a7752306a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -311,11 +311,8 @@ else
 ifneq ($(CC_TYPE),msvc)
 maybe_clobber_profiledbuild: clean
 ifneq (,$(findstring clang,$(CC_TYPE)))
-# 32-bit Windows PGO is currently blocked by bug 1479800
-ifneq ($(CC_TYPE)_$(CPU_ARCH),clang-cl_x86)
 	$(LLVM_PROFDATA) merge -o $(DEPTH)/merged.profdata $(DEPTH)/*.profraw
 endif
-endif
 else
 maybe_clobber_profiledbuild:
 	$(RM) $(DIST)/bin/*.pgc
diff --git a/build/moz.configure/toolchain.configure b/build/moz.configure/toolchain.configure
index b9abf24eb7e0..df5d4e636ebc 100755
--- a/build/moz.configure/toolchain.configure
+++ b/build/moz.configure/toolchain.configure
@@ -1262,9 +1262,10 @@ def pgo_flags(compiler, build_env, target):
     if compiler.type in ('clang-cl', 'clang'):
         profdata = os.path.join(topobjdir, 'merged.profdata')
         if compiler.type == 'clang-cl':
-            # 32-bit PGO is currently blocked by bug 1479800
             if target.cpu == 'x86_64':
                 gen_ldflags = ['clang_rt.profile-x86_64.lib']
+            elif target.cpu == 'x86':
+                gen_ldflags = ['clang_rt.profile-i386.lib']
             else:
                 gen_ldflags = None
         else: