From 20c31f656a05b4f0a854b6a1dee7f605c0b0633b Mon Sep 17 00:00:00 2001 From: bernds Date: Sat, 31 May 2008 10:09:51 +0000 Subject: [PATCH] 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@136236 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 5 ++ gcc/config/bfin/bfin.h | 2 + gcc/testsuite/ChangeLog | 33 ++++++++++ gcc/testsuite/gcc.target/bfin/mcpu-bf522.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf523.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf524.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf525.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf526.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf527.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf531.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf532.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf533.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf534.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf536.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf537.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf538.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf539.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf542.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf544.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf547.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf548.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf549.c | 4 ++ gcc/testsuite/gcc.target/bfin/mcpu-bf561.c | 8 ++- gcc/testsuite/gcc.target/bfin/mcpu-default.c | 82 ++++++++++++++++++++++-- gcc/testsuite/gcc.target/bfin/workarounds-1.c | 4 ++ gcc/testsuite/gcc.target/bfin/workarounds-2.c | 8 ++- gcc/testsuite/gcc.target/bfin/workarounds-3.c | 4 ++ gcc/testsuite/gcc.target/bfin/workarounds-4.c | 4 ++ gcc/testsuite/gcc.target/bfin/workarounds-any.c | 4 ++ gcc/testsuite/gcc.target/bfin/workarounds-none.c | 4 ++ 30 files changed, 224 insertions(+), 10 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6177e80..cd4d66c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2008-05-31 Bernd Schmidt + + * config/bfin/bfin.h (TARGET_CPU_CPP_BUILTINS): Define + __WORKAROUND_RETS when appropriate. + 2008-05-31 Uros Bizjak * config/i386/i386.md (*fop__comm_mixed): Macroize from diff --git a/gcc/config/bfin/bfin.h b/gcc/config/bfin/bfin.h index 042528a..8efcb5e 100644 --- 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 6a5083a..4a3d5ca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,36 @@ +2008-05-30 Bernd Schmidt + + * 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 PR preprocessor/36320: diff --git a/gcc/testsuite/gcc.target/bfin/mcpu-bf522.c b/gcc/testsuite/gcc.target/bfin/mcpu-bf522.c index 5674cab..205e37f 100644 --- 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 09129e9..eb21e67 100644 --- 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 6a58061..7be6355 100644 --- 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 1be5366..21dc2be 100644 --- 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 bb84afe..bd1197e 100644 --- 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 50edb81..d419dd7 100644 --- 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 efacc5a..9adf99e 100644 --- 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 85cad2e..002535a 100644 --- 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 9c0478f..a7cf0c6 100644 --- 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 89c087e..cd35459 100644 --- 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 034296b..0ac9ebf 100644 --- 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 9f3d605..66a87c0 100644 --- 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 57c9be6..4baac1a 100644 --- 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 602bd3a..756c14d 100644 --- 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 9ea90c3e..f36b163 100644 --- 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 e76c7cb..d1a0045 100644 --- 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 9418fd8..cdf1995 100644 --- 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 f9ed8b3..2689eb2 100644 --- 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 68ad917..01e068a 100644 --- 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 3eb5d4b..e2eab3b 100644 --- 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 5362035..9109701 100644 --- 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 cf9a877..53ca1d7 100644 --- 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 b00a688..c639a20 100644 --- 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 d9781ba..3209f23 100644 --- 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 50cec9c..62bd382 100644 --- 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 50cec9c..62bd382 100644 --- 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 d9781ba..3209f23 100644 --- 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 -- 2.7.4