summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 21:26:03 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-12 21:26:03 +0300
commitc5c80bd923d34f7dc70e7b23eb427cd284989a1b (patch)
treebe447f70226997678cc6e9596ec75f14335fa670 /scripts
parent03891f9c853d5c4473224478a1e03ea00d70ff8d (diff)
parent8083013fc3201b75535afc39338cc7d2cad32e37 (diff)
downloadlinux-c5c80bd923d34f7dc70e7b23eb427cd284989a1b.tar.xz
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 'scripts')
-rwxr-xr-xscripts/ld-version.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh
index 198580d245e0..d154f0877fd8 100755
--- a/scripts/ld-version.sh
+++ b/scripts/ld-version.sh
@@ -2,7 +2,9 @@
# extract linker version number from stdin and turn into single number
{
gsub(".*)", "");
+ gsub(".*version ", "");
+ 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
}