diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 10:26:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-12 10:26:03 -0800 |
| commit | c5c80bd923d34f7dc70e7b23eb427cd284989a1b (patch) | |
| tree | be447f70226997678cc6e9596ec75f14335fa670 /arch/mips | |
| parent | 03891f9c853d5c4473224478a1e03ea00d70ff8d (diff) | |
| parent | 8083013fc3201b75535afc39338cc7d2cad32e37 (diff) | |
| download | blackbird-op-linux-c5c80bd923d34f7dc70e7b23eb427cd284989a1b.tar.gz blackbird-op-linux-c5c80bd923d34f7dc70e7b23eb427cd284989a1b.zip | |
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
Pull MIPS fixes from Ralf Baechle:
"This is the final pull request for MIPS for 4.4. It fixes:
- scripts/ld-version.sh parsing of ld version numbers that contain
large numbers as components.
- fix parsing of version numbers as used by Fedora's ld.
Currently scripts/ld-version.sh is only being used by MIPS"
[ This obviously missed 4.4, so getting merged now in the merge window
for 4.5 instead ]
* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
ld-version: Fix it on Fedora
Fix ld-version.sh to handle large 3rd version part
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/vdso/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index 14568900fc1d..ee3617c0c5e2 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),y) + ifeq ($(call ld-ifversion, -lt, 225000000, y),y) $(warning MIPS VDSO requires binutils >= 2.25) obj-vdso-y := $(filter-out gettimeofday.o, $(obj-vdso-y)) ccflags-vdso += -DDISABLE_MIPS_VDSO |
