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

Commit c5c80bd9 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 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
parents 03891f9c 8083013f

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),y)

  ifeq ($(call ld-ifversion, -lt, 225000000, 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

scripts/ld-version.sh

+3 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,9 @@ 
# extract linker version number from stdin and turn into single number

# extract linker version number from stdin and turn into single number

	{

	{

	gsub(".*)", "");

	gsub(".*)", "");

	gsub(".*version ", "");

	gsub("-.*", "");

	split($1,a, ".");

	split($1,a, ".");

	print a[1]*10000000 + a[2]*100000 + a[3]*10000 + a[4]*100 + a[5];

	print a[1]*100000000 + a[2]*1000000 + a[3]*10000 + a[4]*100 + a[5];

	exit

	exit

	}
 
	}