Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8150caad authored by Roland McGrath's avatar Roland McGrath Committed by Paul Mackerras
Browse files

[POWERPC] powerpc vDSO: install unstripped copies on disk 



This keeps an unstripped copy of the vDSO images built before they are
stripped and embedded in the kernel.  The unstripped copies get installed in
$(MODLIB)/vdso/ by "make install".  These files can be useful when they
contain source-level debugging information.

Signed-off-by: default avatarRoland McGrath <roland@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent d4243c17

arch/powerpc/Makefile

+7 −1
Original line number Diff line number Diff line
@@ -169,9 +169,15 @@ define archhelp 
  @echo '  *_defconfig     - Select default config from arch/$(ARCH)/configs'

endef



install:

install: vdso_install

	$(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install



vdso_install:

ifeq ($(CONFIG_PPC64),y)

	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@

endif

	$(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@



archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

arch/powerpc/kernel/vdso32/Makefile

+17 −3
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ ifeq ($(CONFIG_PPC32),y) 
CROSS32CC := $(CC)

endif



targets := $(obj-vdso32) vdso32.so

targets := $(obj-vdso32) vdso32.so vdso32.so.dbg

obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))





EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin

EXTRA_CFLAGS := -shared -fno-common -fno-builtin

EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso32.so.1 \

		$(call ld-option, -Wl$(comma)--hash-style=sysv)

EXTRA_AFLAGS := -D__VDSO32__ -s
@@ -26,9 +26,14 @@ CPPFLAGS_vdso32.lds += -P -C -Upowerpc 
$(obj)/vdso32_wrapper.o : $(obj)/vdso32.so



# link rule for the .so file, .lds has to be first

$(obj)/vdso32.so: $(src)/vdso32.lds $(obj-vdso32)

$(obj)/vdso32.so.dbg: $(src)/vdso32.lds $(obj-vdso32)

	$(call if_changed,vdso32ld)



# strip rule for the .so file

$(obj)/%.so: OBJCOPYFLAGS := -S

$(obj)/%.so: $(obj)/%.so.dbg FORCE

	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso32): %.o: %.S

	$(call if_changed_dep,vdso32as)
@@ -39,3 +44,12 @@ quiet_cmd_vdso32ld = VDSO32L $@ 
quiet_cmd_vdso32as = VDSO32A $@

      cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $<



# install commands for the unstripped file

quiet_cmd_vdso_install = INSTALL $@

      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@



vdso32.so: $(obj)/vdso32.so.dbg

	@mkdir -p $(MODLIB)/vdso

	$(call cmd,vdso_install)



vdso_install: vdso32.so

arch/powerpc/kernel/vdso64/Makefile

+16 −3
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ obj-vdso64 = sigtramp.o gettimeofday.o datapage.o cacheflush.o note.o 


# Build rules



targets := $(obj-vdso64) vdso64.so

targets := $(obj-vdso64) vdso64.so vdso64.so.dbg

obj-vdso64 := $(addprefix $(obj)/, $(obj-vdso64))



EXTRA_CFLAGS := -shared -s -fno-common -fno-builtin

EXTRA_CFLAGS := -shared -fno-common -fno-builtin

EXTRA_CFLAGS += -nostdlib -Wl,-soname=linux-vdso64.so.1 \

		$(call ld-option, -Wl$(comma)--hash-style=sysv)

EXTRA_AFLAGS := -D__VDSO64__ -s
@@ -20,9 +20,14 @@ CPPFLAGS_vdso64.lds += -P -C -U$(ARCH) 
$(obj)/vdso64_wrapper.o : $(obj)/vdso64.so



# link rule for the .so file, .lds has to be first

$(obj)/vdso64.so: $(src)/vdso64.lds $(obj-vdso64)

$(obj)/vdso64.so.dbg: $(src)/vdso64.lds $(obj-vdso64)

	$(call if_changed,vdso64ld)



# strip rule for the .so file

$(obj)/%.so: OBJCOPYFLAGS := -S

$(obj)/%.so: $(obj)/%.so.dbg FORCE

	$(call if_changed,objcopy)



# assembly rules for the .S files

$(obj-vdso64): %.o: %.S

	$(call if_changed_dep,vdso64as)
@@ -33,4 +38,12 @@ quiet_cmd_vdso64ld = VDSO64L $@ 
quiet_cmd_vdso64as = VDSO64A $@

      cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $<



# install commands for the unstripped file

quiet_cmd_vdso_install = INSTALL $@

      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@



vdso64.so: $(obj)/vdso64.so.dbg

	@mkdir -p $(MODLIB)/vdso

	$(call cmd,vdso_install)



vdso_install: vdso64.so