diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2014-09-29 10:06:49 +0530 |
|---|---|---|
| committer | Jon Medhurst <tixy@linaro.org> | 2014-09-29 08:47:33 +0100 |
| commit | 2d9ffc547ab921f6b9f704074ae60a035d845b3d (patch) | |
| tree | d11f7305747443f43202d987dfe72494277e1d78 | |
| parent | 453e383dc8faa82fbdc52d1dc35199926440caf9 (diff) | |
gatord: fix build for ARMv8tracking-gator-llct-20141001.0tracking-gator-llct-20140929.0
AArch64 builds do not support "-mthumb-interwork" flag and
it seem we don't need this flag for 32bit ARM builds as well.
Hence getting rid of it entirely.
"valloc" is deprecated for Android 64bit builds hence using
"malloc" instead.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
Signed-off-by: Jon Medhurst <tixy@linaro.org>
| -rw-r--r-- | tools/gator/daemon/Android.mk | 2 | ||||
| -rw-r--r-- | tools/gator/daemon/Fifo.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/gator/daemon/Android.mk b/tools/gator/daemon/Android.mk index 44c069cc7e24..baa783e0da08 100644 --- a/tools/gator/daemon/Android.mk +++ b/tools/gator/daemon/Android.mk @@ -3,7 +3,7 @@ include $(CLEAR_VARS) XML_H := $(shell cd $(LOCAL_PATH) && make events_xml.h defaults_xml.h) -LOCAL_CFLAGS += -Wall -O3 -mthumb-interwork -fno-exceptions -pthread -DETCDIR=\"/etc\" -Ilibsensors +LOCAL_CFLAGS += -Wall -O3 -fno-exceptions -pthread -DETCDIR=\"/etc\" -Ilibsensors LOCAL_SRC_FILES := \ Buffer.cpp \ diff --git a/tools/gator/daemon/Fifo.cpp b/tools/gator/daemon/Fifo.cpp index f672e92a6807..51ac1e5c961b 100644 --- a/tools/gator/daemon/Fifo.cpp +++ b/tools/gator/daemon/Fifo.cpp @@ -23,7 +23,7 @@ Fifo::Fifo(int singleBufferSize, int bufferSize, sem_t* readerSem) { mWrapThreshold = bufferSize; mSingleBufferSize = singleBufferSize; mReaderSem = readerSem; - mBuffer = (char*)valloc(bufferSize + singleBufferSize); + mBuffer = (char*)malloc(bufferSize + singleBufferSize); mEnd = false; if (mBuffer == NULL) { |