Re: [PATCH v3 1/4] gdb, testsuite: handle icc and icpc deprecated remarks

[Thiago Jung Bauermann <thiago.bauermann@linaro.org>]

Hello,

Abdul Basit Ijaz via Gdb-patches <gdb-patches@sourceware.org> writes:

> diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
> index 1b9179401c4..def6a75dfee 100644
> --- a/gdb/testsuite/lib/gdb.exp
> +++ b/gdb/testsuite/lib/gdb.exp
> @@ -4980,13 +4980,15 @@ proc gdb_compile {source dest type options} {
>  	    }
>  	}
>  
> -	# Starting with 2021.7.0 (recognized as icc-20-21-7 by GDB) icc and
> -	# icpc are marked as deprecated and both compilers emit the remark
> -	# #10441.  To let GDB still compile successfully, we disable these
> -	# warnings here.
> +	# Starting with 2021.7.0 (recognized as icc-20-21-7 by
> +	# GDB) icc and icpc are marked as deprecated and both
> +	# compilers emit the remark #10441.  To let GDB still
> +	# compile successfully, we disable these warnings here.

I don't see any change in this comment except for the reformatting.
IMO, the text is more readable at the larger width and considering that
it's already less than 80 columns, I suggest dropping this part of the
change.

>  	if {([lsearch -exact $options c++] != -1
> -	     && [test_compiler_info {icc-20-21-[7-9]} c++])
> -	    || [test_compiler_info {icc-20-21-[7-9]}]} {
> +	     && [test_compiler_info {icc-20-21-[7-9]} c++]
> +	     && [test_compiler_info {icc-20-21-[1-9][0-9]} c++])

Unless I'm missing something, the above should be:

  ([lsearch …] != -1
   && ([test_compiler_info <pattern 1> c++]
       || [test_compiler_info <pattern 2> c++])

> +	    || [test_compiler_info {icc-20-21-[7-9]}]
> +	    || [test_compiler_info {icc-20-21-[1-9][0-9]}]} {
>  	    lappend new_options "additional_flags=-diag-disable=10441"
>  	}
>      }

-- 
Thiago