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

torvalds · torvalds · commit 429461608e77 · 2016-01-03T11:49:31.000-08:00
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
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
@@ -26,7 +26,7 @@ aflags-vdso := $(ccflags-vdso) \
 # the comments on that file.
 #
 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)
     obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y))
     ccflags-vdso += -DDISABLE_MIPS_VDSO

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ aflags-vdso := $(ccflags-vdso) \`
`26`	`26`	`# the comments on that file.`
`27`	`27`	`#`
`28`	`28`	`ifndef CONFIG_CPU_MIPSR6`
`29`		`- ifeq ($(call ld-ifversion, -lt, 22500000, y),)`
	`29`	`+ ifeq ($(call ld-ifversion, -lt, 22500000, y),y)`
`30`	`30`	`$(warning MIPS VDSO requires binutils >= 2.25)`
`31`	`31`	`obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y))`
`32`	`32`	`ccflags-vdso += -DDISABLE_MIPS_VDSO`