diff options
author | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-08-18 07:59:22 +1000 |
---|---|---|
committer | Stewart Smith <stewart@linux.vnet.ibm.com> | 2015-08-18 07:59:22 +1000 |
commit | f8ee4092d4b5d23033bf699d1c3a9aa82965fbc5 (patch) | |
tree | 790f8590de760548cb2ad9fb574474ca7a670b8f | |
parent | 1590e5814c14c4de4a6accfe9156eb1ce4d1d392 (diff) | |
download | skiboot-f8ee4092d4b5d23033bf699d1c3a9aa82965fbc5.zip skiboot-f8ee4092d4b5d23033bf699d1c3a9aa82965fbc5.tar.gz skiboot-f8ee4092d4b5d23033bf699d1c3a9aa82965fbc5.tar.bz2 |
Use target CC for __GNUC__ version defines in extract-gcov
Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r-- | Makefile.main | 5 | ||||
-rw-r--r-- | extract-gcov.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.main b/Makefile.main index ec9bafb..0441294 100644 --- a/Makefile.main +++ b/Makefile.main @@ -198,7 +198,10 @@ version.c: $(SRC)/make_version.sh $(OBJS_NO_VER) .version include $(shell find $(SRC)/* -name Makefile.check) extract-gcov: extract-gcov.c - $(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) -O0 -g -I$(SRC) -o $@ $<,$<) + $(call Q, HOSTCC ,$(HOSTCC) $(HOSTCFLAGS) \ + -DTARGET__GNUC__=`echo '__GNUC__'|$(CC) -E -|grep -v '^#'` \ + -DTARGET__GNUC_MINOR__=`echo '__GNUC__'|$(CC) -E -|grep -v '^#'` \ + -O0 -g -I$(SRC) -o $@ $<,$<) coverage-report: skiboot.info genhtml --branch-coverage -q -o $@ $< diff --git a/extract-gcov.c b/extract-gcov.c index 8320b3a..75c1108 100644 --- a/extract-gcov.c +++ b/extract-gcov.c @@ -32,7 +32,8 @@ typedef unsigned int gcov_unsigned_int; -#if __GNUC__ == 4 && __GNUC_MINOR__ >= 9 +/* You will need to pass -DTARGET__GNUC__=blah when building */ +#if TARGET__GNUC__ >= 4 && TARGET__GNUC_MINOR__ >= 9 #define GCOV_COUNTERS 9 #else #define GCOV_COUNTERS 8 |