From 89ccc83c7da73e7ca3a112e350008131942b592e Mon Sep 17 00:00:00 2001
From: Viktor Szakats <commit@vsz.me>
Date: Mon, 20 Nov 2023 02:06:37 +0000
Subject: [PATCH] autotools: fix dotless gcc and Apple clang version detections

- fix parsing dotless (major-only) gcc versions.
  Follow-up to 00a3b88c51cdb407fbbb347a2e38c5c7d89875ad #1187

- sync gcc detection variable names with curl.

- fix Apple clang version detection for releases between
  'Apple LLVM version 7.3.0' and 'Apple LLVM version 10.0.1' where the
  version was under-detected as 3.7 llvm/clang equivalent.

- fix Apple clang version detection for 'Apple clang version 11.0.0'
  and newer where the Apple clang version was detected, instead of its
  llvm/clang equivalent.

- revert to show `clang` instead of `Apple clang`, because we follow it
  with an llvm/clang version number. (Apple-ness still visible in raw
  version.)

Used this collection for Apple clang / llvm/clang translation and test
inputs: https://gist.github.com/yamaya/2924292

Closes #1232
---
 acinclude.m4 | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 9ba3e21c..2a93280c 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -184,23 +184,37 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
           AC_MSG_CHECKING([compiler version])
           fullclangver=`$CC -v 2>&1 | grep version`
           if echo $fullclangver | grep 'Apple' >/dev/null; then
-            clangname='Apple clang'
+            appleclang=1
           else
-            clangname='clang'
+            appleclang=0
           fi
           clangver=`echo $fullclangver | grep "based on LLVM " | "$SED" 's/.*(based on LLVM \(@<:@0-9@:>@*\.@<:@0-9@:>@*\).*)/\1/'`
           if test -z "$clangver"; then
-            if echo $fullclangver | grep "Apple LLVM version " >/dev/null; then
-              dnl Starting with Xcode 7 / clang 3.7, Apple clang won't tell its upstream version
-              clangver="3.7"
-            else
-              clangver=`echo $fullclangver | "$SED" 's/.*version \(@<:@0-9@:>@*\.@<:@0-9@:>@*\).*/\1/'`
-            fi
+            clangver=`echo $fullclangver | "$SED" 's/.*version \(@<:@0-9@:>@*\.@<:@0-9@:>@*\).*/\1/'`
+            oldapple=0
+          else
+            oldapple=1
           fi
           clangvhi=`echo $clangver | cut -d . -f1`
           clangvlo=`echo $clangver | cut -d . -f2`
           compiler_num=`(expr $clangvhi "*" 100 + $clangvlo) 2>/dev/null`
-          AC_MSG_RESULT([$clangname '$compiler_num' (raw: '$fullclangver' / '$clangver')])
+          if test "$appleclang" = '1' && test "$oldapple" = '0'; then
+            dnl Starting with Xcode 7 / clang 3.7, Apple clang won't tell its upstream version
+            if   test "$compiler_num" -ge '1300'; then compiler_num='1200'
+            elif test "$compiler_num" -ge '1205'; then compiler_num='1101'
+            elif test "$compiler_num" -ge '1204'; then compiler_num='1000'
+            elif test "$compiler_num" -ge '1107'; then compiler_num='900'
+            elif test "$compiler_num" -ge '1103'; then compiler_num='800'
+            elif test "$compiler_num" -ge '1003'; then compiler_num='700'
+            elif test "$compiler_num" -ge '1001'; then compiler_num='600'
+            elif test "$compiler_num" -ge  '904'; then compiler_num='500'
+            elif test "$compiler_num" -ge  '902'; then compiler_num='400'
+            elif test "$compiler_num" -ge  '803'; then compiler_num='309'
+            elif test "$compiler_num" -ge  '703'; then compiler_num='308'
+            else                                       compiler_num='307'
+            fi
+          fi
+          AC_MSG_RESULT([clang '$compiler_num' (raw: '$fullclangver' / '$clangver')])
 
           tmp_CFLAGS="-pedantic"
           CURL_ADD_COMPILER_WARNINGS([tmp_CFLAGS], [all extra])
@@ -323,9 +337,13 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
         AC_MSG_CHECKING([compiler version])
         # strip '-suffix' parts, e.g. Ubuntu Windows cross-gcc returns '10-win32'
         gccver=`$CC -dumpversion | sed -E 's/-.+$//'`
-        num1=`echo $gccver | cut -d . -f1`
-        num2=`echo $gccver | cut -d . -f2`
-        compiler_num=`(expr $num1 "*" 100 + $num2) 2>/dev/null`
+        gccvhi=`echo $gccver | cut -d . -f1`
+        if echo $gccver | grep -F "." >/dev/null; then
+          gccvlo=`echo $gccver | cut -d . -f2`
+        else
+          gccvlo="0"
+        fi
+        compiler_num=`(expr $gccvhi "*" 100 + $gccvlo) 2>/dev/null`
         AC_MSG_RESULT([gcc '$compiler_num' (raw: '$gccver')])
 
         if test "$ICC" = "yes"; then