From 1057567ea711d80f9937653179b06507827d5819 Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@gentoo.org>
Date: Mon, 9 Nov 2015 00:13:08 -0500
Subject: [PATCH] sim: m32c: move test code to testsuite

Various target code belongs in the testsuite/ subdir, so move the m32c
code to match all the other targets.
---
 sim/m32c/ChangeLog                                 |  7 +++++++
 sim/m32c/Makefile.in                               | 18 ------------------
 sim/testsuite/sim/m32c/ChangeLog                   |  4 ++++
 sim/{m32c/blinky.S => testsuite/sim/m32c/blinky.s} |  4 ++--
 sim/{m32c/gloss.S => testsuite/sim/m32c/gloss.s}   |  4 ++--
 sim/{ => testsuite/sim}/m32c/sample.ld             |  0
 sim/{m32c/sample.S => testsuite/sim/m32c/sample.s} |  6 ++----
 sim/{ => testsuite/sim}/m32c/sample2.c             |  0
 8 files changed, 17 insertions(+), 26 deletions(-)
 create mode 100644 sim/testsuite/sim/m32c/ChangeLog
 rename sim/{m32c/blinky.S => testsuite/sim/m32c/blinky.s} (93%)
 rename sim/{m32c/gloss.S => testsuite/sim/m32c/gloss.s} (95%)
 rename sim/{ => testsuite/sim}/m32c/sample.ld (100%)
 rename sim/{m32c/sample.S => testsuite/sim/m32c/sample.s} (87%)
 rename sim/{ => testsuite/sim}/m32c/sample2.c (100%)

diff --git a/sim/m32c/ChangeLog b/sim/m32c/ChangeLog
index 582d8dd..c44e7eb 100644
--- a/sim/m32c/ChangeLog
+++ b/sim/m32c/ChangeLog
@@ -1,5 +1,12 @@
 2015-11-09  Mike Frysinger  <vapier@gentoo.org>
 
+	* Makefile.in (sample.x, sample.mot, sample2.x, sample2.o, gloss.o):
+	Delete targets.
+	* blinky.S: Moved to ../testsuite/sim/m32c/.
+	* gloss.S, sample.ld, sample.S, sample2.c: Likewise.
+
+2015-11-09  Mike Frysinger  <vapier@gentoo.org>
+
 	* Makefile.in: Delete redundant dependency info.
 
 2015-08-05  Nick Clifton  <nickc@redhat.com>
diff --git a/sim/m32c/Makefile.in b/sim/m32c/Makefile.in
index 5584563..36585a0d 100644
--- a/sim/m32c/Makefile.in
+++ b/sim/m32c/Makefile.in
@@ -40,8 +40,6 @@ SIM_OBJS = \
 	trace.o \
 	$(ENDLIST)
 
-# SIM_EXTRA_ALL = sample.x sample2.x
-
 LIBS = $B/bfd/libbfd.a $B/libiberty/libiberty.a
 
 ## COMMON_POST_CONFIG_FRAG
@@ -57,22 +55,6 @@ m32c.c : m32c.opc opc2c
 opc2c : opc2c.o safe-fgets.o
 	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $^ -o $@ $(BUILD_LIBS)
 
-sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld
-	../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o
-	../../ld/ld-new sample.o -o sample.x -T$(srcdir)/sample.ld
-
-sample.mot : sample.x
-	../../binutils/objcopy --srec-forceS3 -O srec sample.x sample.mot
-
-sample2.x : sample2.o gloss.o $(srcdir)/sample.ld
-	../../ld/ld-new sample2.o gloss.o -o sample2.x -T$(srcdir)/sample.ld
-
-sample2.o : $(srcdir)/sample2.c
-	../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample2.c -o sample2.o
-
-gloss.o : $(srcdir)/gloss.S
-	../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/gloss.S -o gloss.o
-
 encodings:
 	grep '/\* [01]' $(srcdir)/r8c.opc | sort
 
diff --git a/sim/testsuite/sim/m32c/ChangeLog b/sim/testsuite/sim/m32c/ChangeLog
new file mode 100644
index 0000000..2c28054
--- /dev/null
+++ b/sim/testsuite/sim/m32c/ChangeLog
@@ -0,0 +1,4 @@
+2015-11-09  Mike Frysinger  <vapier@gentoo.org>
+
+	* blinky.s: Moved from ../../../m32c/.
+	* gloss.s, sample.ld, sample.s, sample2.c: Likewise.
diff --git a/sim/m32c/blinky.S b/sim/testsuite/sim/m32c/blinky.s
similarity index 93%
rename from sim/m32c/blinky.S
rename to sim/testsuite/sim/m32c/blinky.s
index 42345ec..725ac7c 100644
--- a/sim/m32c/blinky.S
+++ b/sim/testsuite/sim/m32c/blinky.s
@@ -1,5 +1,5 @@
-;;; blinky.S --- sample program to blink LED's on M32C simulator
-;;; 
+;;; blinky.s --- sample program to blink LED's on M32C simulator
+;;;
 ;;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
 ;;; Contributed by Red Hat, Inc.
 ;;;
diff --git a/sim/m32c/gloss.S b/sim/testsuite/sim/m32c/gloss.s
similarity index 95%
rename from sim/m32c/gloss.S
rename to sim/testsuite/sim/m32c/gloss.s
index ccef95e..981036d 100644
--- a/sim/m32c/gloss.S
+++ b/sim/testsuite/sim/m32c/gloss.s
@@ -1,5 +1,5 @@
-;;; gloss.S --- system calls for sample2.x
-;;; 
+;;; gloss.s --- system calls for sample2.x
+;;;
 ;;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
 ;;; Contributed by Red Hat, Inc.
 ;;;
diff --git a/sim/m32c/sample.ld b/sim/testsuite/sim/m32c/sample.ld
similarity index 100%
rename from sim/m32c/sample.ld
rename to sim/testsuite/sim/m32c/sample.ld
diff --git a/sim/m32c/sample.S b/sim/testsuite/sim/m32c/sample.s
similarity index 87%
rename from sim/m32c/sample.S
rename to sim/testsuite/sim/m32c/sample.s
index 7668834..1c5f23d 100644
--- a/sim/m32c/sample.S
+++ b/sim/testsuite/sim/m32c/sample.s
@@ -1,5 +1,5 @@
-;;; sample.S --- simple test program for M32C simulator
-;;; 
+;;; sample.s --- simple test program for M32C simulator
+;;;
 ;;; Copyright (C) 2005-2015 Free Software Foundation, Inc.
 ;;; Contributed by Red Hat, Inc.
 ;;;
@@ -18,8 +18,6 @@
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;;; See the 'sample.x' and sample.mot targets in Makefile.in.
-
 	.text
 
 	.global _start
diff --git a/sim/m32c/sample2.c b/sim/testsuite/sim/m32c/sample2.c
similarity index 100%
rename from sim/m32c/sample2.c
rename to sim/testsuite/sim/m32c/sample2.c
-- 
2.7.4