am a2573d95: am 2e3826c0: Merge "AArch64: Add fixes to bionic/tests"

* commit 'a2573d956bf98a6dd2bb391fdc344c7637b46e8d':
  AArch64: Add fixes to bionic/tests

benchmarks/Android.mk

@@ -27,6 +27,7 @@ benchmark_c_flags = \
     -Wall -Wextra \
     -Werror \
     -fno-builtin \
+    -std=gnu++11 \
 
 benchmark_src_files = \
     benchmark_main.cpp \

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 @@ void Benchmark::RunWithArg(int arg) {
     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);
 }
 

tests/Android.mk

@@ -29,6 +29,14 @@ test_c_flags = \
     -Werror \
     -fno-builtin \
 
+ifeq ($(TARGET_ARCH),aarch64)
+  $(info TODO: $(LOCAL_PATH)/Android.mk -fstack-protector not yet available for the AArch64 toolchain)
+  test_c_flags += -fno-stack-protector
+
+  $(info TODO: $(LOCAL_PATH)/Android.mk aarch64 GCC sees things other GCCs do not; punt for now)
+  test_c_flags += -Wno-error=strict-aliasing
+endif # aarch64
+
 test_src_files = \
     buffer_tests.cpp \
     dirent_test.cpp \