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

Commit 18c167fd authored by Shaohua Li's avatar Shaohua Li Committed by Ingo Molnar
Browse files

ftrace, ia64: make recordmcount distinct module compile 



In IA64, module build and kernel build use different option.
Make recordmcount.pl differentiate the two cases.

Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 173ed24e

scripts/Makefile.build

+7 −6
Original line number Diff line number Diff line
@@ -112,13 +112,13 @@ endif 
# ---------------------------------------------------------------------------



# Default is built-in, unless we know otherwise

modkern_cflags := $(CFLAGS_KERNEL)

modkern_cflags = $(if $(part-of-module), $(CFLAGS_MODULE), $(CFLAGS_KERNEL))

quiet_modtag := $(empty)   $(empty)



$(real-objs-m)        : modkern_cflags := $(CFLAGS_MODULE)

$(real-objs-m:.o=.i)  : modkern_cflags := $(CFLAGS_MODULE)

$(real-objs-m:.o=.s)  : modkern_cflags := $(CFLAGS_MODULE)

$(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE)

$(real-objs-m)        : part-of-module := y

$(real-objs-m:.o=.i)  : part-of-module := y

$(real-objs-m:.o=.s)  : part-of-module := y

$(real-objs-m:.o=.lst): part-of-module := y



$(real-objs-m)        : quiet_modtag := [M]

$(real-objs-m:.o=.i)  : quiet_modtag := [M]
@@ -215,7 +215,8 @@ endif 
ifdef CONFIG_FTRACE_MCOUNT_RECORD

cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \

	"$(if $(CONFIG_64BIT),64,32)" \

	"$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" "$(@)";

	"$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \

	"$(if $(part-of-module),1,0)" "$(@)";

endif



define rule_cc_o_c

scripts/recordmcount.pl

+3 −3
Original line number Diff line number Diff line
@@ -100,14 +100,14 @@ $P =~ s@.*/@@g; 


my $V = '0.1';



if ($#ARGV < 6) {

	print "usage: $P arch objdump objcopy cc ld nm rm mv inputfile\n";

if ($#ARGV < 7) {

	print "usage: $P arch objdump objcopy cc ld nm rm mv is_module inputfile\n";

	print "version: $V\n";

	exit(1);

}



my ($arch, $bits, $objdump, $objcopy, $cc,

    $ld, $nm, $rm, $mv, $inputfile) = @ARGV;

    $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV;



# Acceptable sections to record.

my %text_sections = (