From 719d1a33f6569864f529e5a3fff59e7bca97aad0 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Thu, 6 Mar 2014 12:13:39 -0800 Subject: Enable annotalysis on clang ART builds. Fix clang build errors aswell as restructure locking/mutex code for correct thread safety analysis support. Reorder make dependencies so that host builds build first as they should provide better compilation errors than target. Remove host's use of -fno-omit-frame-pointer as it has no value with correct use of CFI, which we should have. Change-Id: I72cea8da9a3757b1a0b3acb4081feccb7c6cef90 --- compiler/common_compiler_test.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/common_compiler_test.h') diff --git a/compiler/common_compiler_test.h b/compiler/common_compiler_test.h index bca72b872b..def7b681dc 100644 --- a/compiler/common_compiler_test.h +++ b/compiler/common_compiler_test.h @@ -35,9 +35,9 @@ namespace art { // A signal handler called when have an illegal instruction. We record the fact in // a global boolean and then increment the PC in the signal context to return to // the next instruction. We know the instruction is an sdiv (4 bytes long). -static void baddivideinst(int signo, siginfo *si, void *data) { - (void)signo; - (void)si; +static inline void baddivideinst(int signo, siginfo *si, void *data) { + UNUSED(signo); + UNUSED(si); struct ucontext *uc = (struct ucontext *)data; struct sigcontext *sc = &uc->uc_mcontext; sc->arm_r0 = 0; // set R0 to #0 to signal error @@ -56,7 +56,7 @@ static void baddivideinst(int signo, siginfo *si, void *data) { extern "C" bool CheckForARMSDIVInstruction(); -static InstructionSetFeatures GuessInstructionFeatures() { +static inline InstructionSetFeatures GuessInstructionFeatures() { InstructionSetFeatures f; // Uncomment this for processing of /proc/cpuinfo. @@ -107,7 +107,7 @@ static InstructionSetFeatures GuessInstructionFeatures() { // Given a set of instruction features from the build, parse it. The // input 'str' is a comma separated list of feature names. Parse it and // return the InstructionSetFeatures object. -static InstructionSetFeatures ParseFeatureList(std::string str) { +static inline InstructionSetFeatures ParseFeatureList(std::string str) { InstructionSetFeatures result; typedef std::vector FeatureList; FeatureList features; -- cgit v1.2.3-59-g8ed1b