aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmit Pundir <amit.pundir@linaro.org>2014-09-25 14:42:18 +0530
committerAmit Pundir <amit.pundir@linaro.org>2014-09-25 15:32:59 +0530
commit96ee44e863cf35071805f8fc203f2a880c55b7c1 (patch)
tree62cd18489c2b3807fb9e89c5e5950d7c76b6e465
parentf9207ea744e7b7be9087d69bf28c37d0c93e5a3f (diff)
downloadjuno-linaro-armv8-14.09.tar.gz
gatord: fix build for ARMv8linaro-armv8-14.09
Change-Id: I6a6e3fbb4d79cbbd36ad3ad2fa9a5a3fe5121382 Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
-rw-r--r--tools/gator/daemon/Android.mk2
-rw-r--r--tools/gator/daemon/Fifo.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/gator/daemon/Android.mk b/tools/gator/daemon/Android.mk
index 44c069cc7e2..baa783e0da0 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 f672e92a680..51ac1e5c961 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) {