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

Commit f2036884 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' of... 

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux-2.6 into perf/urgent
parents 351af072 ecafda60

tools/perf/Makefile

+10 −4
Original line number Original line Diff line number Diff line
@@ -5,6 +5,12 @@ endif 
# The default target of this Makefile is...

# The default target of this Makefile is...

all::

all::





ifneq ($(OUTPUT),)

# check that the output directory actually exists

OUTDIR := $(shell cd $(OUTPUT) && /bin/pwd)

$(if $(OUTDIR),, $(error output directory "$(OUTPUT)" does not exist))

endif



# Define V=1 to have a more verbose compile.

# Define V=1 to have a more verbose compile.

# Define V=2 to have an even more verbose compile.

# Define V=2 to have an even more verbose compile.

#

#
@@ -931,15 +937,15 @@ $(OUTPUT)common-cmds.h: $(wildcard Documentation/perf-*.txt) 
	$(QUIET_GEN). util/generate-cmdlist.sh > $@+ && mv $@+ $@

	$(QUIET_GEN). util/generate-cmdlist.sh > $@+ && mv $@+ $@





$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh

$(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh

	$(QUIET_GEN)$(RM) $@ $@+ && \

	$(QUIET_GEN)$(RM) $(OUTPUT)$@ $(OUTPUT)$@+ && \

	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \

	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \

	    -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \

	    -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \

	    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \

	    -e 's|@@PERL@@|$(PERL_PATH_SQ)|g' \

	    -e 's/@@PERF_VERSION@@/$(PERF_VERSION)/g' \

	    -e 's/@@PERF_VERSION@@/$(PERF_VERSION)/g' \

	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \

	    -e 's/@@NO_CURL@@/$(NO_CURL)/g' \

	    $@.sh >$@+ && \

	    $@.sh > $(OUTPUT)$@+ && \

	chmod +x $@+ && \

	chmod +x $(OUTPUT)$@+ && \

	mv $@+ $(OUTPUT)$@

	mv $(OUTPUT)$@+ $(OUTPUT)$@





configure: configure.ac

configure: configure.ac

	$(QUIET_GEN)$(RM) $@ $<+ && \

	$(QUIET_GEN)$(RM) $@ $<+ && \

tools/perf/feature-tests.mak

+1 −1
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ endef 
# try-cc

# try-cc

# Usage: option = $(call try-cc, source-to-build, cc-options)

# Usage: option = $(call try-cc, source-to-build, cc-options)

try-cc = $(shell sh -c						  \

try-cc = $(shell sh -c						  \

	'TMP="$(TMPOUT).$$$$";			 		  \

	'TMP="$(OUTPUT)$(TMPOUT).$$$$";				  \

	 echo "$(1)" |						  \

	 echo "$(1)" |						  \

	 $(CC) -x c - $(2) -o "$$TMP" > /dev/null 2>&1 && echo y; \

	 $(CC) -x c - $(2) -o "$$TMP" > /dev/null 2>&1 && echo y; \

	 rm -f "$$TMP"')
 
	 rm -f "$$TMP"')