Index: gcc/testsuite/gcc.target/bfin/mcpu-bf542.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf542.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf542.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF54x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0002
-#error "__SILICON_REVISION__ is not 0x0002"
+#if __SILICON_REVISION__ != 0x0004
+#error "__SILICON_REVISION__ is not 0x0004"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
Index: gcc/testsuite/gcc.target/bfin/mcpu-bf544.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf544.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf544.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF54x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0002
-#error "__SILICON_REVISION__ is not 0x0002"
+#if __SILICON_REVISION__ != 0x0004
+#error "__SILICON_REVISION__ is not 0x0004"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
Index: gcc/testsuite/gcc.target/bfin/mcpu-bf547.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf547.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf547.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF54x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0002
-#error "__SILICON_REVISION__ is not 0x0002"
+#if __SILICON_REVISION__ != 0x0004
+#error "__SILICON_REVISION__ is not 0x0004"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
Index: gcc/testsuite/gcc.target/bfin/mcpu-bf548.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf548.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf548.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF54x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0002
-#error "__SILICON_REVISION__ is not 0x0002"
+#if __SILICON_REVISION__ != 0x0004
+#error "__SILICON_REVISION__ is not 0x0004"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
Index: gcc/testsuite/gcc.target/bfin/mcpu-bf549.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf549.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf549.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF54x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0002
-#error "__SILICON_REVISION__ is not 0x0002"
+#if __SILICON_REVISION__ != 0x0004
+#error "__SILICON_REVISION__ is not 0x0004"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
Index: gcc/testsuite/gcc.target/bfin/mcpu-bf512.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf512.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf512.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF51x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0000
-#error "__SILICON_REVISION__ is not 0x0000"
+#if __SILICON_REVISION__ != 0x0002
+#error "__SILICON_REVISION__ is not 0x0002"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
@@ -29,34 +29,3 @@
 #ifdef __WORKAROUND_SPECULATIVE_SYNCS
 #error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
 #endif
-/* Test for -mcpu=.  */
-/* { dg-do preprocess } */
-/* { dg-bfin-options "-mcpu=bf512" } */
-
-#ifndef __ADSPBF512__
-#error "__ADSPBF512__ is not defined"
-#endif
-
-#ifndef __ADSPBF51x__
-#error "__ADSPBF51x__ is not defined"
-#endif
-
-#if __SILICON_REVISION__ != 0x0000
-#error "__SILICON_REVISION__ is not 0x0000"
-#endif
-
-#ifndef __WORKAROUNDS_ENABLED
-#error "__WORKAROUNDS_ENABLED is not defined"
-#endif
-
-#ifdef __WORKAROUND_RETS
-#error "__WORKAROUND_RETS is defined"
-#endif
-
-#ifndef __WORKAROUND_SPECULATIVE_LOADS
-#error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
-#endif
-
-#ifdef __WORKAROUND_SPECULATIVE_SYNCS
-#error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
-#endif
Index: gcc/testsuite/gcc.target/bfin/mcpu-bf514.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf514.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf514.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF51x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0000
-#error "__SILICON_REVISION__ is not 0x0000"
+#if __SILICON_REVISION__ != 0x0002
+#error "__SILICON_REVISION__ is not 0x0002"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
@@ -29,34 +29,3 @@
 #ifdef __WORKAROUND_SPECULATIVE_SYNCS
 #error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
 #endif
-/* Test for -mcpu=.  */
-/* { dg-do preprocess } */
-/* { dg-bfin-options "-mcpu=bf514" } */
-
-#ifndef __ADSPBF514__
-#error "__ADSPBF514__ is not defined"
-#endif
-
-#ifndef __ADSPBF51x__
-#error "__ADSPBF51x__ is not defined"
-#endif
-
-#if __SILICON_REVISION__ != 0x0000
-#error "__SILICON_REVISION__ is not 0x0000"
-#endif
-
-#ifndef __WORKAROUNDS_ENABLED
-#error "__WORKAROUNDS_ENABLED is not defined"
-#endif
-
-#ifdef __WORKAROUND_RETS
-#error "__WORKAROUND_RETS is defined"
-#endif
-
-#ifndef __WORKAROUND_SPECULATIVE_LOADS
-#error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
-#endif
-
-#ifdef __WORKAROUND_SPECULATIVE_SYNCS
-#error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
-#endif
Index: gcc/testsuite/gcc.target/bfin/mcpu-bf516.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf516.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf516.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF51x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0000
-#error "__SILICON_REVISION__ is not 0x0000"
+#if __SILICON_REVISION__ != 0x0002
+#error "__SILICON_REVISION__ is not 0x0002"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
@@ -29,34 +29,3 @@
 #ifdef __WORKAROUND_SPECULATIVE_SYNCS
 #error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
 #endif
-/* Test for -mcpu=.  */
-/* { dg-do preprocess } */
-/* { dg-bfin-options "-mcpu=bf516" } */
-
-#ifndef __ADSPBF516__
-#error "__ADSPBF516__ is not defined"
-#endif
-
-#ifndef __ADSPBF51x__
-#error "__ADSPBF51x__ is not defined"
-#endif
-
-#if __SILICON_REVISION__ != 0x0000
-#error "__SILICON_REVISION__ is not 0x0000"
-#endif
-
-#ifndef __WORKAROUNDS_ENABLED
-#error "__WORKAROUNDS_ENABLED is not defined"
-#endif
-
-#ifdef __WORKAROUND_RETS
-#error "__WORKAROUND_RETS is defined"
-#endif
-
-#ifndef __WORKAROUND_SPECULATIVE_LOADS
-#error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
-#endif
-
-#ifdef __WORKAROUND_SPECULATIVE_SYNCS
-#error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
-#endif
Index: gcc/testsuite/gcc.target/bfin/mcpu-bf518.c
===================================================================
--- gcc/testsuite/gcc.target/bfin/mcpu-bf518.c  (revision 171215)
+++ gcc/testsuite/gcc.target/bfin/mcpu-bf518.c  (working copy)
@@ -10,8 +10,8 @@
 #error "__ADSPBF51x__ is not defined"
 #endif

-#if __SILICON_REVISION__ != 0x0000
-#error "__SILICON_REVISION__ is not 0x0000"
+#if __SILICON_REVISION__ != 0x0002
+#error "__SILICON_REVISION__ is not 0x0002"
 #endif

 #ifndef __WORKAROUNDS_ENABLED
@@ -29,34 +29,3 @@
 #ifdef __WORKAROUND_SPECULATIVE_SYNCS
 #error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
 #endif
-/* Test for -mcpu=.  */
-/* { dg-do preprocess } */
-/* { dg-bfin-options "-mcpu=bf518" } */
-
-#ifndef __ADSPBF518__
-#error "__ADSPBF518__ is not defined"
-#endif
-
-#ifndef __ADSPBF51x__
-#error "__ADSPBF51x__ is not defined"
-#endif
-
-#if __SILICON_REVISION__ != 0x0000
-#error "__SILICON_REVISION__ is not 0x0000"
-#endif
-
-#ifndef __WORKAROUNDS_ENABLED
-#error "__WORKAROUNDS_ENABLED is not defined"
-#endif
-
-#ifdef __WORKAROUND_RETS
-#error "__WORKAROUND_RETS is defined"
-#endif
-
-#ifndef __WORKAROUND_SPECULATIVE_LOADS
-#error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
-#endif
-
-#ifdef __WORKAROUND_SPECULATIVE_SYNCS
-#error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
-#endif
