Changeset 95990b57 in rtems


Ignore:
Timestamp:
08/25/00 17:30:13 (23 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
8ca1e808
Parents:
dd53e2e
Message:

2000-08-17 Ralf Corsepius <corsepiu@…>

  • rtems/score/i386.h: cpu-variant define handling Rewrite due to introduction of multilib defines.
  • asm.h: include cpuopts.h instead of targopts.h
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • c/src/exec/score/cpu/i386/ChangeLog

    rdd53e2e r95990b57  
     12000-08-17      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * rtems/score/i386.h: cpu-variant define handling
     4          Rewrite due to introduction of multilib defines.
     5        * asm.h: include cpuopts.h instead of targopts.h
     6
    172000-08-10      Joel Sherrill <joel@OARcorp.com>
    28

  • c/src/exec/score/cpu/i386/asm.h

    rdd53e2e r95990b57  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/i386.h>
    3838

  • c/src/exec/score/cpu/i386/rtems/score/i386.h

    rdd53e2e r95990b57  
    4747 */
    4848
    49 #if defined(rtems_multilib)
    50 /*
    51  *  Figure out all CPU Model Feature Flags based upon compiler
    52  *  predefines.
    53  */
    54 
    55 #define CPU_MODEL_NAME  "rtems_multilib"
    56 #define I386_HAS_FPU   0
    57 #define I386_HAS_BSWAP 0
    58 
    59 #elif defined(i386_fp)
    60 
    61 #define CPU_MODEL_NAME  "i386 with i387"
    62 #define I386_HAS_BSWAP 0
    63 
    64 #elif defined(i386_nofp)
    65 
    66 #define CPU_MODEL_NAME  "i386 w/o i387"
    67 #define I386_HAS_FPU   0
    68 #define I386_HAS_BSWAP 0
    69 
    70 #elif defined(i486dx)
    71 
    72 #define CPU_MODEL_NAME  "i486dx"
    73 
    74 #elif defined(i486sx)
    75 
    76 #define CPU_MODEL_NAME  "i486sx"
     49#if defined(_SOFT_FLOAT)
    7750#define I386_HAS_FPU 0
    78 
    79 #elif defined(pentium)
    80 
    81 #define CPU_MODEL_NAME  "Pentium"
    82 
    83 #elif defined(pentiumpro)
     51#else
     52#define I386_HAS_FPU 1
     53#endif
     54
     55#if defined(__pentiumpro__)
    8456
    8557#define CPU_MODEL_NAME  "Pentium Pro"
    8658
     59#elif defined(__i586__)
     60
     61# if defined(__pentium__)
     62# define CPU_MODEL_NAME  "Pentium"
     63# elsif defined(__k6__)
     64# define CPU_MODEL_NAME "K6"
     65# else
     66# define CPU_MODEL_NAME "i586"
     67# endif
     68
     69#elif defined(__i486__)
     70
     71# if !defined(_SOFT_FLOAT)
     72# define CPU_MODEL_NAME  "i486dx"
     73# else
     74# define CPU_MODEL_NAME  "i486sx"
     75# endif
     76
     77#elif defined(__i386__)
     78
     79#define I386_HAS_BSWAP  0
     80
     81# if !defined(_SOFT_FLOAT)
     82# define CPU_MODEL_NAME "i386 with i387"
     83# else
     84# define CPU_MODEL_NAME "i386 w/o i387"
     85# endif
     86
    8787#else
    88 
    89 #error "Unsupported CPU Model"
    90 
     88#error "Unknown CPU Model"
    9189#endif
    9290

  • cpukit/score/cpu/i386/ChangeLog

    rdd53e2e r95990b57  
     12000-08-17      Ralf Corsepius <corsepiu@faw.uni-ulm.de>
     2
     3        * rtems/score/i386.h: cpu-variant define handling
     4          Rewrite due to introduction of multilib defines.
     5        * asm.h: include cpuopts.h instead of targopts.h
     6
    172000-08-10      Joel Sherrill <joel@OARcorp.com>
    28

  • cpukit/score/cpu/i386/asm.h

    rdd53e2e r95990b57  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/i386.h>
    3838

  • cpukit/score/cpu/i386/rtems/asm.h

    rdd53e2e r95990b57  
    3434#define ASM
    3535#endif
    36 #include <rtems/score/targopts.h>
     36#include <rtems/score/cpuopts.h>
    3737#include <rtems/score/i386.h>
    3838

  • cpukit/score/cpu/i386/rtems/score/i386.h

    rdd53e2e r95990b57  
    4747 */
    4848
    49 #if defined(rtems_multilib)
    50 /*
    51  *  Figure out all CPU Model Feature Flags based upon compiler
    52  *  predefines.
    53  */
    54 
    55 #define CPU_MODEL_NAME  "rtems_multilib"
    56 #define I386_HAS_FPU   0
    57 #define I386_HAS_BSWAP 0
    58 
    59 #elif defined(i386_fp)
    60 
    61 #define CPU_MODEL_NAME  "i386 with i387"
    62 #define I386_HAS_BSWAP 0
    63 
    64 #elif defined(i386_nofp)
    65 
    66 #define CPU_MODEL_NAME  "i386 w/o i387"
    67 #define I386_HAS_FPU   0
    68 #define I386_HAS_BSWAP 0
    69 
    70 #elif defined(i486dx)
    71 
    72 #define CPU_MODEL_NAME  "i486dx"
    73 
    74 #elif defined(i486sx)
    75 
    76 #define CPU_MODEL_NAME  "i486sx"
     49#if defined(_SOFT_FLOAT)
    7750#define I386_HAS_FPU 0
    78 
    79 #elif defined(pentium)
    80 
    81 #define CPU_MODEL_NAME  "Pentium"
    82 
    83 #elif defined(pentiumpro)
     51#else
     52#define I386_HAS_FPU 1
     53#endif
     54
     55#if defined(__pentiumpro__)
    8456
    8557#define CPU_MODEL_NAME  "Pentium Pro"
    8658
     59#elif defined(__i586__)
     60
     61# if defined(__pentium__)
     62# define CPU_MODEL_NAME  "Pentium"
     63# elsif defined(__k6__)
     64# define CPU_MODEL_NAME "K6"
     65# else
     66# define CPU_MODEL_NAME "i586"
     67# endif
     68
     69#elif defined(__i486__)
     70
     71# if !defined(_SOFT_FLOAT)
     72# define CPU_MODEL_NAME  "i486dx"
     73# else
     74# define CPU_MODEL_NAME  "i486sx"
     75# endif
     76
     77#elif defined(__i386__)
     78
     79#define I386_HAS_BSWAP  0
     80
     81# if !defined(_SOFT_FLOAT)
     82# define CPU_MODEL_NAME "i386 with i387"
     83# else
     84# define CPU_MODEL_NAME "i386 w/o i387"
     85# endif
     86
    8787#else
    88 
    89 #error "Unsupported CPU Model"
    90 
     88#error "Unknown CPU Model"
    9189#endif
    9290
Note: See TracChangeset for help on using the changeset viewer.