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/sparc/rtems/Makefile.am       |  4 ++--
 c/src/exec/score/cpu/sparc/rtems/score/Makefile.am |  9 ++++-----
 c/src/exec/score/cpu/sparc/rtems/score/sparc.h     | 14 +++++++++++++-
 3 files changed, 19 insertions(+), 8 deletions(-)

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

diff --git a/c/src/exec/score/cpu/sparc/rtems/Makefile.am b/c/src/exec/score/cpu/sparc/rtems/Makefile.am
index 900930a502..ef7df82af7 100644
--- a/c/src/exec/score/cpu/sparc/rtems/Makefile.am
+++ b/c/src/exec/score/cpu/sparc/rtems/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am
index 602dce7cd5..f73fc35933 100644
--- a/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am
+++ b/c/src/exec/score/cpu/sparc/rtems/score/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
@@ -11,9 +11,8 @@ noinst_HEADERS = $(H_FILES)
 # (OPTIONAL) Add local stuff here using +=
 #
 
-PREINSTALL_FILES = \
-$(PROJECT_INCLUDE)/rtems/score \
-$(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
 
 $(PROJECT_INCLUDE)/rtems/score:
 	$(mkinstalldirs) $@
diff --git a/c/src/exec/score/cpu/sparc/rtems/score/sparc.h b/c/src/exec/score/cpu/sparc/rtems/score/sparc.h
index 0cb44c2df9..9fa52533cd 100644
--- a/c/src/exec/score/cpu/sparc/rtems/score/sparc.h
+++ b/c/src/exec/score/cpu/sparc/rtems/score/sparc.h
@@ -54,7 +54,19 @@ extern "C" {
  *
  */
  
-#if defined(erc32)
+#if defined(rtems_multilib)
+/*
+ *  Figure out all CPU Model Feature Flags based upon compiler 
+ *  predefines. 
+ */
+
+#define CPU_MODEL_NAME                   "rtems_multilib"
+#define SPARC_HAS_FPU                    1
+#define SPARC_HAS_BITSCAN                0
+#define SPARC_NUMBER_OF_REGISTER_WINDOWS 8
+#define SPARC_HAS_LOW_POWER_MODE         1
+
+#elif defined(erc32)
  
 #define CPU_MODEL_NAME                   "erc32"
 #define SPARC_HAS_FPU                    1
-- 
cgit v1.2.3