public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Andrew Burgess <aburgess@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] gdb/testsuite: enable __INTEL_LLVM_COMPILER preprocessor in get_compiler_info Date: Fri, 14 Jan 2022 14:32:42 +0000 (GMT) [thread overview] Message-ID: <20220114143242.9F8A53858D35@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=2026dcfcc0c0e60efa968b889f010a10a93cfe09 commit 2026dcfcc0c0e60efa968b889f010a10a93cfe09 Author: Nils-Christian Kempke <nils-christian.kempke@intel.com> Date: Tue Jan 11 18:12:40 2022 +0100 gdb/testsuite: enable __INTEL_LLVM_COMPILER preprocessor in get_compiler_info Intel Next Gen compiler defines preprocessor __INTEL_LLVM_COMPILER and provides version info in __clang_version__ e.g. value: 12.0.0 (icx 2020.10.0.1113). gdb/testsuite/ChangeLog: 2020-12-07 Abdul Basit Ijaz <abdul.b.ijaz@intel.com> * lib/compiler.c: Add Intel next gen compiler pre-processor check. * lib/compiler.cc: Ditto. * lib/fortran.exp (fortran_main): Check Intel next gen compiler in test_compiler_info. Diff: --- gdb/testsuite/lib/compiler.c | 9 +++++++++ gdb/testsuite/lib/compiler.cc | 9 +++++++++ gdb/testsuite/lib/fortran.exp | 3 ++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/compiler.c b/gdb/testsuite/lib/compiler.c index 191bced0411..451cae38312 100644 --- a/gdb/testsuite/lib/compiler.c +++ b/gdb/testsuite/lib/compiler.c @@ -67,4 +67,13 @@ set icc_major [string range __ICL 0 1] set icc_minor [format "%d" [string range __ICL 2 [expr {[string length __ICL] -1}]]] set icc_update __INTEL_COMPILER_UPDATE set compiler_info [join "icc $icc_major $icc_minor $icc_update" -] +#elif defined(__INTEL_LLVM_COMPILER) && defined(__clang_version__) +/* Intel Next Gen compiler defines preprocessor __INTEL_LLVM_COMPILER and + provides version info in __clang_version__ e.g. value: + "12.0.0 (icx 2020.10.0.1113)". */ +set total_length [string length __clang_version__] +set version_start_index [string last "(" __clang_version__] +set version_string [string range __clang_version__ $version_start_index+5 $total_length-2] +set version_updated_string [string map {. -} $version_string] +set compiler_info "intel-$version_updated_string" #endif diff --git a/gdb/testsuite/lib/compiler.cc b/gdb/testsuite/lib/compiler.cc index ab36bea43ae..1dfefee057d 100755 --- a/gdb/testsuite/lib/compiler.cc +++ b/gdb/testsuite/lib/compiler.cc @@ -55,4 +55,13 @@ set icc_major [string range __ICL 0 1] set icc_minor [format "%d" [string range __ICL 2 [expr {[string length __ICL] -1}]]] set icc_update __INTEL_COMPILER_UPDATE set compiler_info [join "icc $icc_major $icc_minor $icc_update" -] +#elif defined(__INTEL_LLVM_COMPILER) && defined(__clang_version__) +/* Intel Next Gen compiler defines preprocessor __INTEL_LLVM_COMPILER and + provides version info in __clang_version__ e.g. value: + "12.0.0 (icx 2020.10.0.1113)". */ +set total_length [string length __clang_version__] +set version_start_index [string last "(" __clang_version__] +set version_string [string range __clang_version__ $version_start_index+5 $total_length-2] +set version_updated_string [string map {. -} $version_string] +set compiler_info "intel-$version_updated_string" #endif diff --git a/gdb/testsuite/lib/fortran.exp b/gdb/testsuite/lib/fortran.exp index ee7fe12ad9b..a97c6eeb4e3 100644 --- a/gdb/testsuite/lib/fortran.exp +++ b/gdb/testsuite/lib/fortran.exp @@ -160,7 +160,8 @@ proc fortran_character1 {} { proc fortran_main {} { if {[test_compiler_info {gcc-4-[012]-*}] || [test_compiler_info {gcc-*}] - || [test_compiler_info {icc-*}]} { + || [test_compiler_info {icc-*}] + || [test_compiler_info {intel-*}]} { return "MAIN__" } elseif {[test_compiler_info {clang-*}]} { return "MAIN_"
reply other threads:[~2022-01-14 14:32 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220114143242.9F8A53858D35@sourceware.org \ --to=aburgess@sourceware.org \ --cc=gdb-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).