diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0af10d8f7e4..e1230bccc88 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,30 @@
+2007-08-23  Uros Bizjak  <ubizjak@gmail.com>
+
+	* gcc.dg/arm-eabi1.c, gcc.dg/symbian1.c, cc.dg/symbian2.c,
+	gcc.dg/symbian3.c, gcc.dg/symbian4.c, gcc.dg/symbian5.c,
+	gcc.dg/20051215-1.c: Move to gcc.target/arm directory.
+	* gcc.dg/const-compare.c, gcc.dg/non-lazy-ptr-test.c,
+	gcc.dg/unsigned-long-compare.c, gcc.dg/rs6000-leaf.c: Move to
+	gcc.target/powerpc directory.
+	* gcc.dg/m68k-pic-1.c, gcc.dg/m68k-slp-ice.c: Move to
+	gcc.target/m68k directory.
+	* gcc.dg/i386-darwin-fpmath.c: Move to gcc.target/i386 directory.
+	* gcc.dg/cris-peep2-andu1.c, gcc.dg/cris-peep2-andu2.c,
+	gcc.dg/cris-peep2-xsrand.c, gcc.dg/cris-peep2-xsrand2.c: Move to
+	gcc.target/cris directory.
+	* gcc.dg/20020620-1.c: Move to gcc.target/mips directory.
+	* gcc.dg/bfin-longcall-1.c, gcc.dg/bfin-longcall-2.c: Move to
+	gcc.target/bfin directory.
+
+	* gcc.target/sh: New directory.
+	* gcc.target/sh/sh.exp: New file.
+	* gcc.dg/pr21255-1.c, gcc.dg/pr21255-2-mb.c, gcc.dg/pr21255-2-ml.c,
+	gcc.dg/pr21255-3.c, gcc.dg/pr21255-4.c, gcc.dg/sh4a-bitmovua.c,
+	gcc.dg/sh4a-cos.c, gcc.dg/sh4a-cosf.c, gcc.dg/sh4a-fprun.c,
+	gcc.dg/sh4a-fsrra.c, gcc.dg/sh4a-memmovua.c, gcc.dg/sh4a-sin.c,
+	gcc.dg/sh4a-sincosf.c, gcc.dg/sh4a-sinf.c gcc.dg/sh-relax.c,
+	gcc.dg/sh-relax-vxworks.c: Move to gcc.target/sh directory.
+	
 2007-08-23  Uros Bizjak  <ubizjak@gmail.com>
 
 	* gcc.target/i386/pow-1.c: Fix scan-assembler-not.
diff --git a/gcc/testsuite/gcc.dg/20051215-1.c b/gcc/testsuite/gcc.target/arm/20051215-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/20051215-1.c
rename to gcc/testsuite/gcc.target/arm/20051215-1.c
diff --git a/gcc/testsuite/gcc.dg/arm-eabi1.c b/gcc/testsuite/gcc.target/arm/eabi1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/arm-eabi1.c
rename to gcc/testsuite/gcc.target/arm/eabi1.c
diff --git a/gcc/testsuite/gcc.dg/symbian1.c b/gcc/testsuite/gcc.target/arm/symbian1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/symbian1.c
rename to gcc/testsuite/gcc.target/arm/symbian1.c
diff --git a/gcc/testsuite/gcc.dg/symbian2.c b/gcc/testsuite/gcc.target/arm/symbian2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/symbian2.c
rename to gcc/testsuite/gcc.target/arm/symbian2.c
diff --git a/gcc/testsuite/gcc.dg/symbian3.c b/gcc/testsuite/gcc.target/arm/symbian3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/symbian3.c
rename to gcc/testsuite/gcc.target/arm/symbian3.c
diff --git a/gcc/testsuite/gcc.dg/symbian4.c b/gcc/testsuite/gcc.target/arm/symbian4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/symbian4.c
rename to gcc/testsuite/gcc.target/arm/symbian4.c
diff --git a/gcc/testsuite/gcc.dg/symbian5.c b/gcc/testsuite/gcc.target/arm/symbian5.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/symbian5.c
rename to gcc/testsuite/gcc.target/arm/symbian5.c
diff --git a/gcc/testsuite/gcc.dg/bfin-longcall-1.c b/gcc/testsuite/gcc.target/bfin/longcall-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/bfin-longcall-1.c
rename to gcc/testsuite/gcc.target/bfin/longcall-1.c
diff --git a/gcc/testsuite/gcc.dg/bfin-longcall-2.c b/gcc/testsuite/gcc.target/bfin/longcall-2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/bfin-longcall-2.c
rename to gcc/testsuite/gcc.target/bfin/longcall-2.c
diff --git a/gcc/testsuite/gcc.dg/20011127-1.c b/gcc/testsuite/gcc.target/cris/20011127-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/20011127-1.c
rename to gcc/testsuite/gcc.target/cris/20011127-1.c
diff --git a/gcc/testsuite/gcc.dg/asmreg-1.c b/gcc/testsuite/gcc.target/cris/asmreg-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/asmreg-1.c
rename to gcc/testsuite/gcc.target/cris/asmreg-1.c
diff --git a/gcc/testsuite/gcc.dg/cris-peep2-andu1.c b/gcc/testsuite/gcc.target/cris/peep2-andu1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cris-peep2-andu1.c
rename to gcc/testsuite/gcc.target/cris/peep2-andu1.c
diff --git a/gcc/testsuite/gcc.dg/cris-peep2-andu2.c b/gcc/testsuite/gcc.target/cris/peep2-andu2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cris-peep2-andu2.c
rename to gcc/testsuite/gcc.target/cris/peep2-andu2.c
diff --git a/gcc/testsuite/gcc.dg/cris-peep2-xsrand.c b/gcc/testsuite/gcc.target/cris/peep2-xsrand.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cris-peep2-xsrand.c
rename to gcc/testsuite/gcc.target/cris/peep2-xsrand.c
diff --git a/gcc/testsuite/gcc.dg/cris-peep2-xsrand2.c b/gcc/testsuite/gcc.target/cris/peep2-xsrand2.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/cris-peep2-xsrand2.c
rename to gcc/testsuite/gcc.target/cris/peep2-xsrand2.c
diff --git a/gcc/testsuite/gcc.dg/i386-darwin-fpmath.c b/gcc/testsuite/gcc.target/i386/darwin-fpmath.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/i386-darwin-fpmath.c
rename to gcc/testsuite/gcc.target/i386/darwin-fpmath.c
diff --git a/gcc/testsuite/gcc.dg/m68k-pic-1.c b/gcc/testsuite/gcc.target/m68k/pic-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/m68k-pic-1.c
rename to gcc/testsuite/gcc.target/m68k/pic-1.c
diff --git a/gcc/testsuite/gcc.dg/m68k-slp-ice.c b/gcc/testsuite/gcc.target/m68k/slp-ice.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/m68k-slp-ice.c
rename to gcc/testsuite/gcc.target/m68k/slp-ice.c
diff --git a/gcc/testsuite/gcc.dg/20020620-1.c b/gcc/testsuite/gcc.target/mips/20020620-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/20020620-1.c
rename to gcc/testsuite/gcc.target/mips/20020620-1.c
diff --git a/gcc/testsuite/gcc.dg/const-compare.c b/gcc/testsuite/gcc.target/powerpc/const-compare.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/const-compare.c
rename to gcc/testsuite/gcc.target/powerpc/const-compare.c
diff --git a/gcc/testsuite/gcc.dg/rs6000-leaf.c b/gcc/testsuite/gcc.target/powerpc/leaf.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/rs6000-leaf.c
rename to gcc/testsuite/gcc.target/powerpc/leaf.c
diff --git a/gcc/testsuite/gcc.dg/non-lazy-ptr-test.c b/gcc/testsuite/gcc.target/powerpc/non-lazy-ptr-test.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/non-lazy-ptr-test.c
rename to gcc/testsuite/gcc.target/powerpc/non-lazy-ptr-test.c
diff --git a/gcc/testsuite/gcc.dg/unsigned-long-compare.c b/gcc/testsuite/gcc.target/powerpc/unsigned-long-compare.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/unsigned-long-compare.c
rename to gcc/testsuite/gcc.target/powerpc/unsigned-long-compare.c
diff --git a/gcc/testsuite/gcc.dg/pr21255-1.c b/gcc/testsuite/gcc.target/sh/pr21255-1.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/pr21255-1.c
rename to gcc/testsuite/gcc.target/sh/pr21255-1.c
diff --git a/gcc/testsuite/gcc.dg/pr21255-2-mb.c b/gcc/testsuite/gcc.target/sh/pr21255-2-mb.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/pr21255-2-mb.c
rename to gcc/testsuite/gcc.target/sh/pr21255-2-mb.c
diff --git a/gcc/testsuite/gcc.dg/pr21255-2-ml.c b/gcc/testsuite/gcc.target/sh/pr21255-2-ml.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/pr21255-2-ml.c
rename to gcc/testsuite/gcc.target/sh/pr21255-2-ml.c
diff --git a/gcc/testsuite/gcc.dg/pr21255-3.c b/gcc/testsuite/gcc.target/sh/pr21255-3.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/pr21255-3.c
rename to gcc/testsuite/gcc.target/sh/pr21255-3.c
diff --git a/gcc/testsuite/gcc.dg/pr21255-4.c b/gcc/testsuite/gcc.target/sh/pr21255-4.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/pr21255-4.c
rename to gcc/testsuite/gcc.target/sh/pr21255-4.c
diff --git a/gcc/testsuite/gcc.dg/sh-relax-vxworks.c b/gcc/testsuite/gcc.target/sh/sh-relax-vxworks.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh-relax-vxworks.c
rename to gcc/testsuite/gcc.target/sh/sh-relax-vxworks.c
diff --git a/gcc/testsuite/gcc.dg/sh-relax.c b/gcc/testsuite/gcc.target/sh/sh-relax.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh-relax.c
rename to gcc/testsuite/gcc.target/sh/sh-relax.c
diff --git a/gcc/testsuite/gcc.target/sh/sh.exp b/gcc/testsuite/gcc.target/sh/sh.exp
new file mode 100644
index 00000000000..9389d4455b2
--- /dev/null
+++ b/gcc/testsuite/gcc.target/sh/sh.exp
@@ -0,0 +1,41 @@
+# Copyright (C) 2007 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GCC; see the file COPYING3.  If not see
+# <http://www.gnu.org/licenses/>.
+
+# GCC testsuite that uses the `dg.exp' driver.
+
+# Exit immediately if this isn't a sh target.
+if ![istarget sh*-*-*] then {
+  return
+}
+
+# Load support procs.
+load_lib gcc-dg.exp
+
+# If a testcase doesn't have special options, use these.
+global DEFAULT_CFLAGS
+if ![info exists DEFAULT_CFLAGS] then {
+    set DEFAULT_CFLAGS " -ansi -pedantic-errors"
+}
+
+# Initialize `dg'.
+dg-init
+
+# Main loop.
+dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.\[cS\]]] \
+	"" $DEFAULT_CFLAGS
+
+# All done.
+dg-finish
diff --git a/gcc/testsuite/gcc.dg/sh4a-bitmovua.c b/gcc/testsuite/gcc.target/sh/sh4a-bitmovua.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-bitmovua.c
rename to gcc/testsuite/gcc.target/sh/sh4a-bitmovua.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-cos.c b/gcc/testsuite/gcc.target/sh/sh4a-cos.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-cos.c
rename to gcc/testsuite/gcc.target/sh/sh4a-cos.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-cosf.c b/gcc/testsuite/gcc.target/sh/sh4a-cosf.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-cosf.c
rename to gcc/testsuite/gcc.target/sh/sh4a-cosf.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-fprun.c b/gcc/testsuite/gcc.target/sh/sh4a-fprun.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-fprun.c
rename to gcc/testsuite/gcc.target/sh/sh4a-fprun.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-fsrra.c b/gcc/testsuite/gcc.target/sh/sh4a-fsrra.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-fsrra.c
rename to gcc/testsuite/gcc.target/sh/sh4a-fsrra.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-memmovua.c b/gcc/testsuite/gcc.target/sh/sh4a-memmovua.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-memmovua.c
rename to gcc/testsuite/gcc.target/sh/sh4a-memmovua.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-sin.c b/gcc/testsuite/gcc.target/sh/sh4a-sin.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-sin.c
rename to gcc/testsuite/gcc.target/sh/sh4a-sin.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-sincos.c b/gcc/testsuite/gcc.target/sh/sh4a-sincos.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-sincos.c
rename to gcc/testsuite/gcc.target/sh/sh4a-sincos.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-sincosf.c b/gcc/testsuite/gcc.target/sh/sh4a-sincosf.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-sincosf.c
rename to gcc/testsuite/gcc.target/sh/sh4a-sincosf.c
diff --git a/gcc/testsuite/gcc.dg/sh4a-sinf.c b/gcc/testsuite/gcc.target/sh/sh4a-sinf.c
similarity index 100%
rename from gcc/testsuite/gcc.dg/sh4a-sinf.c
rename to gcc/testsuite/gcc.target/sh/sh4a-sinf.c