diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 25ae3205657..b03a70f2023 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-06-14  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+	* gcc.dg/optimize-bswap-1.c: Split into these two:
+	* gcc.dg/optimize-bswapsi-1.c: New testcase.
+	* gcc.dg/optimize-bswapdi-1.c: New testcase.
+
 2009-06-14  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
 
 	* gcc.dg/optimize-bswap-1.c: New testcase.
diff --git a/gcc/testsuite/gcc.dg/optimize-bswap-1.c b/gcc/testsuite/gcc.dg/optimize-bswapdi-1.c
similarity index 58%
rename from gcc/testsuite/gcc.dg/optimize-bswap-1.c
rename to gcc/testsuite/gcc.dg/optimize-bswapdi-1.c
index a603f6d9193..45fb2af2b30 100644
--- a/gcc/testsuite/gcc.dg/optimize-bswap-1.c
+++ b/gcc/testsuite/gcc.dg/optimize-bswapdi-1.c
@@ -1,15 +1,9 @@
-/* { dg-do compile } */
+/* { dg-do compile { target alpha*-*-* ia64*-*-* x86_64-*-* s390x-*-* } } */
 /* { dg-require-effective-target stdint_types } */
+/* { dg-require-effective-target lp64 } */
 /* { dg-options "-O2 -fdump-tree-bswap" } */
 
 #include <stdint.h>
-
-#define __const_swab32(x) ((uint32_t)(				      \
-        (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) |            \
-        (((uint32_t)(x) & (uint32_t)0x0000ff00UL) <<  8) |            \
-        (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >>  8) |            \
-        (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24)))
-
 #define __const_swab64(x) ((uint64_t)(			                        \
 	(((uint64_t)(x) & (uint64_t)0x00000000000000ffULL) << 56) |             \
 	(((uint64_t)(x) & (uint64_t)0x000000000000ff00ULL) << 40) |		\
@@ -20,33 +14,15 @@
 	(((uint64_t)(x) & (uint64_t)0x00ff000000000000ULL) >> 40) |		\
 	(((uint64_t)(x) & (uint64_t)0xff00000000000000ULL) >> 56)))
 
+
 /* This byte swap implementation is used by the Linux kernel and the
    GNU C library.  */
 
-uint32_t
-swap32_a (uint32_t in)
-{
-  return __const_swab32 (in);
-}
-
 uint64_t
 swap64 (uint64_t in)
 {
   return __const_swab64 (in);
 }
 
-/* The OpenSSH byte swap implementation.  */
-uint32_t
-swap32_b (uint32_t in)
-{
-  uint32_t a;
-
-  a = (in << 16) | (in >> 16);
-  a = ((a & 0x00ff00ff) << 8) | ((a & 0xff00ff00) >> 8);
-
-  return a;
-}
-
-/* { dg-final { scan-tree-dump-times "32 bit bswap implementation found at" 2 "bswap" } } */
 /* { dg-final { scan-tree-dump-times "64 bit bswap implementation found at" 1 "bswap" } } */
 /* { dg-final { cleanup-tree-dump "bswap" } } */
diff --git a/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c b/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c
new file mode 100644
index 00000000000..fc77296d522
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/optimize-bswapsi-1.c
@@ -0,0 +1,35 @@
+/* { dg-do compile { target alpha*-*-* i?86-*-* powerpc*-*-* rs6000-*-* x86_64-*-* s390*-*-* } } */
+/* { dg-require-effective-target stdint_types } */
+/* { dg-options "-O2 -fdump-tree-bswap" } */
+
+#include <stdint.h>
+
+#define __const_swab32(x) ((uint32_t)(				      \
+        (((uint32_t)(x) & (uint32_t)0x000000ffUL) << 24) |            \
+        (((uint32_t)(x) & (uint32_t)0x0000ff00UL) <<  8) |            \
+        (((uint32_t)(x) & (uint32_t)0x00ff0000UL) >>  8) |            \
+        (((uint32_t)(x) & (uint32_t)0xff000000UL) >> 24)))
+
+/* This byte swap implementation is used by the Linux kernel and the
+   GNU C library.  */
+
+uint32_t
+swap32_a (uint32_t in)
+{
+  return __const_swab32 (in);
+}
+
+/* The OpenSSH byte swap implementation.  */
+uint32_t
+swap32_b (uint32_t in)
+{
+  uint32_t a;
+
+  a = (in << 16) | (in >> 16);
+  a = ((a & 0x00ff00ff) << 8) | ((a & 0xff00ff00) >> 8);
+
+  return a;
+}
+
+/* { dg-final { scan-tree-dump-times "32 bit bswap implementation found at" 2 "bswap" } } */
+/* { dg-final { cleanup-tree-dump "bswap" } } */