diff options
| author | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-04 15:56:49 +0000 |
|---|---|---|
| committer | nathan <nathan@138bc75d-0d04-0410-961f-82ee72b054a4> | 2006-08-04 15:56:49 +0000 |
| commit | ec252fdec70f09ee7e08555e84f66f86559fce49 (patch) | |
| tree | 48a398256c7916b5475f4ac2dbab63aafbfebd10 | |
| parent | 031fa9e2f2ef055fd8fc218175ee13f19e727154 (diff) | |
gcc/
* config/m68k/m68k.h (TARGET_CPU_CPP_BUILTINS): Reorder to simplify.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl/sourcerygxx-4_1@115925 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog.csl | 5 | ||||
| -rw-r--r-- | gcc/config/m68k/m68k.h | 35 |
2 files changed, 22 insertions, 18 deletions
diff --git a/ChangeLog.csl b/ChangeLog.csl index 60c4c53fbbf..14808209ec2 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,8 @@ +2006-08-04 Nathan Sidwell <nathan@codesourcery.com> + + gcc/ + * config/m68k/m68k.h (TARGET_CPU_CPP_BUILTINS): Reorder to simplify. + 2006-07-27 Carlos O'Donell <carlos@codesourcery.com> gcc/ diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h index 2cac63642e6..d6434e61454 100644 --- a/gcc/config/m68k/m68k.h +++ b/gcc/config/m68k/m68k.h @@ -112,23 +112,12 @@ Boston, MA 02110-1301, USA. */ { \ cpp_define (pfile, "__mcoldfire__"); \ \ - if (!m68k_arch_isaaplus && !m68k_arch_isab && !m68k_arch_isac) \ - { \ - /* ISA_A: legacy define. */ \ - cpp_define (pfile, "__mcf5200__"); \ - cpp_define (pfile, "__mcfisaa__"); \ - } \ - else if (m68k_arch_isaaplus) \ - { \ - /* ISA_A+: legacy define. */ \ - cpp_define (pfile, "__mcf528x__"); \ - cpp_define (pfile, "__mcf5200__"); \ - cpp_define (pfile, "__mcfisaaplus__"); \ - } \ + if (m68k_arch_isac) \ + cpp_define (pfile, "__mcfisac__"); \ else if (m68k_arch_isab) \ { \ - /* ISA_B: 5307, 5407 handled specially. __mcfisaX__ or \ - __mcfvX__ should be used in new code. */ \ + cpp_define (pfile, "__mcfisab__"); \ + /* ISA_B: Legacy 5307, 5407 defines. */ \ switch (m68k_cpu) \ { \ case mcf5307: \ @@ -144,10 +133,20 @@ Boston, MA 02110-1301, USA. */ default: \ ; \ } \ - cpp_define (pfile, "__mcfisab__"); \ } \ - else if (m68k_arch_isac) \ - cpp_define (pfile, "__mcfisac__"); \ + else if (m68k_arch_isaaplus) \ + { \ + cpp_define (pfile, "__mcfisaaplus__"); \ + /* ISA_A+: legacy defines. */ \ + cpp_define (pfile, "__mcf528x__"); \ + cpp_define (pfile, "__mcf5200__"); \ + } \ + else \ + { \ + cpp_define (pfile, "__mcfisaa__"); \ + /* ISA_A: legacy define. */ \ + cpp_define (pfile, "__mcf5200__"); \ + } \ \ /* Handle options to allow selecting different user code for \ tuning purposes. */ \ |