Zipped LLVM multi-arch profiles is now supported.

RELNOTES: None. PiperOrigin-RevId: 168703540
zmnecj · Sep 15, 2017 · cd37941 · cd37941
1 parent 82d6e8a
commit cd37941
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchain.java
@@ -122,7 +122,12 @@ private Artifact convertLLVMRawProfileToIndexed(
         return null;
       }
 
+      // TODO(zhayu): find a way to avoid hard-coding cpu architecture here (b/65582760)
       String rawProfileFileName = "fdocontrolz_profile.profraw";
+      String cpu = cppConfiguration.getTargetCpu();
+      if (!"k8".equals(cpu)) {
+        rawProfileFileName = "fdocontrolz_profile-" + cpu + ".profraw";
+      }
       rawProfileArtifact =
           ruleContext.getUniqueDirectoryArtifact(
               "fdo", rawProfileFileName, ruleContext.getBinOrGenfilesDirectory());