Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28e962b9 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix 32-bit cross build 



Setting EXTRA_CFLAGS=-m32 did not work because it was not passed around.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1383313899-15987-4-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7ea95727

tools/perf/Makefile.perf

+1 −1
Original line number Diff line number Diff line
@@ -711,7 +711,7 @@ $(LIB_FILE): $(LIB_OBJS) 
TE_SOURCES = $(wildcard $(TRACE_EVENT_DIR)*.[ch])



$(LIBTRACEEVENT): $(TE_SOURCES)

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) libtraceevent.a

	$(QUIET_SUBDIR0)$(TRACE_EVENT_DIR) $(QUIET_SUBDIR1) O=$(OUTPUT) CFLAGS="-g -Wall $(EXTRA_CFLAGS)" libtraceevent.a



$(LIBTRACEEVENT)-clean:

	$(call QUIET_CLEAN, libtraceevent)

tools/perf/config/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ endif 


feature_check = $(eval $(feature_check_code))

define feature_check_code

  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) LDFLAGS=$(LDFLAGS) -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)

  feature-$(1) := $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) -C config/feature-checks test-$1 >/dev/null 2>/dev/null && echo 1 || echo 0)

endef



feature_set = $(eval $(feature_set_code))
@@ -173,7 +173,7 @@ ifeq ($(feature-all), 1) 
  #

  $(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_set,$(feat)))

else

  $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) LDFLAGS=$(LDFLAGS) -i -j -C config/feature-checks $(CORE_FEATURE_TESTS) >/dev/null 2>&1)

  $(shell $(MAKE) OUTPUT=$(OUTPUT_FEATURES) CFLAGS="$(EXTRA_CFLAGS)" LDFLAGS=$(LDFLAGS) -i -j -C config/feature-checks $(CORE_FEATURE_TESTS) >/dev/null 2>&1)

  $(foreach feat,$(CORE_FEATURE_TESTS),$(call feature_check,$(feat)))

endif

tools/perf/config/feature-checks/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ CC := $(CC) -MD 


all: $(FILES)



BUILD = $(CC) $(LDFLAGS) -o $(OUTPUT)$@ $@.c

BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c



###############################