ftrace, ia64: make recordmcount distinct module compile

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

Shaohua Li committed 17 years ago

Commit 18c167f1 parent 173ed242 files · +10 −9Browse files

Unified · Split

2 files

 # ---------------------------------------------------------------------------
 # 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)        : part-of-module := y
-$(real-objs-m:.o=.i)  : modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.i)  : part-of-module := y
-$(real-objs-m:.o=.s)  : modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.s)  : part-of-module := y
-$(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE)
+$(real-objs-m:.o=.lst): part-of-module := y
 $(real-objs-m)        : quiet_modtag := [M]
 $(real-objs-m:.o=.i)  : quiet_modtag := [M]
 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

@@ -100,14 +100,14 @@ $P =~ s@.*/@@g; · 99 unmodified lines
100		100
101	my $V = '0.1';	101	my $V = '0.1';
102		102
103	if ($#ARGV < 6) {	103	if ($#ARGV < 7) {
104	print "usage: $P arch objdump objcopy cc ld nm rm mv inputfile\n";	104	print "usage: $P arch objdump objcopy cc ld nm rm mv is_module inputfile\n";
105	print "version: $V\n";	105	print "version: $V\n";
106	exit(1);	106	exit(1);
107	}	107	}
108		108
109	my ($arch, $bits, $objdump, $objcopy, $cc,	109	my ($arch, $bits, $objdump, $objcopy, $cc,
110	$ld, $nm, $rm, $mv, $inputfile) = @ARGV;	110	$ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV;
111		111
112	# Acceptable sections to record.	112	# Acceptable sections to record.
113	my %text_sections = (	113	my %text_sections = (