From 9fcafd23fa6d919f112e9a7f73e72895c2457de1 Mon Sep 17 00:00:00 2001 From: Gary Benson Date: Fri, 29 May 2020 17:15:13 +0100 Subject: [PATCH] Fix file-not-found error with clang in gdb.arch/i386-{avx,sse}.c Clang fails to compile two testcases with the following error: fatal error: 'nat/x86-cpuid.h' file not found This prevents the following testcases from executing: gdb.arch/i386-avx.exp gdb.arch/i386-sse.exp Both testcases set additional_flags when building with GCC. This commit causes the additional_flags to also be used when building with clang. Note that, while fixing the build, this commit reveals several new failures when using clang to build the testsuite. gdb/testsuite/ChangeLog: * gdb.arch/i386-avx.exp (additional_flags): Also set when building with clang. * gdb.arch/i386-sse.exp (additional_flags): Likewise. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.arch/i386-avx.exp | 2 +- gdb/testsuite/gdb.arch/i386-sse.exp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ed56c819cb0..667dbfddec0 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2020-05-29 Gary Benson + + * gdb.arch/i386-avx.exp (additional_flags): Also set when + building with clang. + * gdb.arch/i386-sse.exp (additional_flags): Likewise. + 2020-05-29 Gary Benson * gdb.cp/koenig.exp (prepare_for_testing): Add diff --git a/gdb/testsuite/gdb.arch/i386-avx.exp b/gdb/testsuite/gdb.arch/i386-avx.exp index c52586d2e8a..ad7bf02e5ca 100644 --- a/gdb/testsuite/gdb.arch/i386-avx.exp +++ b/gdb/testsuite/gdb.arch/i386-avx.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } set additional_flags "" -if [test_compiler_info gcc*] { +if { [test_compiler_info gcc*] || [test_compiler_info clang*] } { set additional_flags "additional_flags=-mavx -I${srcdir}/.." } diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp index 1fd7cab2a4d..75cbfa531a7 100644 --- a/gdb/testsuite/gdb.arch/i386-sse.exp +++ b/gdb/testsuite/gdb.arch/i386-sse.exp @@ -31,7 +31,7 @@ if [get_compiler_info] { } set additional_flags "" -if [test_compiler_info gcc*] { +if { [test_compiler_info gcc*] || [test_compiler_info clang*] } { set additional_flags "additional_flags=-msse -I${srcdir}/.." } -- 2.39.2