git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ARM: 5784/1: fix early boot machine ID mismatch error display
[safe/jmp/linux-2.6]
/
scripts
/
Makefile.build
diff --git
a/scripts/Makefile.build
b/scripts/Makefile.build
index
7a17677
..
341b589
100644
(file)
--- a/
scripts/Makefile.build
+++ b/
scripts/Makefile.build
@@
-27,6
+27,9
@@
ccflags-y :=
cppflags-y :=
ldflags-y :=
cppflags-y :=
ldflags-y :=
+subdir-asflags-y :=
+subdir-ccflags-y :=
+
# Read auto.conf if it exists, otherwise ignore
-include include/config/auto.conf
# Read auto.conf if it exists, otherwise ignore
-include include/config/auto.conf
@@
-112,13
+115,13
@@
endif
# ---------------------------------------------------------------------------
# Default is built-in, unless we know otherwise
# ---------------------------------------------------------------------------
# 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)
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]
$(real-objs-m) : quiet_modtag := [M]
$(real-objs-m:.o=.i) : quiet_modtag := [M]
@@
-151,14
+154,20
@@
cmd_cc_i_c = $(CPP) $(c_flags) -o $@ $<
$(obj)/%.i: $(src)/%.c FORCE
$(call if_changed_dep,cc_i_c)
$(obj)/%.i: $(src)/%.c FORCE
$(call if_changed_dep,cc_i_c)
+cmd_gensymtypes = \
+ $(CPP) -D__GENKSYMS__ $(c_flags) $< | \
+ $(GENKSYMS) -T $@ -a $(ARCH) \
+ $(if $(KBUILD_PRESERVE),-p) \
+ $(if $(1),-r $(firstword $(wildcard $(@:.symtypes=.symref) /dev/null)))
+
quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
-cmd_cc_symtypes_c
=
\
-
$(CPP) -D__GENKSYMS__ $(c_flags) $<
\
-
| $(GENKSYMS) -T $@ >/dev/null;
\
-
test -s $@ || rm -f $@
+cmd_cc_symtypes_c
=
\
+
set -e;
\
+
$(call cmd_gensymtypes, true) >/dev/null;
\
+ test -s $@ || rm -f $@
$(obj)/%.symtypes : $(src)/%.c FORCE
$(obj)/%.symtypes : $(src)/%.c FORCE
- $(call
if_changed_dep
,cc_symtypes_c)
+ $(call
cmd
,cc_symtypes_c)
# C (.c) files
# The C file is compiled and updated dependency information is generated.
# C (.c) files
# The C file is compiled and updated dependency information is generated.
@@
-185,10
+194,8
@@
else
cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
cmd_modversions = \
if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then \
cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
cmd_modversions = \
if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then \
- $(CPP) -D__GENKSYMS__ $(c_flags) $< \
- | $(GENKSYMS) $(if $(KBUILD_SYMTYPES), \
- -T $(@D)/$(@F:.o=.symtypes)) -a $(ARCH) \
- > $(@D)/.tmp_$(@F:.o=.ver); \
+ $(call cmd_gensymtypes, $(KBUILD_SYMTYPES)) \
+ > $(@D)/.tmp_$(@F:.o=.ver); \
\
$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \
-T $(@D)/.tmp_$(@F:.o=.ver); \
\
$(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F) \
-T $(@D)/.tmp_$(@F:.o=.ver); \
@@
-199,15
+206,17
@@
cmd_modversions = \
endif
ifdef CONFIG_FTRACE_MCOUNT_RECORD
endif
ifdef CONFIG_FTRACE_MCOUNT_RECORD
-cmd_record_mcount = perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
+cmd_record_mcount =
set -e ;
perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
"$(if $(CONFIG_64BIT),64,32)" \
"$(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
$(call echo-cmd,checksrc) $(cmd_checksrc) \
$(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \
$(cmd_modversions) \
endif
define rule_cc_o_c
$(call echo-cmd,checksrc) $(cmd_checksrc) \
$(call echo-cmd,cc_o_c) $(cmd_cc_o_c); \
$(cmd_modversions) \
+ $(call echo-cmd,record_mcount) \
$(cmd_record_mcount) \
scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > \
$(dot-target).tmp; \
$(cmd_record_mcount) \
scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,cc_o_c)' > \
$(dot-target).tmp; \
@@
-261,7
+270,8
@@
targets += $(extra-y) $(MAKECMDGOALS) $(always)
# Linker scripts preprocessor (.lds.S -> .lds)
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds_S = LDS $@
# Linker scripts preprocessor (.lds.S -> .lds)
# ---------------------------------------------------------------------------
quiet_cmd_cpp_lds_S = LDS $@
- cmd_cpp_lds_S = $(CPP) $(cpp_flags) -D__ASSEMBLY__ -o $@ $<
+ cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
+ -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<
$(obj)/%.lds: $(src)/%.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)
$(obj)/%.lds: $(src)/%.lds.S FORCE
$(call if_changed_dep,cpp_lds_S)