aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2016-05-09 02:30:38 +0200
committerStijn Tintel <stijn@linux-ipv6.be>2016-05-09 02:31:04 +0200
commit91f205acaf2a44ae75418d2f2cb156149f0df8ae (patch)
tree463279fa0f3d03c2ff2d3ba846d840b49b77867a /target/linux
parent3339f14e84b3857cbd1fc2882908eb6a64e3ad2f (diff)
downloadupstream-91f205acaf2a44ae75418d2f2cb156149f0df8ae.tar.gz
upstream-91f205acaf2a44ae75418d2f2cb156149f0df8ae.tar.bz2
upstream-91f205acaf2a44ae75418d2f2cb156149f0df8ae.zip
kernel: add workaround to rebuild vdso-o32.so.dbg
Building for octeon fails with 'arch/mips/vdso/vdso-o32.so.dbg' already contains a '.MIPS.abiflags' section if the file already exists from a prior build. Use the same workaround as the one for vdso.so.dbg committed in 9eb155353a5f5137ec85a5b5b0287af63c544710. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch15
1 files changed, 13 insertions, 2 deletions
diff --git a/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch b/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
index 3d25e8062b..2a36f2a7a0 100644
--- a/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
+++ b/target/linux/generic/patches-4.4/207-mips-vdso-dbg-rebuild-after-genvdso.patch
@@ -1,5 +1,7 @@
---- a/arch/mips/vdso/Makefile
-+++ b/arch/mips/vdso/Makefile
+Index: linux-4.4.9/arch/mips/vdso/Makefile
+===================================================================
+--- linux-4.4.9.orig/arch/mips/vdso/Makefile
++++ linux-4.4.9/arch/mips/vdso/Makefile
@@ -75,7 +75,7 @@ $(obj-vdso): KBUILD_AFLAGS := $(aflags-v
$(obj)/vdso.lds: KBUILD_CPPFLAGS := $(native-abi)
@@ -9,3 +11,12 @@
$(call if_changed,vdsold)
$(obj)/vdso-image.c: $(obj)/vdso.so.dbg $(obj)/genvdso FORCE
+@@ -109,7 +109,7 @@ $(obj)/vdso-o32.lds: KBUILD_CPPFLAGS :=
+ $(obj)/vdso-o32.lds: $(src)/vdso.lds.S FORCE
+ $(call if_changed_dep,cpp_lds_S)
+
+-$(obj)/vdso-o32.so.dbg: $(obj)/vdso-o32.lds $(obj-vdso-o32) FORCE
++$(obj)/vdso-o32.so.dbg: $(obj)/vdso-o32.lds $(obj-vdso-o32) $(obj)/genvdso FORCE
+ $(call if_changed,vdsold)
+
+ $(obj)/vdso-o32-image.c: VDSO_NAME := o32