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

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

diff --git a/c/src/exec/score/cpu/m68k/rtems/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/Makefile.am
index 900930a502..ef7df82af7 100644
--- a/c/src/exec/score/cpu/m68k/rtems/Makefile.am
+++ b/c/src/exec/score/cpu/m68k/rtems/Makefile.am
@@ -1,6 +1,6 @@
-## 
+##
 ## $Id$
-## 
+##
 
 AUTOMAKE_OPTIONS = foreign 1.4
 
diff --git a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am b/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am
index 5be89730ec..fa38bea692 100644
--- a/c/src/exec/score/cpu/m68k/rtems/score/Makefile.am
+++ b/c/src/exec/score/cpu/m68k/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/m68k/rtems/score/m68k.h b/c/src/exec/score/cpu/m68k/rtems/score/m68k.h
index 7408aae231..64639220dd 100644
--- a/c/src/exec/score/cpu/m68k/rtems/score/m68k.h
+++ b/c/src/exec/score/cpu/m68k/rtems/score/m68k.h
@@ -79,6 +79,15 @@ extern "C" {
  *    by having each model specify which core it uses and then go from there.
  */
 
+/*
+ *  Figure out all CPU Model Feature Flags based upon compiler 
+ *  predefines.   Notice the only exception to this is that 
+ *  gcc does not distinguish between CPU32 and CPU32+.  This
+ *  feature selection logic is setup such that if RTEMS__mcpu32p__
+ *  is defined, then CPU32+ rules are used.  Otherwise, the safe
+ *  but less efficient CPU32 rules are used for the CPU32+.
+ */
+
 #if defined(__mc68020__)
  
 #define CPU_MODEL_NAME          "m68020"
-- 
cgit v1.2.3