Changeset 30816
- Timestamp:
- 2012-03-05T01:51:08+01:00 (6 years ago)
- Location:
- trunk/target/linux/generic
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/target/linux/generic/patches-2.6.36/950-powerpc_crtsavres_prereq.patch
r23771 r30816 1 --- a/Makefile2 +++ b/Makefile3 @@ -358,6 +358,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__4 KBUILD_AFLAGS_MODULE := -DMODULE5 KBUILD_CFLAGS_MODULE := -DMODULE6 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds7 +KBUILD_LDFLAGS_MODULE_PREREQ :=8 9 # Read KERNELRELEASE from include/config/kernel.release (if it exists)10 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)11 @@ -367,7 +368,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE12 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC13 export CPP AR NM STRIP OBJCOPY OBJDUMP14 export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE15 -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS16 +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS17 18 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS19 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV20 1 --- a/arch/powerpc/Makefile 21 2 +++ b/arch/powerpc/Makefile 22 @@ -94,7 +94, 7@@ else3 @@ -94,7 +94,6 @@ else 23 4 endif 24 5 endif 25 6 26 7 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o 27 +KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o28 8 29 9 ifeq ($(CONFIG_TUNE_CELL),y) 30 10 KBUILD_CFLAGS += $(call cc-option,-mtune=cell) 31 --- a/scripts/Makefile.modpost 32 +++ b/scripts/Makefile.modpost 33 @@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ 34 cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ 35 -c -o $@ $< 36 37 -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE 38 +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ 39 +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< 40 + 41 +$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE 42 + $(Q)mkdir -p $(dir $@) 43 + $(call if_changed_dep,as_o_S) 44 + 45 +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE 46 $(call if_changed_dep,cc_o_c) 47 48 targets += $(modules:.ko=.mod.o) 49 @@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) 50 quiet_cmd_ld_ko_o = LD [M] $@ 51 cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ 52 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ 53 + $(KBUILD_LDFLAGS_MODULE_PREREQ) \ 54 -o $@ $(filter-out FORCE,$^) 55 56 $(modules): %.ko :%.o %.mod.o FORCE 11 -
trunk/target/linux/generic/patches-2.6.37/321-powerpc_crtsavres_prereq.patch
r26692 r30816 1 --- a/Makefile2 +++ b/Makefile3 @@ -361,6 +361,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__4 KBUILD_AFLAGS_MODULE := -DMODULE5 KBUILD_CFLAGS_MODULE := -DMODULE6 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds7 +KBUILD_LDFLAGS_MODULE_PREREQ :=8 9 # Read KERNELRELEASE from include/config/kernel.release (if it exists)10 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)11 @@ -370,7 +371,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE12 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC13 export CPP AR NM STRIP OBJCOPY OBJDUMP14 export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE15 -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS16 +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS17 18 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS19 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV20 1 --- a/arch/powerpc/Makefile 21 2 +++ b/arch/powerpc/Makefile 22 @@ -94,7 +94, 7@@ else3 @@ -94,7 +94,6 @@ else 23 4 endif 24 5 endif 25 6 26 7 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o 27 +KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o28 8 29 9 ifeq ($(CONFIG_TUNE_CELL),y) 30 10 KBUILD_CFLAGS += $(call cc-option,-mtune=cell) 31 --- a/scripts/Makefile.modpost 32 +++ b/scripts/Makefile.modpost 33 @@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ 34 cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ 35 -c -o $@ $< 36 37 -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE 38 +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ 39 +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< 40 + 41 +$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE 42 + $(Q)mkdir -p $(dir $@) 43 + $(call if_changed_dep,as_o_S) 44 + 45 +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE 46 $(call if_changed_dep,cc_o_c) 47 48 targets += $(modules:.ko=.mod.o) 49 @@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) 50 quiet_cmd_ld_ko_o = LD [M] $@ 51 cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ 52 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ 53 + $(KBUILD_LDFLAGS_MODULE_PREREQ) \ 54 -o $@ $(filter-out FORCE,$^) 55 56 $(modules): %.ko :%.o %.mod.o FORCE 11 -
trunk/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch
r26690 r30816 1 --- a/Makefile2 +++ b/Makefile3 @@ -362,6 +362,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__4 KBUILD_AFLAGS_MODULE := -DMODULE5 KBUILD_CFLAGS_MODULE := -DMODULE6 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds7 +KBUILD_LDFLAGS_MODULE_PREREQ :=8 9 # Read KERNELRELEASE from include/config/kernel.release (if it exists)10 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)11 @@ -371,7 +372,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE12 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC13 export CPP AR NM STRIP OBJCOPY OBJDUMP14 export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE15 -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS16 +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS17 18 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS19 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV20 1 --- a/arch/powerpc/Makefile 21 2 +++ b/arch/powerpc/Makefile 22 @@ -94,7 +94, 7@@ else3 @@ -94,7 +94,6 @@ else 23 4 endif 24 5 endif 25 6 26 7 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o 27 +KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o28 8 29 9 ifeq ($(CONFIG_TUNE_CELL),y) 30 10 KBUILD_CFLAGS += $(call cc-option,-mtune=cell) 31 --- a/scripts/Makefile.modpost 32 +++ b/scripts/Makefile.modpost 33 @@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ 34 cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ 35 -c -o $@ $< 36 37 -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE 38 +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ 39 +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< 40 + 41 +$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE 42 + $(Q)mkdir -p $(dir $@) 43 + $(call if_changed_dep,as_o_S) 44 + 45 +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE 46 $(call if_changed_dep,cc_o_c) 47 48 targets += $(modules:.ko=.mod.o) 49 @@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) 50 quiet_cmd_ld_ko_o = LD [M] $@ 51 cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ 52 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ 53 + $(KBUILD_LDFLAGS_MODULE_PREREQ) \ 54 -o $@ $(filter-out FORCE,$^) 55 56 $(modules): %.ko :%.o %.mod.o FORCE 11 -
trunk/target/linux/generic/patches-2.6.39/321-powerpc_crtsavres_prereq.patch
r26691 r30816 1 --- a/Makefile2 +++ b/Makefile3 @@ -366,6 +366,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__4 KBUILD_AFLAGS_MODULE := -DMODULE5 KBUILD_CFLAGS_MODULE := -DMODULE6 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds7 +KBUILD_LDFLAGS_MODULE_PREREQ :=8 9 # Read KERNELRELEASE from include/config/kernel.release (if it exists)10 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)11 @@ -375,7 +376,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE12 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC13 export CPP AR NM STRIP OBJCOPY OBJDUMP14 export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE15 -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS16 +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS17 18 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS19 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV20 1 --- a/arch/powerpc/Makefile 21 2 +++ b/arch/powerpc/Makefile 22 @@ -94,7 +94, 7@@ else3 @@ -94,7 +94,6 @@ else 23 4 endif 24 5 endif 25 6 26 7 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o 27 +KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o28 8 29 9 ifeq ($(CONFIG_TUNE_CELL),y) 30 10 KBUILD_CFLAGS += $(call cc-option,-mtune=cell) 31 --- a/scripts/Makefile.modpost 32 +++ b/scripts/Makefile.modpost 33 @@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ 34 cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ 35 -c -o $@ $< 36 37 -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE 38 +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ 39 +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< 40 + 41 +$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE 42 + $(Q)mkdir -p $(dir $@) 43 + $(call if_changed_dep,as_o_S) 44 + 45 +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE 46 $(call if_changed_dep,cc_o_c) 47 48 targets += $(modules:.ko=.mod.o) 49 @@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) 50 quiet_cmd_ld_ko_o = LD [M] $@ 51 cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ 52 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ 53 + $(KBUILD_LDFLAGS_MODULE_PREREQ) \ 54 -o $@ $(filter-out FORCE,$^) 55 56 $(modules): %.ko :%.o %.mod.o FORCE 11 -
trunk/target/linux/generic/patches-3.0/321-powerpc_crtsavres_prereq.patch
r27191 r30816 1 --- a/Makefile2 +++ b/Makefile3 @@ -375,6 +375,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__4 KBUILD_AFLAGS_MODULE := -DMODULE5 KBUILD_CFLAGS_MODULE := -DMODULE6 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds7 +KBUILD_LDFLAGS_MODULE_PREREQ :=8 9 # Read KERNELRELEASE from include/config/kernel.release (if it exists)10 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)11 @@ -384,7 +385,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE12 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC13 export CPP AR NM STRIP OBJCOPY OBJDUMP14 export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE15 -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS16 +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS17 18 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS19 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV20 1 --- a/arch/powerpc/Makefile 21 2 +++ b/arch/powerpc/Makefile 22 @@ -94,7 +94, 7@@ else3 @@ -94,7 +94,6 @@ else 23 4 endif 24 5 endif 25 6 26 7 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o 27 +KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o28 8 29 9 ifeq ($(CONFIG_TUNE_CELL),y) 30 10 KBUILD_CFLAGS += $(call cc-option,-mtune=cell) 31 --- a/scripts/Makefile.modpost 32 +++ b/scripts/Makefile.modpost 33 @@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ 34 cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ 35 -c -o $@ $< 36 37 -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE 38 +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ 39 +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< 40 + 41 +$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE 42 + $(Q)mkdir -p $(dir $@) 43 + $(call if_changed_dep,as_o_S) 44 + 45 +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE 46 $(call if_changed_dep,cc_o_c) 47 48 targets += $(modules:.ko=.mod.o) 49 @@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) 50 quiet_cmd_ld_ko_o = LD [M] $@ 51 cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ 52 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ 53 + $(KBUILD_LDFLAGS_MODULE_PREREQ) \ 54 -o $@ $(filter-out FORCE,$^) 55 56 $(modules): %.ko :%.o %.mod.o FORCE 11 -
trunk/target/linux/generic/patches-3.1/321-powerpc_crtsavres_prereq.patch
r27940 r30816 1 --- a/Makefile2 +++ b/Makefile3 @@ -375,6 +375,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__4 KBUILD_AFLAGS_MODULE := -DMODULE5 KBUILD_CFLAGS_MODULE := -DMODULE6 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds7 +KBUILD_LDFLAGS_MODULE_PREREQ :=8 9 # Read KERNELRELEASE from include/config/kernel.release (if it exists)10 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)11 @@ -384,7 +385,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE12 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC13 export CPP AR NM STRIP OBJCOPY OBJDUMP14 export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE15 -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS16 +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS17 18 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS19 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV20 1 --- a/arch/powerpc/Makefile 21 2 +++ b/arch/powerpc/Makefile 22 @@ -94,7 +94, 7@@ else3 @@ -94,7 +94,6 @@ else 23 4 endif 24 5 endif 25 6 26 7 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o 27 +KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o28 8 29 9 ifeq ($(CONFIG_TUNE_CELL),y) 30 10 KBUILD_CFLAGS += $(call cc-option,-mtune=cell) 31 --- a/scripts/Makefile.modpost 32 +++ b/scripts/Makefile.modpost 33 @@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ 34 cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ 35 -c -o $@ $< 36 37 -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE 38 +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ 39 +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< 40 + 41 +$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE 42 + $(Q)mkdir -p $(dir $@) 43 + $(call if_changed_dep,as_o_S) 44 + 45 +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE 46 $(call if_changed_dep,cc_o_c) 47 48 targets += $(modules:.ko=.mod.o) 49 @@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) 50 quiet_cmd_ld_ko_o = LD [M] $@ 51 cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ 52 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ 53 + $(KBUILD_LDFLAGS_MODULE_PREREQ) \ 54 -o $@ $(filter-out FORCE,$^) 55 56 $(modules): %.ko :%.o %.mod.o FORCE 11 -
trunk/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch
r30657 r30816 1 --- a/Makefile2 +++ b/Makefile3 @@ -375,6 +375,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__4 KBUILD_AFLAGS_MODULE := -DMODULE5 KBUILD_CFLAGS_MODULE := -DMODULE6 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -s7 +KBUILD_LDFLAGS_MODULE_PREREQ :=8 9 # Read KERNELRELEASE from include/config/kernel.release (if it exists)10 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)11 @@ -384,7 +385,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE12 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC13 export CPP AR NM STRIP OBJCOPY OBJDUMP14 export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE15 -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS16 +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS17 18 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS19 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV20 1 --- a/arch/powerpc/Makefile 21 2 +++ b/arch/powerpc/Makefile 22 @@ -94,7 +94, 7@@ else3 @@ -94,7 +94,6 @@ else 23 4 endif 24 5 endif 25 6 26 7 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o 27 +KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o28 8 29 9 ifeq ($(CONFIG_TUNE_CELL),y) 30 10 KBUILD_CFLAGS += $(call cc-option,-mtune=cell) 31 --- a/scripts/Makefile.modpost 32 +++ b/scripts/Makefile.modpost 33 @@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ 34 cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ 35 -c -o $@ $< 36 37 -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE 38 +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ 39 +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< 40 + 41 +$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE 42 + $(Q)mkdir -p $(dir $@) 43 + $(call if_changed_dep,as_o_S) 44 + 45 +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE 46 $(call if_changed_dep,cc_o_c) 47 48 targets += $(modules:.ko=.mod.o) 49 @@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) 50 quiet_cmd_ld_ko_o = LD [M] $@ 51 cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ 52 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ 53 + $(KBUILD_LDFLAGS_MODULE_PREREQ) \ 54 -o $@ $(filter-out FORCE,$^) 55 56 $(modules): %.ko :%.o %.mod.o FORCE 11 -
trunk/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch
r30657 r30816 1 --- a/Makefile2 +++ b/Makefile3 @@ -375,6 +375,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__4 KBUILD_AFLAGS_MODULE := -DMODULE5 KBUILD_CFLAGS_MODULE := -DMODULE6 KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -s7 +KBUILD_LDFLAGS_MODULE_PREREQ :=8 9 # Read KERNELRELEASE from include/config/kernel.release (if it exists)10 KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null)11 @@ -384,7 +385,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE12 export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC13 export CPP AR NM STRIP OBJCOPY OBJDUMP14 export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE15 -export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS16 +export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS17 18 export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS19 export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV20 1 --- a/arch/powerpc/Makefile 21 2 +++ b/arch/powerpc/Makefile 22 @@ -94,7 +94, 7@@ else3 @@ -94,7 +94,6 @@ else 23 4 endif 24 5 endif 25 6 26 7 -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o 27 +KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o28 8 29 9 ifeq ($(CONFIG_TUNE_CELL),y) 30 10 KBUILD_CFLAGS += $(call cc-option,-mtune=cell) 31 --- a/scripts/Makefile.modpost 32 +++ b/scripts/Makefile.modpost 33 @@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ 34 cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ 35 -c -o $@ $< 36 37 -$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE 38 +quiet_cmd_as_o_S = AS $(quiet_modtag) $@ 39 +cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< 40 + 41 +$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE 42 + $(Q)mkdir -p $(dir $@) 43 + $(call if_changed_dep,as_o_S) 44 + 45 +$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE 46 $(call if_changed_dep,cc_o_c) 47 48 targets += $(modules:.ko=.mod.o) 49 @@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) 50 quiet_cmd_ld_ko_o = LD [M] $@ 51 cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ 52 $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ 53 + $(KBUILD_LDFLAGS_MODULE_PREREQ) \ 54 -o $@ $(filter-out FORCE,$^) 55 56 $(modules): %.ko :%.o %.mod.o FORCE 11
Note: See TracChangeset
for help on using the changeset viewer.