bfin.h (TARGET_CPU_CPP_BUILTINS): Define __WORKAROUND_RETS when appropriate.

gcc/
	* config/bfin/bfin.h (TARGET_CPU_CPP_BUILTINS): Define
	__WORKAROUND_RETS when appropriate.

gcc/testsuite/
	* gcc.target/bfin/mcpu-default.c: Adjust for recent changes: default
	CPU has all workarounds, and no longer explicitly sets bf532 as CPU
	type.

	* gcc.target/bfin/mcpu-bf531.c: Adjust for WORKAROUND_RETS.
	* gcc.target/bfin/mcpu-bf532.c: Likewise.
	* gcc.target/bfin/mcpu-bf533.c: Likewise.
	* gcc.target/bfin/mcpu-bf534.c: Likewise.
	* gcc.target/bfin/mcpu-bf536.c: Likewise.
	* gcc.target/bfin/mcpu-bf537.c: Likewise.
	* gcc.target/bfin/mcpu-bf548.c: Likewise.
	* gcc.target/bfin/mcpu-bf549.c: Likewise.
	* gcc.target/bfin/mcpu-bf561.c: Likewise.
	* gcc.target/bfin/mcpu-bf523.c: Likewise.
	* gcc.target/bfin/mcpu-bf524.c: Likewise.
	* gcc.target/bfin/mcpu-bf526.c: Likewise.
	* gcc.target/bfin/mcpu-bf522.c: Likewise.
	* gcc.target/bfin/mcpu-bf525.c: Likewise.
	* gcc.target/bfin/mcpu-bf527.c: Likewise.
	* gcc.target/bfin/mcpu-bf538.c: Likewise.
	* gcc.target/bfin/mcpu-bf539.c: Likewise.
	* gcc.target/bfin/mcpu-bf542.c: Likewise.
	* gcc.target/bfin/mcpu-bf544.c: Likewise.
	* gcc.target/bfin/mcpu-default.c: Likewise.
	* gcc.target/bfin/workarounds-any.c: Likewise.
	* gcc.target/bfin/workarounds-none.c: Likewise.
	* gcc.target/bfin/workarounds-1.c: Likewise.
	* gcc.target/bfin/workarounds-2.c: Likewise.
	* gcc.target/bfin/workarounds-3.c: Likewise.
	* gcc.target/bfin/workarounds-4.c: Likewise.

From-SVN: r136236

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6177e80e001fcea1bc5c54c61bcfa7c19d6564f7..cd4d66c27ac32bcd743f1013284392b70f4c253d 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-31  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+       * config/bfin/bfin.h (TARGET_CPU_CPP_BUILTINS): Define
+       __WORKAROUND_RETS when appropriate.
+
 2008-05-31  Uros Bizjak  <ubizjak@gmail.com>
 
        * config/i386/i386.md (*fop_<mode>_comm_mixed): Macroize from

diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h
index 042528a554d411e8dee52057201e8dad31a8edae..8efcb5ea189dc9e6a397073a5c7eb025e13db187 100644 (file)
--- a/gcc/config/bfin/bfin.h
+++ b/gcc/config/bfin/bfin.h
@@ -133,6 +133,8 @@ extern int target_flags;
        builtin_define ("__WORKAROUND_SPECULATIVE_LOADS");              \
       if (ENABLE_WA_SPECULATIVE_SYNCS)                                 \
        builtin_define ("__WORKAROUND_SPECULATIVE_SYNCS");              \
+      if (ENABLE_WA_RETS)                                              \
+       builtin_define ("__WORKAROUND_RETS");           \
                                                \
       if (TARGET_FDPIC)                                \
        {                                       \

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6a5083a3309578e43eb35caeb28cb4e934d4d192..4a3d5ca91074dab5d1a64cb474c3abd921bcc0be 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,36 @@
+2008-05-30  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+       * gcc.target/bfin/mcpu-default.c: Adjust for recent changes: default
+       CPU has all workarounds, and no longer explicitly sets bf532 as CPU
+       type.
+
+       * gcc.target/bfin/mcpu-bf531.c: Adjust for WORKAROUND_RETS.
+       * gcc.target/bfin/mcpu-bf532.c: Likewise.
+       * gcc.target/bfin/mcpu-bf533.c: Likewise.
+       * gcc.target/bfin/mcpu-bf534.c: Likewise.
+       * gcc.target/bfin/mcpu-bf536.c: Likewise.
+       * gcc.target/bfin/mcpu-bf537.c: Likewise.
+       * gcc.target/bfin/mcpu-bf548.c: Likewise.
+       * gcc.target/bfin/mcpu-bf549.c: Likewise.
+       * gcc.target/bfin/mcpu-bf561.c: Likewise.
+       * gcc.target/bfin/mcpu-bf523.c: Likewise.
+       * gcc.target/bfin/mcpu-bf524.c: Likewise.
+       * gcc.target/bfin/mcpu-bf526.c: Likewise.
+       * gcc.target/bfin/mcpu-bf522.c: Likewise.
+       * gcc.target/bfin/mcpu-bf525.c: Likewise.
+       * gcc.target/bfin/mcpu-bf527.c: Likewise.
+       * gcc.target/bfin/mcpu-bf538.c: Likewise.
+       * gcc.target/bfin/mcpu-bf539.c: Likewise.
+       * gcc.target/bfin/mcpu-bf542.c: Likewise.
+       * gcc.target/bfin/mcpu-bf544.c: Likewise.
+       * gcc.target/bfin/mcpu-default.c: Likewise.
+       * gcc.target/bfin/workarounds-any.c: Likewise.
+       * gcc.target/bfin/workarounds-none.c: Likewise.
+       * gcc.target/bfin/workarounds-1.c: Likewise.
+       * gcc.target/bfin/workarounds-2.c: Likewise.
+       * gcc.target/bfin/workarounds-3.c: Likewise.
+       * gcc.target/bfin/workarounds-4.c: Likewise.
+
 2008-05-30  Tom Tromey  <tromey@redhat.com>
 
        PR preprocessor/36320:

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf522.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf522.c
index 5674cab62446bf740f2651cf64f8fa9e1177e706..205e37f3651ce49b06713c9ef125b64c3d8cfa77 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf522.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf522.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf523.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf523.c
index 09129e94ed275ec0d7fc981fc914d569773d7506..eb21e6733e4989820bf2658fde0f2a673f616c92 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf523.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf523.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf524.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf524.c
index 6a58061b90e459e6ae3bf453c487f2e9ffe548f4..7be635538896d4f484f0b9193f3f974a6d633fba 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf524.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf524.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf525.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf525.c
index 1be53666945bcc7e33111fbf1c190f51c0304a3f..21dc2be96fb94001e46f29ea5888eff450905c41 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf525.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf525.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf526.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf526.c
index bb84afe4a21f984195702da4be3c9b112f1a8134..bd1197e357b931ed89065c0c788c7dd0914da200 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf526.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf526.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf527.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf527.c
index 50edb81eb3cf0f921b96767f228102f509924d44..d419dd71cfa813018c6ae218460ed14fce5829a6 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf527.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf527.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf531.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf531.c
index efacc5a0ade4cb481d394f63fa3e63db8c0ee1b3..9adf99e08e17c9491871b5421f0f4bc3c923a1e5 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf531.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf531.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf532.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf532.c
index 85cad2e87e9ab29eb039090fea96b8a8148dd5d6..002535a5a15e98d74a2e6605503f1ec263833b14 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf532.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf532.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf533.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf533.c
index 9c0478ffb9678e6ce4640ef90a24991697dd3d8a..a7cf0c6efd7ac14f283070276985e19083bd519a 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf533.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf533.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf534.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf534.c
index 89c087ec5ed2e5f044cf5ea5bec31788960df3c8..cd354596d059061d91f7c80551f1da0c6e30f844 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf534.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf534.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf536.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf536.c
index 034296b5433a468aa9298831ab9f8da5636ecb9f..0ac9ebf9a1bd18cc790e5bac86f241e3a1dfabd7 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf536.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf536.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf537.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf537.c
index 9f3d605a86f84f4d324c5f28927ea7e3f140034b..66a87c045bff278cc13f6d22a7da9129ab5ec29e 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf537.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf537.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf538.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf538.c
index 57c9be6f3087694d52c8de32f14b28bc9afff84c..4baac1a0469ead4c5b859eb104c4893413dfa711 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf538.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf538.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf539.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf539.c
index 602bd3a2d0a52fd964c804a945dd3e2be7244e36..756c14d11141ad51772885b3032ed9475ab3a534 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf539.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf539.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf542.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf542.c
index 9ea90c3e82cd1fed1239af3253c337771a4c727c..f36b16370b462ff024c55ef813dbc122a18c06d5 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf542.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf542.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf544.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf544.c
index e76c7cb94e0b68604419f1ca6e4bde124a7e8dc0..d1a0045d5035ba4bf40f8daf12debe8530772ec3 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf544.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf544.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf547.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf547.c
index 9418fd887bb5611beeffdaf036ff5d8e90e65969..cdf1995c920df1d57c7f96976d26b23c69646f52 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf547.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf547.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf548.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf548.c
index f9ed8b34e341c6298cdaa37e4c955f4ea82f75cf..2689eb2159641f4124c7de5c5ae35c36fcaf25ea 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf548.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf548.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf549.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf549.c
index 68ad91759834d489c7ae88486ce83cff038b3875..01e068a3db8b4604f00e1fab27e1aff2e2acafca 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf549.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf549.c
@@ -18,6 +18,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf561.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf561.c
index 3eb5d4b6ce40a45e91ecbab7c0d4f7f7ec2ace12..e2eab3ba32ac931c637a2cbd527801320aa79d36 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-bf561.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-bf561.c
@@ -10,8 +10,12 @@
 #error "__SILICON_REVISION__ is not 0x0005"
 #endif
 
-#ifdef __WORKAROUNDS_ENABLED
-#error "__WORKAROUNDS_ENABLED is defined"
+#ifndef __WORKAROUNDS_ENABLED
+#error "__WORKAROUNDS_ENABLED is not defined"
+#endif
+
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
 #endif
 
 #ifdef __WORKAROUND_SPECULATIVE_LOADS

diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-default.c b/gcc/testsuite/gcc.target/bfin/mcpu-default.c
index 5362035b440d995b228bc39f979b84682dd21e41..9109701cbb8ab4e26275185dd20c9e293b453d52 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/mcpu-default.c
+++ b/gcc/testsuite/gcc.target/bfin/mcpu-default.c
@@ -2,22 +2,92 @@
 /* { dg-do preprocess } */
 /* { dg-bfin-options "" } */
 
-#ifndef __ADSPBF532__
-#error "__ADSPBF532__ is not defined"
+#ifdef __ADSPBF522__
+#error "__ADSPBF522__ is defined"
 #endif
+#ifdef __ADSPBF523__
+#error "__ADSPBF523__ is defined"
+#endif
+#ifdef __ADSPBF524__
+#error "__ADSPBF524__ is defined"
+#endif
+#ifdef __ADSPBF525__
+#error "__ADSPBF525__ is defined"
+#endif
+#ifdef __ADSPBF526__
+#error "__ADSPBF526__ is defined"
+#endif
+#ifdef __ADSPBF527__
+#error "__ADSPBF527__ is defined"
+#endif
+
 
-#if __SILICON_REVISION__ != 0x0005
-#error "__SILICON_REVISION__ is not 0x0005"
+#ifdef __ADSPBF531__
+#error "__ADSPBF531__ is defined"
+#endif
+#ifdef __ADSPBF532__
+#error "__ADSPBF532__ is defined"
+#endif
+#ifdef __ADSPBF533__
+#error "__ADSPBF533__ is defined"
+#endif
+#ifdef __ADSPBF534__
+#error "__ADSPBF534__ is defined"
+#endif
+#ifdef __ADSPBF536__
+#error "__ADSPBF536__ is defined"
+#endif
+#ifdef __ADSPBF537__
+#error "__ADSPBF537__ is defined"
+#endif
+#ifdef __ADSPBF538__
+#error "__ADSPBF538__ is defined"
+#endif
+#ifdef __ADSPBF539__
+#error "__ADSPBF539__ is defined"
+#endif
+
+#ifdef __ADSPBF542__
+#error "__ADSPBF542__ is defined"
+#endif
+#ifdef __ADSPBF544__
+#error "__ADSPBF544__ is defined"
+#endif
+#ifdef __ADSPBF547__
+#error "__ADSPBF547__ is defined"
+#endif
+#ifdef __ADSPBF548__
+#error "__ADSPBF548__ is defined"
+#endif
+#ifdef __ADSPBF549__
+#error "__ADSPBF548__ is defined"
+#endif
+
+#ifdef __ADSPBF561__
+#error "__ADSPBF561__ is defined"
+#endif
+
+
+#ifndef __SILICON_REVISION__
+#error "__SILICON_REVISION__ is not defined"
+#else
+#if __SILICON_REVISION__ != 0xffff
+#error "__SILICON_REVISION__ is not 0xFFFF"
+#endif
 #endif
 
 #ifndef __WORKAROUNDS_ENABLED
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif
 
-#ifdef __WORKAROUND_SPECULATIVE_SYNCS
-#error "__WORKAROUND_SPECULATIVE_SYNCS is defined"
+#ifndef __WORKAROUND_SPECULATIVE_SYNCS
+#error "__WORKAROUND_SPECULATIVE_SYNCS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/workarounds-1.c b/gcc/testsuite/gcc.target/bfin/workarounds-1.c
index cf9a877948089e8a5ae64025072a14e7d7a649aa..53ca1d7b7e510010d6da3b46e9969c4e1cd1d8e7 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/workarounds-1.c
+++ b/gcc/testsuite/gcc.target/bfin/workarounds-1.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/workarounds-2.c b/gcc/testsuite/gcc.target/bfin/workarounds-2.c
index b00a6884cdc8234c13335babaf2887bec0a4af22..c639a204e86839076d6943b1b94e42b5306d8a9e 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/workarounds-2.c
+++ b/gcc/testsuite/gcc.target/bfin/workarounds-2.c
@@ -10,8 +10,12 @@
 #error "__SILICON_REVISION__ is not 0x0003"
 #endif
 
-#ifdef __WORKAROUNDS_ENABLED
-#error "__WORKAROUNDS_ENABLED is defined"
+#ifndef __WORKAROUNDS_ENABLED
+#error "__WORKAROUNDS_ENABLED is not defined"
+#endif
+
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
 #endif
 
 #ifdef __WORKAROUND_SPECULATIVE_LOADS

diff --git a/gcc/testsuite/gcc.target/bfin/workarounds-3.c b/gcc/testsuite/gcc.target/bfin/workarounds-3.c
index d9781bae2fde1268df1bd6fef941eac6cc6ee405..3209f2348912a1c8747a0f033a034e5a50bcb4a3 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/workarounds-3.c
+++ b/gcc/testsuite/gcc.target/bfin/workarounds-3.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is defined"
 #endif
 
+#ifdef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is defined"
+#endif
+
 #ifdef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/workarounds-4.c b/gcc/testsuite/gcc.target/bfin/workarounds-4.c
index 50cec9ca7e46632b3a2e0e9bbf52e40f5b0f2a09..62bd382b7cbc4f59c3fedbbbd07a5fa59283f633 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/workarounds-4.c
+++ b/gcc/testsuite/gcc.target/bfin/workarounds-4.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/workarounds-any.c b/gcc/testsuite/gcc.target/bfin/workarounds-any.c
index 50cec9ca7e46632b3a2e0e9bbf52e40f5b0f2a09..62bd382b7cbc4f59c3fedbbbd07a5fa59283f633 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/workarounds-any.c
+++ b/gcc/testsuite/gcc.target/bfin/workarounds-any.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is not defined"
 #endif
 
+#ifndef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is not defined"
+#endif
+
 #ifndef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is not defined"
 #endif

diff --git a/gcc/testsuite/gcc.target/bfin/workarounds-none.c b/gcc/testsuite/gcc.target/bfin/workarounds-none.c
index d9781bae2fde1268df1bd6fef941eac6cc6ee405..3209f2348912a1c8747a0f033a034e5a50bcb4a3 100644 (file)
--- a/gcc/testsuite/gcc.target/bfin/workarounds-none.c
+++ b/gcc/testsuite/gcc.target/bfin/workarounds-none.c
@@ -14,6 +14,10 @@
 #error "__WORKAROUNDS_ENABLED is defined"
 #endif
 
+#ifdef __WORKAROUND_RETS
+#error "__WORKAROUND_RETS is defined"
+#endif
+
 #ifdef __WORKAROUND_SPECULATIVE_LOADS
 #error "__WORKAROUND_SPECULATIVE_LOADS is defined"
 #endif