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

gcc/testsuite/ChangeLog

+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.

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

gcc/testsuite/gcc.target/msp430/devices/devices-main.c

+int
+main (void)
+{
+  while (1);
+  return 0;
+}

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"

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"

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"

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"

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"

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"