Skip to content

Commit 959b4c8

Browse files
Gu Zitaoopsiff
authored andcommitted
sw64: vdso: adapt to the upstream changes in vdso_install
Fix it according to upstream commit 56769ba ("kbuild: unify vdso_install rules"). Signed-off-by: Gu Zitao <guzitao@wxiat.com> Reviewed-by: He Sheng <hesheng@wxiat.com> Signed-off-by: Gu Zitao <guzitao@wxiat.com> (cherry picked from commit e98d2e7)
1 parent e503192 commit 959b4c8

2 files changed

Lines changed: 1 addition & 14 deletions

File tree

arch/sw_64/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,7 @@ export LIBS_Y
4949

5050
boot := arch/sw_64/boot
5151

52-
PHONY += vdso_install
53-
vdso_install:
54-
$(Q)$(MAKE) $(build)=arch/sw_64/kernel/vdso $@
52+
vdso-install-y += arch/sw_64/vdso/vdso.so.dbg
5553

5654
#Default target when executing make with no arguments
5755
all: $(boot)/vmlinux.bin.gz

arch/sw_64/kernel/vdso/Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,3 @@ quiet_cmd_vdsold = VDSOLD $@
6969
# that contains the same symbols at the same offsets.
7070
quiet_cmd_so2s = SO2S $@
7171
cmd_so2s = $(NM) -D $< | $(srctree)/$(src)/so2s.sh > $@
72-
73-
# install commands for the unstripped file
74-
quiet_cmd_vdso_install = INSTALL $@
75-
cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@
76-
77-
vdso.so: $(obj)/vdso.so.dbg
78-
@mkdir -p $(MODLIB)/vdso
79-
$(call cmd,vdso_install)
80-
81-
82-
vdso_install: vdso.so

0 commit comments

Comments
 (0)