[PATCH] Fix ld-version.sh to handle large 3rd version part

[PATCH] Fix ld-version.sh to handle large 3rd version part

[James Hogan]

The ld-version.sh script doesn't handle versions with large (>= 10) 3rd
version components, because the 2nd component is only multiplied by 10
times that of the 3rd component.

For example the following version string:
GNU ld (Codescape GNU Tools 2015.06-05 for MIPS MTI Linux) 2.24.90

gives a bogus version number:
 20000000
+ 2400000
+  900000 = 23300000

Breakage, confusion and mole-whacking ensues.

Increase the multipliers of the first two version components by a factor
of 10 to give space for a 3rd components of up to 99, and update the
sole user of ld-ifversion (MIPS VDSO) accordingly.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Michal Marek <mmarek@suse.cz>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: linux-mips@linux-mips.org
---
This is based on top of mips-for-linux-next with Guenter's patch "MIPS:
VDSO: Fix build error with binutils 2.24 and earlier" applied first.

Ralf: Please consider applying to hopefully fix the VDSO build issue
once and for all.

Andi/Michal: If this patch gets merged, I'm guessing the patch "Kbuild,
lto: Add Link Time Optimization support v3" will need tweaking when it
gets merged.
---
 arch/mips/vdso/Makefile | 2 +-
 scripts/ld-version.sh   | 2 +-
 2 files changed, 2 insertions(+), 2 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
diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh
index 198580d245e0..0b67edc5bc6f 100755
--- a/scripts/ld-version.sh
+++ b/scripts/ld-version.sh
@@ -3,6 +3,6 @@
 	{
 	gsub(".*)", "");
 	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
 	}
-- 
2.4.10

Re: [PATCH] Fix ld-version.sh to handle large 3rd version part

[Guenter Roeck]

On Sat, Dec 26, 2015 at 10:47:52PM +0000, James Hogan wrote:
> The ld-version.sh script doesn't handle versions with large (>= 10) 3rd
> version components, because the 2nd component is only multiplied by 10
> times that of the 3rd component.
> 
> For example the following version string:
> GNU ld (Codescape GNU Tools 2015.06-05 for MIPS MTI Linux) 2.24.90
> 
> gives a bogus version number:
>  20000000
> + 2400000
> +  900000 = 23300000
> 
> Breakage, confusion and mole-whacking ensues.
> 
> Increase the multipliers of the first two version components by a factor
> of 10 to give space for a 3rd components of up to 99, and update the
> sole user of ld-ifversion (MIPS VDSO) accordingly.
> 
> Signed-off-by: James Hogan <james.hogan@imgtec.com>
> Cc: Ralf Baechle <ralf@linux-mips.org>
> Cc: Andi Kleen <ak@linux.intel.com>
> Cc: Michal Marek <mmarek@suse.cz>
> Cc: Guenter Roeck <linux@roeck-us.net>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> Cc: linux-mips@linux-mips.org
> ---
> This is based on top of mips-for-linux-next with Guenter's patch "MIPS:
> VDSO: Fix build error with binutils 2.24 and earlier" applied first.
> 
> Ralf: Please consider applying to hopefully fix the VDSO build issue
> once and for all.
> 
> Andi/Michal: If this patch gets merged, I'm guessing the patch "Kbuild,
> lto: Add Link Time Optimization support v3" will need tweaking when it
> gets merged.
> ---
>  arch/mips/vdso/Makefile | 2 +-
>  scripts/ld-version.sh   | 2 +-
>  2 files changed, 2 insertions(+), 2 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
> diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh
> index 198580d245e0..0b67edc5bc6f 100755
> --- a/scripts/ld-version.sh
> +++ b/scripts/ld-version.sh
> @@ -3,6 +3,6 @@
>  	{
>  	gsub(".*)", "");
>  	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
>  	}
> -- 
> 2.4.10
> 

Re: [PATCH] Fix ld-version.sh to handle large 3rd version part

[Andi Kleen]

On Sat, Dec 26, 2015 at 10:47:52PM +0000, James Hogan wrote:
> The ld-version.sh script doesn't handle versions with large (>= 10) 3rd
> version components, because the 2nd component is only multiplied by 10
> times that of the 3rd component.
> 
> For example the following version string:
> GNU ld (Codescape GNU Tools 2015.06-05 for MIPS MTI Linux) 2.24.90
> 
> gives a bogus version number:
>  20000000
> + 2400000
> +  900000 = 23300000
> 
> Breakage, confusion and mole-whacking ensues.

Thanks. Looks good. I'll fix the LTO tree.

Reviewed-by: Andi Kleen <ak@linux.intel.com>

-Andi