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

Showing the changes to scripts (2 of 2 files). Show all

Unified · Split

2 files

@@ -112,13 +112,13 @@ endif · 111 unmodified lines
112	112	# ---------------------------------------------------------------------------
113	113
114	114	# Default is built-in, unless we know otherwise
115		−modkern_cflags := $(CFLAGS_KERNEL)
	115	+modkern_cflags = $(if $(part-of-module), $(CFLAGS_MODULE), $(CFLAGS_KERNEL))
116	116	quiet_modtag := $(empty) $(empty)
117	117
118		−$(real-objs-m) : modkern_cflags := $(CFLAGS_MODULE)
119		−$(real-objs-m:.o=.i) : modkern_cflags := $(CFLAGS_MODULE)
120		−$(real-objs-m:.o=.s) : modkern_cflags := $(CFLAGS_MODULE)
121		−$(real-objs-m:.o=.lst): modkern_cflags := $(CFLAGS_MODULE)
	118	+$(real-objs-m) : part-of-module := y
	119	+$(real-objs-m:.o=.i) : part-of-module := y
	120	+$(real-objs-m:.o=.s) : part-of-module := y
	121	+$(real-objs-m:.o=.lst): part-of-module := y
122	122
123	123	$(real-objs-m) : quiet_modtag := [M]
124	124	$(real-objs-m:.o=.i) : quiet_modtag := [M]
@@ -215,7 +215,8 @@ endif · 90 unmodified lines
215	215	ifdef CONFIG_FTRACE_MCOUNT_RECORD
216	216	cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
217	217	"$(if $(CONFIG_64BIT),64,32)" \
218		− "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" "$(@)";
	218	+ "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
	219	+ "$(if $(part-of-module),1,0)" "$(@)";
219	220	endif
220	221
221	222	define rule_cc_o_c

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