From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 12 Jun 2000 15:00:15 +0000
Subject: Merged from 4.5.0-beta3a

---
 c/src/exec/score/cpu/unix/rtems/Makefile.am       |  4 ++--
 c/src/exec/score/cpu/unix/rtems/score/Makefile.am | 11 +++++------
 c/src/exec/score/cpu/unix/rtems/score/cpu.h       | 13 ++++++++++++-
 c/src/exec/score/cpu/unix/rtems/score/unix.h      | 16 ++++++++++++----
 4 files changed, 31 insertions(+), 13 deletions(-)

(limited to 'c/src/exec/score/cpu/unix/rtems')

diff --git a/c/src/exec/score/cpu/unix/rtems/Makefile.am b/c/src/exec/score/cpu/unix/rtems/Makefile.am
index 900930a502..ef7df82af7 100644
--- a/c/src/exec/score/cpu/unix/rtems/Makefile.am
+++ b/c/src/exec/score/cpu/unix/rtems/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/exec/score/cpu/unix/rtems/score/Makefile.am b/c/src/exec/score/cpu/unix/rtems/score/Makefile.am
index 06c1e6e614..52d5d046ef 100644
--- a/c/src/exec/score/cpu/unix/rtems/score/Makefile.am
+++ b/c/src/exec/score/cpu/unix/rtems/score/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -20,10 +20,9 @@ unixsize.h: $(GENSIZE) cpu.h
 
 CLEANFILES = unixsize.h
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \
-$(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(STATIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \
+    $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@
diff --git a/c/src/exec/score/cpu/unix/rtems/score/cpu.h b/c/src/exec/score/cpu/unix/rtems/score/cpu.h
index 75eb07af74..698d900515 100644
--- a/c/src/exec/score/cpu/unix/rtems/score/cpu.h
+++ b/c/src/exec/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/c/src/exec/score/cpu/unix/rtems/score/unix.h b/c/src/exec/score/cpu/unix/rtems/score/unix.h
index 26ef8ca4e4..e8a0c7bdd6 100644
--- a/c/src/exec/score/cpu/unix/rtems/score/unix.h
+++ b/c/src/exec/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