diff options
| author | Nils-Christian Kempke <nils-christian.kempke@intel.com> | 2022-01-11 18:12:40 +0100 |
|---|---|---|
| committer | Andrew Burgess <aburgess@redhat.com> | 2022-01-14 14:32:29 +0000 |
| commit | 2026dcfcc0c0e60efa968b889f010a10a93cfe09 (patch) | |
| tree | 30e6ed80c057b8d65cb74b5e5dc71cdbefc4b070 | |
| parent | ff66e8c5bee8a57b531515342e6126782ea9a651 (diff) | |
| download | gdb-2026dcfcc0c0e60efa968b889f010a10a93cfe09.zip gdb-2026dcfcc0c0e60efa968b889f010a10a93cfe09.tar.gz gdb-2026dcfcc0c0e60efa968b889f010a10a93cfe09.tar.bz2 | |
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.
| -rw-r--r-- | gdb/testsuite/lib/compiler.c | 9 | ||||
| -rwxr-xr-x | gdb/testsuite/lib/compiler.cc | 9 | ||||
| -rw-r--r-- | gdb/testsuite/lib/fortran.exp | 3 |
3 files changed, 20 insertions, 1 deletions
diff --git a/gdb/testsuite/lib/compiler.c b/gdb/testsuite/lib/compiler.c index 191bced..451cae3 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 ab36bea..1dfefee 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 ee7fe12..a97c6ee 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_" |