From 4e7ffa2545fbd0158d71e27ad313e0a5ee3f39b3 Mon Sep 17 00:00:00 2001 From: nbd Date: Mon, 5 Mar 2012 00:51:08 +0000 Subject: kernel: remove the crtsavres dependency, the patched gcc will no longer emit references to that code git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30816 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../950-powerpc_crtsavres_prereq.patch | 49 +--------------------- .../321-powerpc_crtsavres_prereq.patch | 49 +--------------------- .../321-powerpc_crtsavres_prereq.patch | 49 +--------------------- .../321-powerpc_crtsavres_prereq.patch | 49 +--------------------- .../patches-3.0/321-powerpc_crtsavres_prereq.patch | 49 +--------------------- .../patches-3.1/321-powerpc_crtsavres_prereq.patch | 49 +--------------------- .../patches-3.2/321-powerpc_crtsavres_prereq.patch | 49 +--------------------- .../patches-3.3/321-powerpc_crtsavres_prereq.patch | 49 +--------------------- 8 files changed, 16 insertions(+), 376 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/patches-2.6.36/950-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-2.6.36/950-powerpc_crtsavres_prereq.patch index 43ee28393..df49ad017 100644 --- a/target/linux/generic/patches-2.6.36/950-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-2.6.36/950-powerpc_crtsavres_prereq.patch @@ -1,56 +1,11 @@ ---- a/Makefile -+++ b/Makefile -@@ -358,6 +358,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -+KBUILD_LDFLAGS_MODULE_PREREQ := - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -@@ -367,7 +368,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE --export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS - - export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS - export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -94,7 +94,7 @@ else +@@ -94,7 +94,6 @@ else endif endif -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -+KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - --$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE -+quiet_cmd_as_o_S = AS $(quiet_modtag) $@ -+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< -+ -+$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE -+ $(Q)mkdir -p $(dir $@) -+ $(call if_changed_dep,as_o_S) -+ -+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE - $(call if_changed_dep,cc_o_c) - - targets += $(modules:.ko=.mod.o) -@@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) - quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -+ $(KBUILD_LDFLAGS_MODULE_PREREQ) \ - -o $@ $(filter-out FORCE,$^) - - $(modules): %.ko :%.o %.mod.o FORCE + diff --git a/target/linux/generic/patches-2.6.37/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-2.6.37/321-powerpc_crtsavres_prereq.patch index 861a6b753..df49ad017 100644 --- a/target/linux/generic/patches-2.6.37/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-2.6.37/321-powerpc_crtsavres_prereq.patch @@ -1,56 +1,11 @@ ---- a/Makefile -+++ b/Makefile -@@ -361,6 +361,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -+KBUILD_LDFLAGS_MODULE_PREREQ := - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -@@ -370,7 +371,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE --export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS - - export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS - export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -94,7 +94,7 @@ else +@@ -94,7 +94,6 @@ else endif endif -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -+KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - --$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE -+quiet_cmd_as_o_S = AS $(quiet_modtag) $@ -+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< -+ -+$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE -+ $(Q)mkdir -p $(dir $@) -+ $(call if_changed_dep,as_o_S) -+ -+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE - $(call if_changed_dep,cc_o_c) - - targets += $(modules:.ko=.mod.o) -@@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) - quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -+ $(KBUILD_LDFLAGS_MODULE_PREREQ) \ - -o $@ $(filter-out FORCE,$^) - - $(modules): %.ko :%.o %.mod.o FORCE + diff --git a/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch index 402cd0cac..df49ad017 100644 --- a/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-2.6.38/321-powerpc_crtsavres_prereq.patch @@ -1,56 +1,11 @@ ---- a/Makefile -+++ b/Makefile -@@ -362,6 +362,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -+KBUILD_LDFLAGS_MODULE_PREREQ := - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -@@ -371,7 +372,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE --export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS - - export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS - export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -94,7 +94,7 @@ else +@@ -94,7 +94,6 @@ else endif endif -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -+KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - --$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE -+quiet_cmd_as_o_S = AS $(quiet_modtag) $@ -+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< -+ -+$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE -+ $(Q)mkdir -p $(dir $@) -+ $(call if_changed_dep,as_o_S) -+ -+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE - $(call if_changed_dep,cc_o_c) - - targets += $(modules:.ko=.mod.o) -@@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) - quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -+ $(KBUILD_LDFLAGS_MODULE_PREREQ) \ - -o $@ $(filter-out FORCE,$^) - - $(modules): %.ko :%.o %.mod.o FORCE + diff --git a/target/linux/generic/patches-2.6.39/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-2.6.39/321-powerpc_crtsavres_prereq.patch index e1a141b4f..df49ad017 100644 --- a/target/linux/generic/patches-2.6.39/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-2.6.39/321-powerpc_crtsavres_prereq.patch @@ -1,56 +1,11 @@ ---- a/Makefile -+++ b/Makefile -@@ -366,6 +366,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -+KBUILD_LDFLAGS_MODULE_PREREQ := - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -@@ -375,7 +376,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE --export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS - - export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS - export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -94,7 +94,7 @@ else +@@ -94,7 +94,6 @@ else endif endif -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -+KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - --$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE -+quiet_cmd_as_o_S = AS $(quiet_modtag) $@ -+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< -+ -+$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE -+ $(Q)mkdir -p $(dir $@) -+ $(call if_changed_dep,as_o_S) -+ -+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE - $(call if_changed_dep,cc_o_c) - - targets += $(modules:.ko=.mod.o) -@@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) - quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -+ $(KBUILD_LDFLAGS_MODULE_PREREQ) \ - -o $@ $(filter-out FORCE,$^) - - $(modules): %.ko :%.o %.mod.o FORCE + diff --git a/target/linux/generic/patches-3.0/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-3.0/321-powerpc_crtsavres_prereq.patch index e5d383c71..df49ad017 100644 --- a/target/linux/generic/patches-3.0/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-3.0/321-powerpc_crtsavres_prereq.patch @@ -1,56 +1,11 @@ ---- a/Makefile -+++ b/Makefile -@@ -375,6 +375,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -+KBUILD_LDFLAGS_MODULE_PREREQ := - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -@@ -384,7 +385,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE --export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS - - export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS - export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -94,7 +94,7 @@ else +@@ -94,7 +94,6 @@ else endif endif -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -+KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - --$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE -+quiet_cmd_as_o_S = AS $(quiet_modtag) $@ -+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< -+ -+$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE -+ $(Q)mkdir -p $(dir $@) -+ $(call if_changed_dep,as_o_S) -+ -+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE - $(call if_changed_dep,cc_o_c) - - targets += $(modules:.ko=.mod.o) -@@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) - quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -+ $(KBUILD_LDFLAGS_MODULE_PREREQ) \ - -o $@ $(filter-out FORCE,$^) - - $(modules): %.ko :%.o %.mod.o FORCE + diff --git a/target/linux/generic/patches-3.1/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-3.1/321-powerpc_crtsavres_prereq.patch index e5d383c71..df49ad017 100644 --- a/target/linux/generic/patches-3.1/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-3.1/321-powerpc_crtsavres_prereq.patch @@ -1,56 +1,11 @@ ---- a/Makefile -+++ b/Makefile -@@ -375,6 +375,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -+KBUILD_LDFLAGS_MODULE_PREREQ := - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -@@ -384,7 +385,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE --export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS - - export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS - export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -94,7 +94,7 @@ else +@@ -94,7 +94,6 @@ else endif endif -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -+KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - --$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE -+quiet_cmd_as_o_S = AS $(quiet_modtag) $@ -+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< -+ -+$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE -+ $(Q)mkdir -p $(dir $@) -+ $(call if_changed_dep,as_o_S) -+ -+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE - $(call if_changed_dep,cc_o_c) - - targets += $(modules:.ko=.mod.o) -@@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) - quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -+ $(KBUILD_LDFLAGS_MODULE_PREREQ) \ - -o $@ $(filter-out FORCE,$^) - - $(modules): %.ko :%.o %.mod.o FORCE + diff --git a/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch index eb42cf9df..df49ad017 100644 --- a/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-3.2/321-powerpc_crtsavres_prereq.patch @@ -1,56 +1,11 @@ ---- a/Makefile -+++ b/Makefile -@@ -375,6 +375,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -s -+KBUILD_LDFLAGS_MODULE_PREREQ := - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -@@ -384,7 +385,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE --export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS - - export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS - export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -94,7 +94,7 @@ else +@@ -94,7 +94,6 @@ else endif endif -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -+KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - --$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE -+quiet_cmd_as_o_S = AS $(quiet_modtag) $@ -+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< -+ -+$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE -+ $(Q)mkdir -p $(dir $@) -+ $(call if_changed_dep,as_o_S) -+ -+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE - $(call if_changed_dep,cc_o_c) - - targets += $(modules:.ko=.mod.o) -@@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) - quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -+ $(KBUILD_LDFLAGS_MODULE_PREREQ) \ - -o $@ $(filter-out FORCE,$^) - - $(modules): %.ko :%.o %.mod.o FORCE + diff --git a/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch index eb42cf9df..df49ad017 100644 --- a/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/patches-3.3/321-powerpc_crtsavres_prereq.patch @@ -1,56 +1,11 @@ ---- a/Makefile -+++ b/Makefile -@@ -375,6 +375,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ - KBUILD_AFLAGS_MODULE := -DMODULE - KBUILD_CFLAGS_MODULE := -DMODULE - KBUILD_LDFLAGS_MODULE := -T $(srctree)/scripts/module-common.lds -s -+KBUILD_LDFLAGS_MODULE_PREREQ := - - # Read KERNELRELEASE from include/config/kernel.release (if it exists) - KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) -@@ -384,7 +385,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE - export ARCH SRCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD CC - export CPP AR NM STRIP OBJCOPY OBJDUMP - export MAKE AWK GENKSYMS INSTALLKERNEL PERL UTS_MACHINE --export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK CHECKFLAGS -+export HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE KBUILD_LDFLAGS_MODULE_PREREQ CHECK CHECKFLAGS - - export KBUILD_CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS - export KBUILD_CFLAGS CFLAGS_KERNEL CFLAGS_MODULE CFLAGS_GCOV --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -94,7 +94,7 @@ else +@@ -94,7 +94,6 @@ else endif endif -KBUILD_LDFLAGS_MODULE += arch/powerpc/lib/crtsavres.o -+KBUILD_LDFLAGS_MODULE_PREREQ += arch/powerpc/lib/crtsavres.o ifeq ($(CONFIG_TUNE_CELL),y) KBUILD_CFLAGS += $(call cc-option,-mtune=cell) ---- a/scripts/Makefile.modpost -+++ b/scripts/Makefile.modpost -@@ -110,7 +110,14 @@ quiet_cmd_cc_o_c = CC $@ - cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \ - -c -o $@ $< - --$(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE -+quiet_cmd_as_o_S = AS $(quiet_modtag) $@ -+cmd_as_o_S = $(CC) $(a_flags) $(AFLAGS_MODULE) -c -o $@ $< -+ -+$(KBUILD_LDFLAGS_MODULE_PREREQ): %.o: %.S FORCE -+ $(Q)mkdir -p $(dir $@) -+ $(call if_changed_dep,as_o_S) -+ -+$(modules:.ko=.mod.o): %.mod.o: %.mod.c $(KBUILD_LDFLAGS_MODULE_PREREQ) FORCE - $(call if_changed_dep,cc_o_c) - - targets += $(modules:.ko=.mod.o) -@@ -119,6 +126,7 @@ targets += $(modules:.ko=.mod.o) - quiet_cmd_ld_ko_o = LD [M] $@ - cmd_ld_ko_o = $(LD) -r $(LDFLAGS) \ - $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \ -+ $(KBUILD_LDFLAGS_MODULE_PREREQ) \ - -o $@ $(filter-out FORCE,$^) - - $(modules): %.ko :%.o %.mod.o FORCE + -- cgit v1.2.3