summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-03 11:49:31 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-03 11:49:31 -0800
commit429461608e77f1777ee5ecb044251ec64abc3edf (patch)
tree310a4aaef96e9ead280652f6ba8e3c7226c33c7b
parent4e5e384c46fc4fa812f9313e7d5abc1d0d0511a7 (diff)
parent398c7500a1f5f74e207bd2edca1b1721b3cc1f1e (diff)
downloadlinux-stable-429461608e77f1777ee5ecb044251ec64abc3edf.tar.gz
linux-stable-429461608e77f1777ee5ecb044251ec64abc3edf.tar.bz2
linux-stable-429461608e77f1777ee5ecb044251ec64abc3edf.zip
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
-rw-r--r--arch/mips/vdso/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile
index 018f8c7b94f2..14568900fc1d 100644
--- 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