lkml.org 
[lkml]   [2011]   [May]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] ftrace/kbuild: Add recordmcount files to force full build
    Commit-ID:  d6971822c288ce5547190c6f812cc978d6520777
    Gitweb: http://git.kernel.org/tip/d6971822c288ce5547190c6f812cc978d6520777
    Author: Michal Marek <mmarek@suse.cz>
    AuthorDate: Tue, 17 May 2011 15:36:46 +0200
    Committer: Steven Rostedt <rostedt@goodmis.org>
    CommitDate: Thu, 19 May 2011 07:58:28 -0400

    ftrace/kbuild: Add recordmcount files to force full build

    Modifications to recordmcount must be performed on all object
    files to stay consistent with what the kernel code may expect.
    Add the recordmcount files to the main dependencies to make sure
    any change to them causes a full recompile.

    Signed-off-by: Michal Marek <mmarek@suse.cz>
    Link: http://lkml.kernel.org/r/20110517133646.GP13293@sepie.suse.cz
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    scripts/Makefile.build | 7 +++++--
    1 files changed, 5 insertions(+), 2 deletions(-)

    diff --git a/scripts/Makefile.build b/scripts/Makefile.build
    index fdca952..6165622 100644
    --- a/scripts/Makefile.build
    +++ b/scripts/Makefile.build
    @@ -255,6 +255,8 @@ sub_cmd_record_mcount = \
    if [ $(@) != "scripts/mod/empty.o" ]; then \
    $(objtree)/scripts/recordmcount $(RECORDMCOUNT_FLAGS) "$(@)"; \
    fi;
    +recordmcount_source := $(srctree)/scripts/recordmcount.c \
    + $(srctree)/scripts/recordmcount.h
    else
    sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
    "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
    @@ -262,6 +264,7 @@ sub_cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH
    "$(OBJDUMP)" "$(OBJCOPY)" "$(CC) $(KBUILD_CFLAGS)" \
    "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
    "$(if $(part-of-module),1,0)" "$(@)";
    +recordmcount_source := $(srctree)/scripts/recordmcount.pl
    endif
    cmd_record_mcount = \
    if [ "$(findstring -pg,$(_c_flags))" = "-pg" ]; then \
    @@ -282,13 +285,13 @@ define rule_cc_o_c
    endef

    # Built-in and composite module parts
    -$(obj)/%.o: $(src)/%.c FORCE
    +$(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE
    $(call cmd,force_checksrc)
    $(call if_changed_rule,cc_o_c)

    # Single-part modules are special since we need to mark them in $(MODVERDIR)

    -$(single-used-m): $(obj)/%.o: $(src)/%.c FORCE
    +$(single-used-m): $(obj)/%.o: $(src)/%.c $(recordmcount_source) FORCE
    $(call cmd,force_checksrc)
    $(call if_changed_rule,cc_o_c)
    @{ echo $(@:.o=.ko); echo $@; } > $(MODVERDIR)/$(@F:.o=.mod)

    \
     
     \ /
      Last update: 2011-05-19 19:33    [W:0.024 / U:89.028 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site