From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- cpukit/score/cpu/unix/rtems/score/cpu.h | 13 ++++++++++++- cpukit/score/cpu/unix/rtems/score/unix.h | 16 ++++++++++++---- 2 files changed, 24 insertions(+), 5 deletions(-) (limited to 'cpukit/score/cpu/unix/rtems') diff --git a/cpukit/score/cpu/unix/rtems/score/cpu.h b/cpukit/score/cpu/unix/rtems/score/cpu.h index 75eb07af74..698d900515 100644 --- a/cpukit/score/cpu/unix/rtems/score/cpu.h +++ b/cpukit/score/cpu/unix/rtems/score/cpu.h @@ -378,7 +378,7 @@ extern "C" { #endif /* - * For Linux 1.1 + * For i386 targets */ #ifdef RTEMS_UNIXLIB @@ -389,7 +389,18 @@ extern "C" { #define ESP_OFF 3 #define ESI_OFF 4 #define EDI_OFF 5 +#elif defined(__CYGWIN__) +#define EAX_OFF 0 +#define EBX_OFF 1 +#define ECX_OFF 2 +#define EDX_OFF 3 +#define ESI_OFF 4 +#define EDI_OFF 5 +#define EBP_OFF 6 +#define ESP_OFF 7 +#define RET_OFF 8 #else +/* Linux */ #define EBX_OFF 0 #define ESI_OFF 1 #define EDI_OFF 2 diff --git a/cpukit/score/cpu/unix/rtems/score/unix.h b/cpukit/score/cpu/unix/rtems/score/unix.h index 26ef8ca4e4..e8a0c7bdd6 100644 --- a/cpukit/score/cpu/unix/rtems/score/unix.h +++ b/cpukit/score/cpu/unix/rtems/score/unix.h @@ -29,7 +29,15 @@ extern "C" { * of the family. */ -#if defined(hpux) +#if defined(rtems_multilib) +/* + * Figure out all CPU Model Feature Flags based upon compiler + * predefines. + */ + +#define CPU_MODEL_NAME "rtems_multilib" + +#elif defined(hpux) #define CPU_MODEL_NAME "HP-UX" @@ -37,13 +45,13 @@ extern "C" { #define CPU_MODEL_NAME "Solaris" -#elif defined(__linux__) +#elif defined(__linux__) || defined(linux) #define CPU_MODEL_NAME "Linux" -#elif defined(linux) +#elif defined(__CYGWIN__) -#define CPU_MODEL_NAME "Linux" +#define CPU_MODEL_NAME "Cygwin" #elif defined(__FreeBSD__) -- cgit v1.2.3