summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Medhurst2012-05-14 05:23:23 -0500
committerJon Medhurst2012-05-16 08:23:09 -0500
commit401972d0edd099668c8ea86bb6db71c4067a2dfb (patch)
tree0d56e46ba2cd84e5abcdcedf4b1f634389aee0ab
parent2e0798b1b58f31f609375a9308a23d04d1126bea (diff)
downloadarm-ds5-gator-401972d0edd099668c8ea86bb6db71c4067a2dfb.tar.gz
arm-ds5-gator-401972d0edd099668c8ea86bb6db71c4067a2dfb.tar.xz
arm-ds5-gator-401972d0edd099668c8ea86bb6db71c4067a2dfb.zip
gator-daemon: Fix sequence-point compile error
In mxml/mxml-file.c in the expression: (getc(fp) << 8) | getc(fp) the C standard allows right-hand getc() to be called before left hand one, which would cause a bug. The compiler gives an warning about this and we are treating warnings as errors this breaks the build with: error: operation on 'fp->_r' may be undefined [-Werror=sequence-point] We can fix this by rewriting the expressions in two parts, however the code in question has licensing clauses for modified versions which have not yet been resolved. Therefore, for now, we will disable the problematic error in the makefiles. Signed-off-by: Jon Medhurst <tixy@linaro.org>
-rwxr-xr-xdaemon/Android.mk2
-rw-r--r--daemon/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/daemon/Android.mk b/daemon/Android.mk
index 3ab55b9..715e5b6 100755
--- a/daemon/Android.mk
+++ b/daemon/Android.mk
@@ -3,7 +3,7 @@ include $(CLEAR_VARS)
3 3
4$(shell cd $(LOCAL_PATH);cat events_header.xml events-*\.xml events_footer.xml > events.xml;xxd -i events.xml > events_xml.h;xxd -i configuration.xml > configuration_xml.h) 4$(shell cd $(LOCAL_PATH);cat events_header.xml events-*\.xml events_footer.xml > events.xml;xxd -i events.xml > events_xml.h;xxd -i configuration.xml > configuration_xml.h)
5 5
6LOCAL_CFLAGS += -Wall -O3 -ftree-vectorize 6LOCAL_CFLAGS += -Wall -O3 -ftree-vectorize -Wno-error=sequence-point
7 7
8LOCAL_SRC_FILES:= \ 8LOCAL_SRC_FILES:= \
9 CapturedXML.cpp \ 9 CapturedXML.cpp \
diff --git a/daemon/Makefile b/daemon/Makefile
index aa1c005..300c3e9 100644
--- a/daemon/Makefile
+++ b/daemon/Makefile
@@ -18,7 +18,7 @@ GCC=$(CROSS_COMPILE)gcc
18# -std=c++98 is the 1998 c++ standard 18# -std=c++98 is the 1998 c++ standard
19# -march=armv5t is required to set the minimum architecture 19# -march=armv5t is required to set the minimum architecture
20# -mthumb-interwork is required for interworking to ARM or Thumb stdlibc 20# -mthumb-interwork is required for interworking to ARM or Thumb stdlibc
21CFLAGS=-O3 -Wall -Werror -march=armv5t -mthumb-interwork 21CFLAGS=-O3 -Wall -Werror -Wno-error=sequence-point -march=armv5t -mthumb-interwork
22TARGET=gatord 22TARGET=gatord
23C_SRC = $(wildcard mxml/*.c) 23C_SRC = $(wildcard mxml/*.c)
24CPP_SRC = $(wildcard *.cpp) 24CPP_SRC = $(wildcard *.cpp)