Changeset 07c5976 in rtems

Timestamp:

Jun 7, 2018, 4:58:59 AM (3 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

5, master

Children:

5249a4c

Parents:

de9b7d7

git-author:

Sebastian Huber <sebastian.huber@…> (06/07/18 04:58:59)

git-committer:

Sebastian Huber <sebastian.huber@…> (06/07/18 05:00:34)

Message:

bsps/powerpc: Hack to fix the build

The ppc405 define must be checked before the ppc403 define. The ppc405
define is provided by <bspopts.h>. The ppc403 define is provided by GCC
as a built-in define if no ppc* or mpc* define is set via the
command line (see GCC sources "gcc/config/rs6000/rtems.h").

Update #3425.

File:

• bsps/powerpc/include/rtems/powerpc/powerpc.h (modified) (2 diffs)

bsps/powerpc/include/rtems/powerpc/powerpc.h

@@ -112 +112 @@
  */
 
-#if defined(ppc403)
+/*
+ * FIXME: The ppc405 define must be checked before the ppc403 define.  The
+ * ppc405 define is provided by <bspopts.h>.  The ppc403 define is provided by
+ * GCC as a built-in define if no ppc* or mpc* define is set via the
+ * command line (see GCC sources "gcc/config/rs6000/rtems.h").
+ */
+#if defined(ppc405)
+
+#define PPC_CACHE_ALIGNMENT     32
+#define PPC_HAS_RI           0
+#define PPC_HAS_RFCI            1
+#define PPC_USE_MULTIPLE        1
+#define PPC_I_CACHE             16384
+#define PPC_D_CACHE             16384           /* except GP/CR */
+#define PPC_HAS_EXCEPTION_PREFIX 0
+#define PPC_HAS_EVPR             1
+
+#elif defined(ppc403)
 /*
  *  IBM 403
@@ -128 +145 @@
 #define PPC_D_CACHE             1024
 
-#define PPC_HAS_EXCEPTION_PREFIX 0
-#define PPC_HAS_EVPR             1
-
-#elif defined (ppc405)
-
-#define PPC_CACHE_ALIGNMENT     32
-#define PPC_HAS_RI           0
-#define PPC_HAS_RFCI            1
-#define PPC_USE_MULTIPLE        1
-#define PPC_I_CACHE             16384
-#define PPC_D_CACHE             16384           /* except GP/CR */
 #define PPC_HAS_EXCEPTION_PREFIX 0
 #define PPC_HAS_EVPR             1