1 files changed, 6 insertions, 4 deletions
diff --git a/compiler-rt/lib/profile/InstrProfiling.c b/compiler-rt/lib/profile/InstrProfiling.c
index 970907c405b..123dd0d3b35 100644
--- a/compiler-rt/lib/profile/InstrProfiling.c
+++ b/compiler-rt/lib/profile/InstrProfiling.c
@@ -14,11 +14,13 @@ uint64_t __llvm_profile_get_magic(void) {
   /* Magic number to detect file format and endianness.
    *
    * Use 255 at one end, since no UTF-8 file can use that character.  Avoid 0,
-   * so that utilities like strings doesn't grab it as a string.  129 is high
-   * enough to be interesting.
+   * so that utilities, like strings, don't grab it as a string.  129 is also
+   * invalid UTF-8, and high enough to be interesting.
    *
-   * Use "lprofr" in the centre to stand for "LLVM Profile Raw".
+   * Use "lprofr" in the centre to stand for "LLVM Profile Raw", or "lprofR"
+   * for 32-bit platforms.
    */
+  unsigned char R = sizeof(void *) == sizeof(uint64_t) ? 'r' : 'R';
   return
     (uint64_t)255 << 56 |
     (uint64_t)'l' << 48 |
@@ -26,7 +28,7 @@ uint64_t __llvm_profile_get_magic(void) {
     (uint64_t)'r' << 32 |
     (uint64_t)'o' << 24 |
     (uint64_t)'f' << 16 |
-    (uint64_t)'r' <<  8 |
+    (uint64_t) R  <<  8 |
     (uint64_t)129;
 }