From: Jo-Philipp Wich <jo@mein.io>
Date: Wed, 11 May 2016 22:27:47 +0000 (+0200)
Subject: kernel: add workaround to rebuild vdso-n32.so.dbg too
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=33d9d6c375373db3dd4b682ab80db62179e35ea5;p=openwrt%2Fstaging%2Fnbd.git

kernel: add workaround to rebuild vdso-n32.so.dbg too

Building for octeon fails with

  'arch/mips/vdso/vdso-n32.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.

Commit 91f205acaf2a44ae75418d2f2cb156149f0df8ae extended the workaround
to cover vdso-o32.so.dbg but missed the vdso-n32.so.dbg which is added
now by this change.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

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 cd988a9504..ed0445cecf 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
@@ -18,3 +18,12 @@
  	$(call if_changed,vdsold)
  
  $(obj)/vdso-o32-image.c: VDSO_NAME := o32
+@@ -145,7 +145,7 @@ $(obj)/vdso-n32.lds: KBUILD_CPPFLAGS :=
+ $(obj)/vdso-n32.lds: $(src)/vdso.lds.S FORCE
+ 	$(call if_changed_dep,cpp_lds_S)
+ 
+-$(obj)/vdso-n32.so.dbg: $(obj)/vdso-n32.lds $(obj-vdso-n32) FORCE
++$(obj)/vdso-n32.so.dbg: $(obj)/vdso-n32.lds $(obj-vdso-n32) $(obj)/genvdso FORCE
+ 	$(call if_changed,vdsold)
+ 
+ $(obj)/vdso-n32-image.c: VDSO_NAME := n32