Re: [PATCH 09/19] perf tools: Fix 32-bit cross build

[Adrian Hunter]

On 21/10/2013 5:12 p.m., Arnaldo Carvalho de Melo wrote:
> Em Fri, Oct 18, 2013 at 03:29:06PM +0300, Adrian Hunter escreveu:
> > Setting EXTRA_CFLAGS=-m32 did not work because CFLAGS
> > was not passed around.

Unfortunately passing CFLAGS seems to break some of the
tests, so this needs more work.

> <SNIP>
>
> > index c873e03..699cdb7 100644
> > --- a/tools/perf/Makefile.perf
> > +++ b/tools/perf/Makefile.perf
> > @@ -706,7 +706,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
>
> So are we unconditionally set -g and -Wall?

They are the defaults from tools/lib/traceevent/Makefile
if CFLAGS is not set.  It seemed reasonably to keep them
the same.

> And by making CFLAGS be $(EXTRA_CFLAGS) implies EXTRA_CFLAGS already
> contains "$(CFLAGS)?

No I was intending to pass only -m32

> - Arnaldo
>
> >   $(LIBTRACEEVENT)-clean:
> >   	$(call QUIET_CLEAN, libtraceevent)
> > diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
> > index c516d6b..c94a06b 100644
> > --- a/tools/perf/config/Makefile
> > +++ b/tools/perf/config/Makefile
> > @@ -92,7 +92,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="$(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))
> > @@ -169,7 +169,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="$(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
> >
> > diff --git a/tools/perf/config/feature-checks/Makefile b/tools/perf/config/feature-checks/Makefile
> > index 452b67c..353c00c 100644
> > --- a/tools/perf/config/feature-checks/Makefile
> > +++ b/tools/perf/config/feature-checks/Makefile
> > @@ -31,7 +31,7 @@ CC := $(CC) -MD
> >
> >   all: $(FILES)
> >
> > -BUILD = $(CC) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
> > +BUILD = $(CC) $(CFLAGS) $(LDFLAGS) -o $(OUTPUT)$@ $@.c
> >
> >   ###############################
> >
> > --
> > 1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/