From 95990b57ea054a97a3491f1c76748c288841ba69 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 25 Aug 2000 17:30:13 +0000 Subject: 2000-08-17 Ralf Corsepius * rtems/score/i386.h: cpu-variant define handling Rewrite due to introduction of multilib defines. * asm.h: include cpuopts.h instead of targopts.h --- c/src/exec/score/cpu/i386/rtems/score/i386.h | 60 ++++++++++++++-------------- 1 file changed, 29 insertions(+), 31 deletions(-) (limited to 'c/src/exec/score/cpu/i386/rtems/score') diff --git a/c/src/exec/score/cpu/i386/rtems/score/i386.h b/c/src/exec/score/cpu/i386/rtems/score/i386.h index bc486da473..7b4c486e7d 100644 --- a/c/src/exec/score/cpu/i386/rtems/score/i386.h +++ b/c/src/exec/score/cpu/i386/rtems/score/i386.h @@ -46,48 +46,46 @@ extern "C" { * */ -#if defined(rtems_multilib) -/* - * Figure out all CPU Model Feature Flags based upon compiler - * predefines. - */ - -#define CPU_MODEL_NAME "rtems_multilib" -#define I386_HAS_FPU 0 -#define I386_HAS_BSWAP 0 - -#elif defined(i386_fp) - -#define CPU_MODEL_NAME "i386 with i387" -#define I386_HAS_BSWAP 0 - -#elif defined(i386_nofp) +#if defined(_SOFT_FLOAT) +#define I386_HAS_FPU 0 +#else +#define I386_HAS_FPU 1 +#endif -#define CPU_MODEL_NAME "i386 w/o i387" -#define I386_HAS_FPU 0 -#define I386_HAS_BSWAP 0 +#if defined(__pentiumpro__) -#elif defined(i486dx) +#define CPU_MODEL_NAME "Pentium Pro" -#define CPU_MODEL_NAME "i486dx" +#elif defined(__i586__) -#elif defined(i486sx) +# if defined(__pentium__) +# define CPU_MODEL_NAME "Pentium" +# elsif defined(__k6__) +# define CPU_MODEL_NAME "K6" +# else +# define CPU_MODEL_NAME "i586" +# endif -#define CPU_MODEL_NAME "i486sx" -#define I386_HAS_FPU 0 +#elif defined(__i486__) -#elif defined(pentium) +# if !defined(_SOFT_FLOAT) +# define CPU_MODEL_NAME "i486dx" +# else +# define CPU_MODEL_NAME "i486sx" +# endif -#define CPU_MODEL_NAME "Pentium" +#elif defined(__i386__) -#elif defined(pentiumpro) +#define I386_HAS_BSWAP 0 -#define CPU_MODEL_NAME "Pentium Pro" +# if !defined(_SOFT_FLOAT) +# define CPU_MODEL_NAME "i386 with i387" +# else +# define CPU_MODEL_NAME "i386 w/o i387" +# endif #else - -#error "Unsupported CPU Model" - +#error "Unknown CPU Model" #endif /* -- cgit v1.2.3