2000-08-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* 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/ChangeLog

@@ -1,3 +1,9 @@
+2000-08-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* rtems/score/i386.h: cpu-variant define handling
+	  Rewrite due to introduction of multilib defines.
+	* asm.h: include cpuopts.h instead of targopts.h
+
 2000-08-10	Joel Sherrill <joel@OARcorp.com>
 
 	* ChangeLog: New file.

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

@@ -33,7 +33,7 @@
 #ifndef ASM
 #define ASM
 #endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
 #include <rtems/score/i386.h>
 
 /*

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

@@ -46,48 +46,46 @@ extern "C" {
  *
  */
 
-#if defined(rtems_multilib)
+#if defined(_SOFT_FLOAT)
-/*
- *  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)
-
-#define CPU_MODEL_NAME  "i386 w/o i387"
-#define I386_HAS_FPU   0
-#define I386_HAS_BSWAP 0
-
-#elif defined(i486dx)
-
-#define CPU_MODEL_NAME  "i486dx"
-
-#elif defined(i486sx)
-
-#define CPU_MODEL_NAME  "i486sx"
 #define I386_HAS_FPU 0
+#else
+#define I386_HAS_FPU 1
+#endif
 
-#elif defined(pentium)
+#if defined(__pentiumpro__)
-
-#define CPU_MODEL_NAME  "Pentium"
-
-#elif defined(pentiumpro)
 
 #define CPU_MODEL_NAME  "Pentium Pro"
 
+#elif defined(__i586__)
+
+# if defined(__pentium__)
+# define CPU_MODEL_NAME  "Pentium"
+# elsif defined(__k6__)
+# define CPU_MODEL_NAME "K6"
+# else
+# define CPU_MODEL_NAME "i586"
+# endif
+
+#elif defined(__i486__)
+
+# if !defined(_SOFT_FLOAT)
+# define CPU_MODEL_NAME  "i486dx"
+# else
+# define CPU_MODEL_NAME  "i486sx"
+# endif
+
+#elif defined(__i386__)
+
+#define I386_HAS_BSWAP 	0
+
+# if !defined(_SOFT_FLOAT)
+# define CPU_MODEL_NAME	"i386 with i387"
+# else
+# define CPU_MODEL_NAME	"i386 w/o i387"
+# endif
+
 #else
-
+#error "Unknown CPU Model"
-#error "Unsupported CPU Model"
-
 #endif
 
 /*

cpukit/score/cpu/i386/ChangeLog

@@ -1,3 +1,9 @@
+2000-08-17	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* rtems/score/i386.h: cpu-variant define handling
+	  Rewrite due to introduction of multilib defines.
+	* asm.h: include cpuopts.h instead of targopts.h
+
 2000-08-10	Joel Sherrill <joel@OARcorp.com>
 
 	* ChangeLog: New file.

cpukit/score/cpu/i386/asm.h

@@ -33,7 +33,7 @@
 #ifndef ASM
 #define ASM
 #endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
 #include <rtems/score/i386.h>
 
 /*

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

@@ -33,7 +33,7 @@
 #ifndef ASM
 #define ASM
 #endif
-#include <rtems/score/targopts.h>
+#include <rtems/score/cpuopts.h>
 #include <rtems/score/i386.h>
 
 /*

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

@@ -46,48 +46,46 @@ extern "C" {
  *
  */
 
-#if defined(rtems_multilib)
+#if defined(_SOFT_FLOAT)
-/*
- *  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)
-
-#define CPU_MODEL_NAME  "i386 w/o i387"
-#define I386_HAS_FPU   0
-#define I386_HAS_BSWAP 0
-
-#elif defined(i486dx)
-
-#define CPU_MODEL_NAME  "i486dx"
-
-#elif defined(i486sx)
-
-#define CPU_MODEL_NAME  "i486sx"
 #define I386_HAS_FPU 0
+#else
+#define I386_HAS_FPU 1
+#endif
 
-#elif defined(pentium)
+#if defined(__pentiumpro__)
-
-#define CPU_MODEL_NAME  "Pentium"
-
-#elif defined(pentiumpro)
 
 #define CPU_MODEL_NAME  "Pentium Pro"
 
+#elif defined(__i586__)
+
+# if defined(__pentium__)
+# define CPU_MODEL_NAME  "Pentium"
+# elsif defined(__k6__)
+# define CPU_MODEL_NAME "K6"
+# else
+# define CPU_MODEL_NAME "i586"
+# endif
+
+#elif defined(__i486__)
+
+# if !defined(_SOFT_FLOAT)
+# define CPU_MODEL_NAME  "i486dx"
+# else
+# define CPU_MODEL_NAME  "i486sx"
+# endif
+
+#elif defined(__i386__)
+
+#define I386_HAS_BSWAP 	0
+
+# if !defined(_SOFT_FLOAT)
+# define CPU_MODEL_NAME	"i386 with i387"
+# else
+# define CPU_MODEL_NAME	"i386 w/o i387"
+# endif
+
 #else
-
+#error "Unknown CPU Model"
-#error "Unsupported CPU Model"
-
 #endif
 
 /*