generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* commit 'a2573d956bf98a6dd2bb391fdc344c7637b46e8d':
  AArch64: Add fixes to bionic/tests
This commit is contained in:
Elliott Hughes 2013-12-17 01:49:12 +00:00 committed by Android Git Automerger
commit 75ba3a341e
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
benchmarks/Android.mk
View File

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

6
benchmarks/benchmark_main.cpp
View File

@ -23,6 +23,8 @@
#include <string> #include <string>
#include <map> #include <map>
#include <inttypes.h>
static int64_t gBytesProcessed; static int64_t gBytesProcessed;
static int64_t gBenchmarkTotalTimeNs; static int64_t gBenchmarkTotalTimeNs;
static int64_t gBenchmarkStartTimeNs; static int64_t gBenchmarkStartTimeNs;
@ -162,8 +164,8 @@ void Benchmark::RunWithArg(int arg) {
snprintf(full_name, sizeof(full_name), "%s", name_); snprintf(full_name, sizeof(full_name), "%s", name_);
} }
printf("%-20s %10lld %10lld%s\n", full_name, printf("%-20s %10d %10" PRId64 "%s\n", full_name,
static_cast<int64_t>(iterations), gBenchmarkTotalTimeNs/iterations, throughput); iterations, gBenchmarkTotalTimeNs/iterations, throughput);
fflush(stdout); fflush(stdout);
} }

8
tests/Android.mk
View File

@ -29,6 +29,14 @@ test_c_flags = \
-Werror \ -Werror \
-fno-builtin \ -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 = \ test_src_files = \
buffer_tests.cpp \ buffer_tests.cpp \
dirent_test.cpp \ dirent_test.cpp \