From patchwork Thu Oct 31 18:48:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jozef Lawrynowicz X-Patchwork-Id: 1187632 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-512191-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mittosystems.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="FD3bh7G4"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=mittosystems.com header.i=@mittosystems.com header.b="P82QMt+9"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 473vVX5r20z9sPT for ; Fri, 1 Nov 2019 05:48:50 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=MXC/z6i1k/uN1X/27czRYUwu4BO4fqPdjw9jggPJWaK36wC9ORXd0 dQNxTgySq9Hk3IG8oCsxBVLtsw/Ce1f8+BEdYNKLYvCkb1mEAuDi7tEM4R2meA+A BqBOYsIUvAMS6mesojRdyTtEsUDB8SldMuobVeLmNOoxbP1XQK6Z3U= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=QTFTj5LQavDm9ZH9i8PVwVxECms=; b=FD3bh7G4i0geZSD0BoZZ HoNHSHjG86SEnveD5pY9iBADLBbmTYhDIKzs6RS5JpcpNvj6j7ccmSPk5R13O4RH YysKIJcC7OZ4DAu3gwDKC13g+dVT1XI/w0ay+1bZl/C9SdcWzWTn8jRXSejcdPbW 4spqmihrc1fEpld2xqPcYsw= Received: (qmail 75024 invoked by alias); 31 Oct 2019 18:48:43 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 75009 invoked by uid 89); 31 Oct 2019 18:48:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=jozefl, locate, 3, 4, sk:msp430_ X-HELO: mail-wm1-f50.google.com Received: from mail-wm1-f50.google.com (HELO mail-wm1-f50.google.com) (209.85.128.50) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 31 Oct 2019 18:48:37 +0000 Received: by mail-wm1-f50.google.com with SMTP id 11so7082950wmk.0 for ; Thu, 31 Oct 2019 11:48:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mittosystems.com; s=google; h=date:from:to:subject:message-id:mime-version; bh=ABxL2r1aZB+/1p65Tm7nMEKoWzX+bCPXkXZ41UjBFh0=; b=P82QMt+9nCCtHBqqsxjcmrbQln6FuwGIHx2HZ8xKENcVsfnbzXhDKawjKB7LONy/0K ZPdFvzmn//PdlPw6nPxKidl/RReEn85/CGVlZkB7aq8bzpUeUcJziZtEwElxAj361SPl zvngREy3c77TCxRf18zPyvPAGhBojluLi03x1o7WpmARJV0UBO//Jwjok3MlLlR1lQ0M tuyQyCi44u8w6MjdJOqXRwxBXE5W0Q1YrbjLe5q6r97Xcm8Gn8xW7G+qq+4lP9mU9usu AfsexoqcOgwhLWwZswj2MATeSwIl/Z+Oq4x/OvwyyAeTy+1NCNHwllj23zTIq2wvn4gy 1DAg== Received: from jozef-kubuntu ([2a01:4b00:87fd:900:2c5b:8c0e:777e:6322]) by smtp.gmail.com with ESMTPSA id l4sm4077724wml.33.2019.10.31.11.48.31 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Oct 2019 11:48:32 -0700 (PDT) Date: Thu, 31 Oct 2019 18:48:30 +0000 From: Jozef Lawrynowicz To: "gcc-patches@gcc.gnu.org" Subject: [COMMITTED][MSP430][TESTSUITE] Move devices-main.c test source file Message-ID: <20191031184830.520ceaec@jozef-kubuntu> MIME-Version: 1.0 X-IsSubscribed: yes In preparation for an upcoming patch, I've moved devices-main.c from gcc.target/msp430/devices-main.c to gcc.target/msp430/devices/devices-main.c and updated references to it in the test source files. Committed as obvious. From c2c40bdeb6d8212bfe6435154e1f31882ce36478 Mon Sep 17 00:00:00 2001 From: jozefl Date: Thu, 31 Oct 2019 17:36:53 +0000 Subject: [PATCH] 2019-10-31 Jozef Lawrynowicz * 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@277684 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/testsuite/ChangeLog | 34 +++++++++++++++++++ .../gcc.target/msp430/devices/bad-devices-1.c | 2 +- .../gcc.target/msp430/devices/bad-devices-2.c | 2 +- .../gcc.target/msp430/devices/bad-devices-3.c | 2 +- .../gcc.target/msp430/devices/bad-devices-4.c | 2 +- .../gcc.target/msp430/devices/bad-devices-5.c | 2 +- .../gcc.target/msp430/devices/bad-devices-6.c | 2 +- .../msp430/devices/csv-device-order.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_00.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_01.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_02.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_04.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_08.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_10.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_11.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_12.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_14.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_18.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_20.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_21.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_22.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_24.c | 2 +- .../gcc.target/msp430/devices/csv-msp430_28.c | 2 +- .../msp430/devices/csv-msp430fr5969.c | 2 +- .../gcc.target/msp430/devices/devices-main.c | 6 ++++ .../msp430/devices/hard-cc430f5123.c | 2 +- .../gcc.target/msp430/devices/hard-foo.c | 2 +- .../msp430/devices/hard-msp430afe253.c | 2 +- .../msp430/devices/hard-msp430cg4616.c | 2 +- .../msp430/devices/hard-msp430f4783.c | 2 +- .../msp430/devices/hard-rf430frl154h_rom.c | 2 +- 31 files changed, 69 insertions(+), 29 deletions(-) create mode 100644 gcc/testsuite/gcc.target/msp430/devices/devices-main.c diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1830b4d691f..79936089d20 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,37 @@ +2019-10-31 Jozef Lawrynowicz + + * 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 * 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 29ef85968d5..2f01d7797cb 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 32e5cebd46e..dcf37c52947 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 c982c4a7de5..9556104b69a 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 89ebe61d179..d687fd2206b 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 e33bac06b42..639608400ad 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 9dd9ed9e156..9c31811d917 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 172880321de..2bc338cd0ac 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 8d56873140e..908faf2b9df 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 154511b6fea..36d5789185f 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 4c721638903..7d16dc7b390 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 c8ed711eb1d..a58796cec86 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 0214e636644..acb9bc2e1a7 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 86f89ed51cf..807f2999ed4 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 2923238e6b8..af0437a77d0 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 ed59ac890c1..c06ba8e4681 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 fb038a0d30f..69c769530d4 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 133f984d031..cdd06680788 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 c7c94252b00..df8256480a6 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 8794f891db7..f46e4e47f32 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 47d90f4f730..ebc3c73b9bb 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 0a616307e86..ea031aa329d 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 1243f7527e3..ad002cee539 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 636460756ad..392ac99e54f 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 00000000000..20448f4f03d --- /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 15a4ae1a584..ec9e061a189 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 e13acb52c50..2c0f572d9b3 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 9edf6eb02a7..d19e09b33f2 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 493d02258f2..877a1156d74 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 af918c3e516..ae0ae0c82f1 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 ad0c33d39b3..306d1d6c091 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" -- 2.17.1