Merge tag 'trace-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[linux-2.6-microblaze.git] / scripts / as-version.sh

diff --git a/scripts/as-version.sh b/scripts/as-version.sh
index 8b9410e..1a21495 100755 (executable)
--- a/scripts/as-version.sh
+++ b/scripts/as-version.sh
@@ -21,14 +21,14 @@ get_canonical_version()
        echo $((10000 * $1 + 100 * ${2:-0} + ${3:-0}))
 }
 
-# Clang fails to handle -Wa,--version unless -no-integrated-as is given.
-# We check -(f)integrated-as, expecting it is explicitly passed in for the
+# Clang fails to handle -Wa,--version unless -fno-integrated-as is given.
+# We check -fintegrated-as, expecting it is explicitly passed in for the
 # integrated assembler case.
 check_integrated_as()
 {
        while [ $# -gt 0 ]; do
-               if [ "$1" = -integrated-as -o "$1" = -fintegrated-as ]; then
-                       # For the intergrated assembler, we do not check the
+               if [ "$1" = -fintegrated-as ]; then
+                       # For the integrated assembler, we do not check the
                        # version here. It is the same as the clang version, and
                        # it has been already checked by scripts/cc-version.sh.
                        echo LLVM 0