From 913feb2a0df3f6eef8c1f2c4191e1cd9b8a872fe Mon Sep 17 00:00:00 2001
From: Etienne Bergeron <etienneb@google.com>
Date: Wed, 20 Jul 2016 21:38:02 +0000
Subject: [PATCH] revert rL276179: [compiler-rt] Fix broken unittest related to
 64-bit print format

llvm-svn: 276187
---
 compiler-rt/test/asan/TestCases/debug_mapping.cc | 2 +-
 compiler-rt/test/asan/TestCases/debug_stacks.cc  | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/compiler-rt/test/asan/TestCases/debug_mapping.cc b/compiler-rt/test/asan/TestCases/debug_mapping.cc
index badefb12f0e0..bd05f6aab353 100644
--- a/compiler-rt/test/asan/TestCases/debug_mapping.cc
+++ b/compiler-rt/test/asan/TestCases/debug_mapping.cc
@@ -15,7 +15,7 @@ int main() {
   __asan_get_shadow_mapping(&scale, &offset);
 
   fprintf(stderr, "scale: %d\n", (int)scale);
-  fprintf(stderr, "offset: 0x%zx\n", offset);
+  fprintf(stderr, "offset: 0x%lx\n", offset);
 
   // CHECK: scale: [[SCALE]]
   // CHECK: offset: [[OFFSET]]
diff --git a/compiler-rt/test/asan/TestCases/debug_stacks.cc b/compiler-rt/test/asan/TestCases/debug_stacks.cc
index 8ced81fbe67b..857e905094be 100644
--- a/compiler-rt/test/asan/TestCases/debug_stacks.cc
+++ b/compiler-rt/test/asan/TestCases/debug_stacks.cc
@@ -8,7 +8,6 @@
 #include <sanitizer/asan_interface.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 char *mem;
 void func1() {
@@ -36,9 +35,9 @@ int main() {
   // CHECK: alloc stack retval ok
   fprintf(stderr, "thread id = %d\n", thread_id);
   // CHECK: thread id = 0
-  fprintf(stderr, "0x%" PRIXPTR "\n", trace[0]);
+  fprintf(stderr, "0x%lx\n", trace[0]);
   // CHECK: [[ALLOC_FRAME_0:0x[0-9a-f]+]]
-  fprintf(stderr, "0x%" PRIXPTR "\n", trace[1]);
+  fprintf(stderr, "0x%lx\n", trace[1]);
   // CHECK: [[ALLOC_FRAME_1:0x[0-9a-f]+]]
 
   num_frames = 100;
@@ -49,9 +48,9 @@ int main() {
   // CHECK: free stack retval ok
   fprintf(stderr, "thread id = %d\n", thread_id);
   // CHECK: thread id = 0
-  fprintf(stderr, "0x%" PRIXPTR "\n", trace[0]);
+  fprintf(stderr, "0x%lx\n", trace[0]);
   // CHECK: [[FREE_FRAME_0:0x[0-9a-f]+]]
-  fprintf(stderr, "0x%" PRIXPTR "\n", trace[1]);
+  fprintf(stderr, "0x%lx\n", trace[1]);
   // CHECK: [[FREE_FRAME_1:0x[0-9a-f]+]]
 
   mem[0] = 'A'; // BOOM