2007-08-13 Frank Ch. Eigler <fche@redhat.com>

	* common_model.h: Change #include guard name.

2007-08-13  Frank Ch. Eigler  <fche@redhat.com>

	* sh.h: Protect CGEN_CPU_FPU macro against multiple definitions.
	* common_model.h: Change #include guard name.

diff --git a/sid/component/cgen-cpu/mep/ChangeLog b/sid/component/cgen-cpu/mep/ChangeLog
index 0c5d3c2..a3536f1 100644 (file)
--- a/sid/component/cgen-cpu/mep/ChangeLog
+++ b/sid/component/cgen-cpu/mep/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-13  Frank Ch. Eigler  <fche@redhat.com>
+
+       * common_model.h: Change #include guard name.
+
 2007-01-03  Dave Brolley  <brolley@redhat.com>
 
        * Makefile.am (libmep_la_LIBADD): Remove cgen-bitset.lo.

diff --git a/sid/component/cgen-cpu/mep/common_model.h b/sid/component/cgen-cpu/mep/common_model.h
index bd882d8..9c333bd 100644 (file)
--- a/sid/component/cgen-cpu/mep/common_model.h
+++ b/sid/component/cgen-cpu/mep/common_model.h
@@ -6,8 +6,8 @@
 // This file is part of SID and is licensed under the GPL.
 // See the file COPYING.SID for conditions for redistribution.
 
-#ifndef COMMON_MODEL_H
-#define COMMON_MODEL_H
+#ifndef MEP_COMMON_MODEL_H
+#define MEP_COMMON_MODEL_H
 
 #include <sidtypes.h>
 #include "cgen-types.h"
@@ -135,4 +135,4 @@ private:
   sid::host_int_8 save_total_latency;
 };
 
-#endif /*  COMMON_MODEL_H */
+#endif /*  MEP_COMMON_MODEL_H */

diff --git a/sid/component/cgen-cpu/sh/ChangeLog b/sid/component/cgen-cpu/sh/ChangeLog
index 0541d23..258e056 100644 (file)
--- a/sid/component/cgen-cpu/sh/ChangeLog
+++ b/sid/component/cgen-cpu/sh/ChangeLog
@@ -1,3 +1,8 @@
+2007-08-13  Frank Ch. Eigler  <fche@redhat.com>
+
+       * sh.h: Protect CGEN_CPU_FPU macro against multiple definitions.
+       * common_model.h: Change #include guard name.
+
 2006-10-18  Dave Brolley  <brolley@redhat.com>
 
        * Contribute the following changes:

diff --git a/sid/component/cgen-cpu/sh/common_model.h b/sid/component/cgen-cpu/sh/common_model.h
index 2bdc036..c80fa05 100644 (file)
--- a/sid/component/cgen-cpu/sh/common_model.h
+++ b/sid/component/cgen-cpu/sh/common_model.h
@@ -6,8 +6,8 @@
 // This file is part of SID and is licensed under the GPL.
 // See the file COPYING.SID for conditions for redistribution.
 
-#ifndef COMMON_MODEL_H
-#define COMMON_MODEL_H
+#ifndef SH_COMMON_MODEL_H
+#define SH_COMMON_MODEL_H
 
 #include <sidtypes.h>
 #include "cgen-types.h"
@@ -161,4 +161,4 @@ protected:
   sid::host_int_4 shift_busy;
 };
 
-#endif /*  COMMON_MODEL_H */
+#endif /*  SH_COMMON_MODEL_H */

diff --git a/sid/component/cgen-cpu/sh/sh.h b/sid/component/cgen-cpu/sh/sh.h
index d7eceba..6485660 100644 (file)
--- a/sid/component/cgen-cpu/sh/sh.h
+++ b/sid/component/cgen-cpu/sh/sh.h
@@ -95,7 +95,9 @@ namespace sh
 
       // Floating point support
       cgen_fpu fpu;
+#ifndef CGEN_CPU_FPU
 #define CGEN_CPU_FPU(cpu) (&(cpu)->fpu)
+#endif
 
     protected:
       virtual BI sh64_endian () const = 0;