Merge branch 'address-masking'

[thirdparty/kernel/stable.git] / scripts / ld-version.sh

diff --git a/scripts/ld-version.sh b/scripts/ld-version.sh
index a78b804b680cf3d46ee3feb335b89689cf9ac5ac..b9513d224476fc2d8f79496fb0e2cc8049a987fd 100755 (executable)
--- a/scripts/ld-version.sh
+++ b/scripts/ld-version.sh
@@ -57,9 +57,11 @@ else
        fi
 fi
 
-# Some distributions append a package release number, as in 2.34-4.fc32
-# Trim the hyphen and any characters that follow.
-version=${version%-*}
+# There may be something after the version, such as a distribution's package
+# release number (like Fedora's "2.34-4.fc32") or punctuation (like LLD briefly
+# added before the "compatible with GNU linkers" string), so remove everything
+# after just numbers and periods.
+version=${version%%[!0-9.]*}
 
 cversion=$(get_canonical_version $version)
 min_cversion=$(get_canonical_version $min_version)