From 8b600ba2b47c9ae56c21f1abdfeb1eb5510d9615 Mon Sep 17 00:00:00 2001 From: Walfred Tedeschi Date: Mon, 8 Jun 2015 17:51:04 +0200 Subject: [PATCH] Fix MPX and AVX512 tests for path changes. Changes on the path for i386-cpuid.h file lead to failure in compiling tests for AVX512 and MPX. 2015-06-08 Walfred Tedeschi gdb/testsuite * gdb.arch/i386-avx512.c: Change path in include file. * gdb.arch/i386-avx512.exp: Change include dir path compilation flag. * gdb.arch/i386-mpx.c: Change path in include file. * gdb.arch/i386-mpx.exp: Change include dir path compilation flag. --- gdb/testsuite/gdb.arch/i386-avx512.c | 2 +- gdb/testsuite/gdb.arch/i386-avx512.exp | 2 +- gdb/testsuite/gdb.arch/i386-mpx.c | 2 +- gdb/testsuite/gdb.arch/i386-mpx.exp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/gdb.arch/i386-avx512.c b/gdb/testsuite/gdb.arch/i386-avx512.c index 73c4179847f..26f2fb8fbd2 100644 --- a/gdb/testsuite/gdb.arch/i386-avx512.c +++ b/gdb/testsuite/gdb.arch/i386-avx512.c @@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "nat/x86-cpuid.h" +#include "x86-cpuid.h" typedef struct { diff --git a/gdb/testsuite/gdb.arch/i386-avx512.exp b/gdb/testsuite/gdb.arch/i386-avx512.exp index 41ee9d61593..42fc4eb87ae 100644 --- a/gdb/testsuite/gdb.arch/i386-avx512.exp +++ b/gdb/testsuite/gdb.arch/i386-avx512.exp @@ -26,7 +26,7 @@ if { ![istarget i?86-*-*] && ![istarget x86_64-*-* ] } { standard_testfile -set comp_flags "-mavx512f -I${srcdir}/.." +set comp_flags "-mavx512f -I${srcdir}/../nat" if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ [list debug nowarnings additional_flags=${comp_flags}]] } { diff --git a/gdb/testsuite/gdb.arch/i386-mpx.c b/gdb/testsuite/gdb.arch/i386-mpx.c index 7c6c2cebe60..b62a2725269 100644 --- a/gdb/testsuite/gdb.arch/i386-mpx.c +++ b/gdb/testsuite/gdb.arch/i386-mpx.c @@ -18,7 +18,7 @@ along with this program. If not, see . */ #include -#include "nat/x86-cpuid.h" +#include "x86-cpuid.h" #ifndef NOINLINE #define NOINLINE __attribute__ ((noinline)) diff --git a/gdb/testsuite/gdb.arch/i386-mpx.exp b/gdb/testsuite/gdb.arch/i386-mpx.exp index f9d5d535df2..8b50aed3b2b 100644 --- a/gdb/testsuite/gdb.arch/i386-mpx.exp +++ b/gdb/testsuite/gdb.arch/i386-mpx.exp @@ -22,7 +22,7 @@ if { ![istarget i?86-*-*] && ![istarget x86_64-*-* ] } { standard_testfile -set comp_flags "-fmpx -I${srcdir}/../common" +set comp_flags "-fmpx -I${srcdir}/../nat/" if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \ [list debug nowarnings additional_flags=${comp_flags}]] } { -- 2.30.2