From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2104) id 6CE9D3858D20; Mon, 9 Jan 2023 08:56:46 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6CE9D3858D20 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673254606; bh=Q8fVQIjQdxBwWhaOFSG63fMT0P3UpR7G1T0ZQb/n0Rw=; h=From:To:Subject:Date:From; b=a7ACcDKTZEkXVXPLK0XNe0Wuz6hSfvwYlLb/LRQmHoMj0bbqZsi4h8vy1b8nEARNl jtzYcZB80VOImLXhWp3xI5NWGPwfjO1OFxQm1zeNietj+/Sj2MtmpnZ2xz7IoBp8t7 Ha0e8Rzsm2wRfVBtDf9p7iovXerYwnqr5EdBwb+0= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tankut Baris Aktemur To: gdb-cvs@sourceware.org Subject: [binutils-gdb] testsuite: handle icc and icpc deprecated remarks X-Act-Checkin: binutils-gdb X-Git-Author: Nils-Christian Kempke X-Git-Refname: refs/heads/master X-Git-Oldrev: 6d3945f172733cabb52c93141c248cf47ac95336 X-Git-Newrev: 0046ff60684eb16dcfafac350d37f4dc56c368e3 Message-Id: <20230109085646.6CE9D3858D20@sourceware.org> Date: Mon, 9 Jan 2023 08:56:46 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D0046ff60684e= b16dcfafac350d37f4dc56c368e3 commit 0046ff60684eb16dcfafac350d37f4dc56c368e3 Author: Nils-Christian Kempke Date: Mon Jan 9 09:44:22 2023 +0100 testsuite: handle icc and icpc deprecated remarks =20 Starting with icc/icpc version 2021.7.0 and higher both compilers emit a deprecation remark when used. E.g. =20 >> icc --version icc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated and will be removed from product release in the second half of 2023. The Intel(R) oneAPI DPC++/C++ Compiler (ICX) is the recommen= ded compiler moving forward. Please transition to use this compiler. Use '-diag-disable=3D10441' to disable this message. icc (ICC) 2021.7.0 20220713 Copyright (C) 1985-2022 Intel Corporation. All rights reserved. =20 >> icpc --version icpc: remark #10441: The Intel(R) C++ Compiler Classic (ICC) is deprecated ... icpc (ICC) 2021.7.0 20220720 Copyright (C) 1985-2022 Intel Corporation. All rights reserved. =20 As the testsuite compile fails when unexpected output by the compiler is seen this change in the compiler breaks all existing icc and icpc tests. This patch makes the gdb testsuite more forgiving by a) allowing the output of the remark when trying to figure out the compiler version and by b) adding '-diag-disable=3D10441' to the compile command whenever gdb_compile is called without the intention to detect the compiler. =20 Approved-By: Tom Tromey Diff: --- gdb/testsuite/lib/gdb.exp | 37 ++++++++++++++++++++++++++++++------- 1 file changed, 30 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index af538e5c8fb..44f11a982dd 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -4690,24 +4690,36 @@ proc gdb_compile {source dest type options} { set new_options [universal_compile_options] } =20 - # Some C/C++ testcases unconditionally pass -Wno-foo as additional - # options to disable some warning. That is OK with GCC, because - # by design, GCC accepts any -Wno-foo option, even if it doesn't - # support -Wfoo. Clang however warns about unknown -Wno-foo by - # default, unless you pass -Wno-unknown-warning-option as well. - # We do that here, so that individual testcases don't have to - # worry about it. + # C/C++ specific settings. if {!$getting_compiler_info && [lsearch -exact $options rust] =3D=3D -1 && [lsearch -exact $options ada] =3D=3D -1 && [lsearch -exact $options f90] =3D=3D -1 && [lsearch -exact $options go] =3D=3D -1} { + + # Some C/C++ testcases unconditionally pass -Wno-foo as additional + # options to disable some warning. That is OK with GCC, because + # by design, GCC accepts any -Wno-foo option, even if it doesn't + # support -Wfoo. Clang however warns about unknown -Wno-foo by + # default, unless you pass -Wno-unknown-warning-option as well. + # We do that here, so that individual testcases don't have to + # worry about it. if {[test_compiler_info "clang-*"] || [test_compiler_info "icx-*"]} { lappend new_options "additional_flags=3D-Wno-unknown-warning-option" } elseif {[test_compiler_info "icc-*"]} { # This is the equivalent for the icc compiler. lappend new_options "additional_flags=3D-diag-disable=3D10148" } + + # 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. + if {([lsearch -exact $options c++] !=3D -1 + && [test_compiler_info {icc-20-21-[7-9]} c++]) + || [test_compiler_info {icc-20-21-[7-9]}]} { + lappend new_options "additional_flags=3D-diag-disable=3D10441" + } } =20 # If the 'build-id' option is used, then ensure that we generate a @@ -4977,6 +4989,17 @@ proc gdb_compile {source dest type options} { # Prune uninteresting compiler (and linker) output. regsub "Creating library file: \[^\r\n\]*\[\r\n\]+" $result "" result =20 + # Starting with 2021.7.0 icc and icpc are marked as deprecated and both + # compilers emit a remark #10441. To let GDB still compile successful= ly, + # we disable these warnings. When $getting_compiler_info is true howe= ver, + # we do not yet know the compiler (nor its version) and instead prune = these + # lines from the compiler output to let the get_compiler_info pass. + if {$getting_compiler_info} { + regsub \ + "(icc|icpc): remark #10441: The Intel\\(R\\) C\\+\\+ Compiler Classic= \\(ICC\\) is deprecated\[^\r\n\]*" \ + "$result" "" result + } + regsub "\[\r\n\]*$" "$result" "" result regsub "^\[\r\n\]*" "$result" "" result