devices-main.c: Move to devices subdirectory.

2019-10-31  Jozef Lawrynowicz  <jozef.l@mittosystems.com>

	* gcc.target/msp430/devices-main.c: Move to devices subdirectory.
	* gcc.target/msp430/devices/bad-devices-1.c: Update #include path to
	devices-main.c.
	* gcc.target/msp430/devices/bad-devices-2.c: Likewise.
	* gcc.target/msp430/devices/bad-devices-3.c: Likewise.
	* gcc.target/msp430/devices/bad-devices-4.c: Likewise.
	* gcc.target/msp430/devices/bad-devices-5.c: Likewise.
	* gcc.target/msp430/devices/bad-devices-6.c: Likewise.
	* gcc.target/msp430/devices/csv-device-order.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_00.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_01.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_02.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_04.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_08.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_10.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_11.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_12.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_14.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_18.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_20.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_21.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_22.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_24.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430_28.c: Likewise.
	* gcc.target/msp430/devices/csv-msp430fr5969.c: Likewise.
	* gcc.target/msp430/devices/hard-cc430f5123.c: Likewise.
	* gcc.target/msp430/devices/hard-foo.c: Likewise.
	* gcc.target/msp430/devices/hard-msp430afe253.c: Likewise.
	* gcc.target/msp430/devices/hard-msp430cg4616.c: Likewise.
	* gcc.target/msp430/devices/hard-msp430f4783.c: Likewise.
	* gcc.target/msp430/devices/hard-rf430frl154h_rom.c: Likewise.

From-SVN: r277684

31 files changed, 69 insertions, 29 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1830b4d..7993608 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,37 @@
+2019-10-31  Jozef Lawrynowicz  <jozef.l@mittosystems.com>
+
+	* gcc.target/msp430/devices-main.c: Move to devices subdirectory.
+	* gcc.target/msp430/devices/bad-devices-1.c: Update #include path to
+	devices-main.c.
+	* gcc.target/msp430/devices/bad-devices-2.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-3.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-4.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-5.c: Likewise.
+	* gcc.target/msp430/devices/bad-devices-6.c: Likewise.
+	* gcc.target/msp430/devices/csv-device-order.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_00.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_01.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_02.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_04.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_08.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_10.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_11.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_12.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_14.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_18.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_20.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_21.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_22.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_24.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430_28.c: Likewise.
+	* gcc.target/msp430/devices/csv-msp430fr5969.c: Likewise.
+	* gcc.target/msp430/devices/hard-cc430f5123.c: Likewise.
+	* gcc.target/msp430/devices/hard-foo.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430afe253.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430cg4616.c: Likewise.
+	* gcc.target/msp430/devices/hard-msp430f4783.c: Likewise.
+	* gcc.target/msp430/devices/hard-rf430frl154h_rom.c: Likewise.
+
 2019-10-31  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* g++.target/aarch64/sve/vcond_1_run.C: Update test name.
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-1.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-1.c
index 29ef859..2f01d77 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-1.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-1.c
@@ -2,4 +2,4 @@
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "'CPU_TYPE' column heading is missing from 'devices.csv'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-2.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-2.c
index 32e5ceb..dcf37c5 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-2.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-2.c
@@ -2,4 +2,4 @@
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "'MPY_TYPE' column heading is missing from 'devices.csv'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-3.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-3.c
index c982c4a..9556104 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-3.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-3.c
@@ -2,4 +2,4 @@
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "'CPU_TYPE' and 'MPY_TYPE' column headings are missing from 'devices.csv'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-4.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-4.c
index 89ebe61..d687fd2 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-4.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-4.c
@@ -2,4 +2,4 @@
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "format of column headings in 'devices.csv' is incorrect" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-5.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-5.c
index e33bac0..6396084 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-5.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-5.c
@@ -2,4 +2,4 @@
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "invalid 'CPU_TYPE' value of '5' read from 'devices.csv' for 'msp430_00'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-6.c b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-6.c
index 9dd9ed9..9c31811 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/bad-devices-6.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/bad-devices-6.c
@@ -2,4 +2,4 @@
 /* { dg-additional-options "-mmcu=msp430_00 -mno-warn-mcu" } */
 /* { dg-warning "invalid 'MPY_TYPE' value of '3' read from 'devices.csv' for 'msp430_00'" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-device-order.c b/gcc/testsuite/gcc.target/msp430/devices/csv-device-order.c
index 1728803..2bc338c 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-device-order.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-device-order.c
@@ -8,4 +8,4 @@
    devices.csv, but should not be matched.
    Errors and warnings will be emitted if msp430f0123 is wrongly matched.  */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_00.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_00.c
index 8d56873..908faf2 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_00.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_00.c
@@ -4,4 +4,4 @@
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_01.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_01.c
index 154511b..36d5789 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_01.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_01.c
@@ -4,4 +4,4 @@
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_02.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_02.c
index 4c72163..7d16dc7 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_02.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_02.c
@@ -4,4 +4,4 @@
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_04.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_04.c
index c8ed711..a58796c 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_04.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_04.c
@@ -4,4 +4,4 @@
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_08.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_08.c
index 0214e63..acb9bc2 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_08.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_08.c
@@ -4,4 +4,4 @@
 /* { dg-warning "supports 430 ISA but" "" { target msp430_430x_selected } 0 } */
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_10.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_10.c
index 86f89ed..807f299 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_10.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_10.c
@@ -3,4 +3,4 @@
 /* { dg-warning "does not have hardware multiply" "" { target msp430_hwmul_not_none } 0 } */
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_11.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_11.c
index 2923238..af0437a 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_11.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_11.c
@@ -3,4 +3,4 @@
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_12.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_12.c
index ed59ac8..c06ba8e 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_12.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_12.c
@@ -3,4 +3,4 @@
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_14.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_14.c
index fb038a0..69c7695 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_14.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_14.c
@@ -3,4 +3,4 @@
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 32-bit hardware multiply" "" { target msp430_hwmul_not_32bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_18.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_18.c
index 133f984..cdd0668 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_18.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_18.c
@@ -3,4 +3,4 @@
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 32-bit .5xx. hardware multiply" "" { target msp430_hwmul_not_f5 } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_20.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_20.c
index c7c9425..df82564 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_20.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_20.c
@@ -3,4 +3,4 @@
 /* { dg-warning "does not have hardware multiply" "" { target msp430_hwmul_not_none } 0 } */
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_21.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_21.c
index 8794f89..f46e4e4 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_21.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_21.c
@@ -3,4 +3,4 @@
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_22.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_22.c
index 47d90f4..ebc3c73 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_22.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_22.c
@@ -3,4 +3,4 @@
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_24.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_24.c
index 0a61630..ea031aa 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_24.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_24.c
@@ -3,4 +3,4 @@
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 32-bit hardware multiply" "" { target msp430_hwmul_not_32bit } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_28.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_28.c
index 1243f75..ad002ce 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_28.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430_28.c
@@ -3,4 +3,4 @@
 /* { dg-warning "supports 430X ISA but '-mcpu' option is set to 430" "" { target msp430_430_selected } 0 } */
 /* { dg-warning "supports 32-bit .5xx. hardware multiply" "" { target msp430_hwmul_not_f5 } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430fr5969.c b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430fr5969.c
index 6364607..392ac99 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/csv-msp430fr5969.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/csv-msp430fr5969.c
@@ -8,4 +8,4 @@
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/devices-main.c b/gcc/testsuite/gcc.target/msp430/devices/devices-main.c
new file mode 100644
index 0000000..20448f4
--- /dev/null
+++ b/gcc/testsuite/gcc.target/msp430/devices/devices-main.c
@@ -0,0 +1,6 @@
+int
+main (void)
+{
+  while (1);
+  return 0;
+}
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-cc430f5123.c b/gcc/testsuite/gcc.target/msp430/devices/hard-cc430f5123.c
index 15a4ae1..ec9e061 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-cc430f5123.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-cc430f5123.c
@@ -4,4 +4,4 @@
 /* { dg-warning "supports 32-bit .5xx. hardware multiply" "" { target msp430_hwmul_not_f5 } 0 } */
 
 /* revision=2, hwmpy=8 */
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-foo.c b/gcc/testsuite/gcc.target/msp430/devices/hard-foo.c
index e13acb5..2c0f572 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-foo.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-foo.c
@@ -3,4 +3,4 @@
 /* { dg-warning "could not locate MCU data file 'devices.csv'" "" { target *-*-* } 0 } */
 /* { dg-warning "Unrecognized MCU name 'msp430foo'.*\n.*Use the" "" { target *-*-* } 0 } */
 
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430afe253.c b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430afe253.c
index 9edf6eb..d19e09b 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430afe253.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430afe253.c
@@ -5,4 +5,4 @@
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
 /* revision=0, hwmpy=2  */
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430cg4616.c b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430cg4616.c
index 493d022..877a115 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430cg4616.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430cg4616.c
@@ -4,4 +4,4 @@
 /* { dg-warning "supports 16-bit hardware multiply" "" { target msp430_hwmul_not_16bit } 0 } */
 
 /* revision=1, hwmpy=1 */
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430f4783.c b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430f4783.c
index af918c3..ae0ae0c 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-msp430f4783.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-msp430f4783.c
@@ -5,4 +5,4 @@
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
 /* revision=0, hwmpy=4  */
-#include "../devices-main.c"
+#include "devices-main.c"
diff --git a/gcc/testsuite/gcc.target/msp430/devices/hard-rf430frl154h_rom.c b/gcc/testsuite/gcc.target/msp430/devices/hard-rf430frl154h_rom.c
index ad0c33d..306d1d6 100644
--- a/gcc/testsuite/gcc.target/msp430/devices/hard-rf430frl154h_rom.c
+++ b/gcc/testsuite/gcc.target/msp430/devices/hard-rf430frl154h_rom.c
@@ -5,4 +5,4 @@
 /* { dg-error "'-mlarge' requires a 430X-compatible '-mmcu='" "" { target msp430_mlarge_selected } 0 } */
 
 /* revision=0, hwmpy=0  */
-#include "../devices-main.c"
+#include "devices-main.c"