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

Commit a88754b2 authored by Vincenzo Frascino's avatar Vincenzo Frascino Committed by Will Deacon
Browse files

arm64: vdso: Cleanup Makefiles 



The recent changes to the vdso library for arm64 and the introduction of
the compat vdso library have generated some misalignment in the
Makefiles.

Cleanup the Makefiles for vdso and vdso32 libraries:
  * Removing unused rules.
  * Unifying the displayed compilation messages.
  * Simplifying the generic library inclusion path for
    arm64 vdso.

Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarVincenzo Frascino <vincenzo.frascino@arm.com>
Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent 2e2f3c9b

arch/arm64/kernel/vdso/Makefile

+3 −6
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ UBSAN_SANITIZE := n 
OBJECT_FILES_NON_STANDARD	:= y

KCOV_INSTRUMENT			:= n



ifeq ($(c-gettimeofday-y),)

CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny

else

CFLAGS_vgettimeofday.o = -O2 -mcmodel=tiny -include $(c-gettimeofday-y)



ifneq ($(c-gettimeofday-y),)

  CFLAGS_vgettimeofday.o += -include $(c-gettimeofday-y)

endif



# Clang versions less than 8 do not support -mcmodel=tiny
@@ -73,9 +73,6 @@ include/generated/vdso-offsets.h: $(obj)/vdso.so.dbg FORCE 
	$(call if_changed,vdsosym)



# Actual build commands

quiet_cmd_vdsocc = VDSOCC   $@

      cmd_vdsocc = $(CC) $(a_flags) $(c_flags) -c -o $@ $<



quiet_cmd_vdsold_and_vdso_check = LD      $@

      cmd_vdsold_and_vdso_check = $(cmd_ld); $(cmd_vdso_check)

arch/arm64/kernel/vdso32/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -155,17 +155,17 @@ $(asm-obj-vdso): %.o: %.S FORCE 
	$(call if_changed_dep,vdsoas)



# Actual build commands

quiet_cmd_vdsold_and_vdso_check = LD      $@

quiet_cmd_vdsold_and_vdso_check = LD32    $@

      cmd_vdsold_and_vdso_check = $(cmd_vdsold); $(cmd_vdso_check)



quiet_cmd_vdsold = VDSOL   $@

quiet_cmd_vdsold = LD32    $@

      cmd_vdsold = $(COMPATCC) -Wp,-MD,$(depfile) $(VDSO_LDFLAGS) \

                   -Wl,-T $(filter %.lds,$^) $(filter %.o,$^) -o $@

quiet_cmd_vdsocc = VDSOC   $@

quiet_cmd_vdsocc = CC32    $@

      cmd_vdsocc = $(COMPATCC) -Wp,-MD,$(depfile) $(VDSO_CFLAGS) -c -o $@ $<

quiet_cmd_vdsocc_gettimeofday = VDSOC_GTD   $@

quiet_cmd_vdsocc_gettimeofday = CC32    $@

      cmd_vdsocc_gettimeofday = $(COMPATCC) -Wp,-MD,$(depfile) $(VDSO_CFLAGS) $(VDSO_CFLAGS_gettimeofday_o) -c -o $@ $<

quiet_cmd_vdsoas = VDSOA   $@

quiet_cmd_vdsoas = AS32    $@

      cmd_vdsoas = $(COMPATCC) -Wp,-MD,$(depfile) $(VDSO_AFLAGS) -c -o $@ $<



quiet_cmd_vdsomunge = MUNGE   $@