commit 282e232e2a32cca8a288e81edddfd95f450cfc79
author Serban Constantinescu <serban.constantinescu@arm.com> Tue Oct 22 11:30:12 2013 +0100
committer Elliott Hughes <enh@google.com> Mon Dec 16 17:40:30 2013 -0800
tree 43c466720c7ac06b055d9b6c12db0ad944669a6d
parent 4e78ca63b8d53b96c590d3f1b29b0cfb65a651bc

AArch64: Add fixes to bionic/tests

This patch adds minor fixes to the bionic unit tests.

Change-Id: Ie10f33c631ed6c10987923d678711d22931ddb05
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>

benchmarks/Android.mk

diff --git a/benchmarks/Android.mk b/benchmarks/Android.mk
index 83e490f..f64c108 100644
--- a/benchmarks/Android.mk
+++ b/benchmarks/Android.mk
@@ -27,6 +27,7 @@
     -Wall -Wextra \
     -Werror \
     -fno-builtin \
+    -std=gnu++11 \
 
 benchmark_src_files = \
     benchmark_main.cpp \

benchmarks/benchmark_main.cpp

diff --git a/benchmarks/benchmark_main.cpp b/benchmarks/benchmark_main.cpp
index e15a688..d8b8e58 100644
--- a/benchmarks/benchmark_main.cpp
+++ b/benchmarks/benchmark_main.cpp
@@ -23,6 +23,8 @@
 #include <string>
 #include <map>
 
+#include <inttypes.h>
+
 static int64_t gBytesProcessed;
 static int64_t gBenchmarkTotalTimeNs;
 static int64_t gBenchmarkStartTimeNs;
@@ -162,8 +164,8 @@
     snprintf(full_name, sizeof(full_name), "%s", name_);
   }
 
-  printf("%-20s %10lld %10lld%s\n", full_name,
-         static_cast<int64_t>(iterations), gBenchmarkTotalTimeNs/iterations, throughput);
+  printf("%-20s %10d %10" PRId64 "%s\n", full_name,
+         iterations, gBenchmarkTotalTimeNs/iterations, throughput);
   fflush(stdout);
 }