# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1612032304 -3600
# Node ID 6a4554de992570eea61f23937e23d3d046dc3f3a
# Parent  e24b182c5646fbf7738929308cd3964814382a12
patch 8.2.2431: warning for -fno-strength-reduce with Clang 11

Commit: https://github.com/vim/vim/commit/ebd211c8a39871c88189c8cda9e624eb30b300b3
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Jan 30 19:33:36 2021 +0100

    patch 8.2.2431: warning for -fno-strength-reduce with Clang 11

    Problem:    Warning for -fno-strength-reduce with Clang 11.
    Solution:   Adjust check for clang version number.

diff --git a/src/auto/configure b/src/auto/configure
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -4510,9 +4510,9 @@ if test x"$CLANG_VERSION_STRING" != x"" 
   CLANG_VERSION=`expr $CLANG_MAJOR '*' 1000000 '+' $CLANG_MINOR '*' 1000 '+' $CLANG_REVISION`
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CLANG_VERSION" >&5
 $as_echo "$CLANG_VERSION" >&6; }
-          { $as_echo "$as_me:${as_lineno-$LINENO}: checking if clang supports -fno-strength-reduce" >&5
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking if clang supports -fno-strength-reduce" >&5
 $as_echo_n "checking if clang supports -fno-strength-reduce... " >&6; }
-  if test "$CLANG_VERSION" -ge 500002075 ; then
+  if test "$CLANG_MAJOR" -ge 10 -o "$CLANG_VERSION" -ge 500002075 ; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     CFLAGS=`echo "$CFLAGS" | sed -e 's/-fno-strength-reduce/ /'`
diff --git a/src/configure.ac b/src/configure.ac
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -127,8 +127,9 @@ if test x"$CLANG_VERSION_STRING" != x"" 
   dnl change the constant 500002075 below appropriately.  To get the
   dnl integer corresponding to a version number, refer to the
   dnl definition of CLANG_VERSION above.
+  dnl Clang 11 reports "11", assume Clang 10 and later work like this.
   AC_MSG_CHECKING(if clang supports -fno-strength-reduce)
-  if test "$CLANG_VERSION" -ge 500002075 ; then
+  if test "$CLANG_MAJOR" -ge 10 -o "$CLANG_VERSION" -ge 500002075 ; then
     AC_MSG_RESULT(no)
     CFLAGS=`echo "$CFLAGS" | sed -e 's/-fno-strength-reduce/ /'`
   else
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2431,
+/**/
     2430,
 /**/
     2429,