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

Commit 42946160 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS build fix from Ralf Baechle:
 "Fix a makefile issue resulting in build breakage with older binutils.

  This has sat in -next for a few days, testers and buildbot are happy
  with it, too though if you are going for another -rc that'd certainly
  help ironing out a few more issues"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: VDSO: Fix build error with binutils 2.24 and earlier
parents 4e5e384c 398c7500

arch/mips/vdso/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ aflags-vdso := $(ccflags-vdso) \ 
# the comments on that file.

# the comments on that file.

#

#

ifndef CONFIG_CPU_MIPSR6

ifndef CONFIG_CPU_MIPSR6

  ifeq ($(call ld-ifversion, -lt, 22500000, y),)

  ifeq ($(call ld-ifversion, -lt, 22500000, y),y)

    $(warning MIPS VDSO requires binutils >= 2.25)

    $(warning MIPS VDSO requires binutils >= 2.25)

    obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y))

    obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y))

    ccflags-vdso += -DDISABLE_MIPS_VDSO

    ccflags-vdso += -DDISABLE_MIPS_VDSO