espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-18 16:53:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb/testsuite: enable __INTEL_LLVM_COMPILER preprocessor in get_compiler_info

Browse Source 
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.
This commit is contained in:
Nils-Christian Kempke
2022-01-11 18:12:40 +01:00
committed by Andrew Burgess
parent ff66e8c5be
commit 2026dcfcc0
3 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gdb/testsuite/lib/compiler.c
View File

@ -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_minor [format "%d" [string range __ICL 2 [expr {[string length __ICL] -1}]]]
set icc_update __INTEL_COMPILER_UPDATE set icc_update __INTEL_COMPILER_UPDATE
set compiler_info [join "icc $icc_major $icc_minor $icc_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 #endif

9
gdb/testsuite/lib/compiler.cc
View File

@ -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_minor [format "%d" [string range __ICL 2 [expr {[string length __ICL] -1}]]]
set icc_update __INTEL_COMPILER_UPDATE set icc_update __INTEL_COMPILER_UPDATE
set compiler_info [join "icc $icc_major $icc_minor $icc_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 #endif

3
gdb/testsuite/lib/fortran.exp
View File

@ -160,7 +160,8 @@ proc fortran_character1 {} {
proc fortran_main {} { proc fortran_main {} {
if {[test_compiler_info {gcc-4-[012]-*}] if {[test_compiler_info {gcc-4-[012]-*}]
|| [test_compiler_info {gcc-*}] || [test_compiler_info {gcc-*}]
|| [test_compiler_info {icc-*}]} { || [test_compiler_info {icc-*}]
|| [test_compiler_info {intel-*}]} {
return "MAIN__" return "MAIN__"
} elseif {[test_compiler_info {clang-*}]} { } elseif {[test_compiler_info {clang-*}]} {
return "MAIN_" return "MAIN_"