[RTEMS Project] #3354: PowerPC BSPs duplicate PAGE_MASK, etc redefinition

[RTEMS trac]

#3354: PowerPC BSPs duplicate PAGE_MASK, etc redefinition
----------------------------+---------------------------
  Reporter:  Joel Sherrill  |      Owner:  Joel Sherrill
      Type:  defect         |     Status:  assigned
  Priority:  normal         |  Milestone:  5.1
 Component:  arch/powerpc   |    Version:  5
  Severity:  normal         |   Keywords:
Blocked By:                 |   Blocking:
----------------------------+---------------------------
 The following BSPs:

 powerpc-beatnik
 powerpc-mcp750
 powerpc-mtx603e
 powerpc-mvme2100
 powerpc-mvme2307
 powerpc-mvme5500
 powerpc-qemuprep-altivec
 powerpc-qemuprep

 use bsps/powerpc/include/libcpu/page.h which defines _ALIGN, PAGE_MASK,
 and PAGE_SIZE. These are defined by <machine/param.h>. I think the
 solution is to delete the versions in libcpu/page.h. Comments appreciated.

 ===================
 In file included from
 ../../../../../../../../rtems/c/src/lib/libbsp/powerpc/mvme5500/../../powerpc/shared/startup/pgtbl_setup.c:3:0:
 /home/joel/rtems-work/rtems-
 testing/rtems/rtems/bsps/powerpc/include/libcpu/page.h:22:0: warning:
 "PAGE_MASK" redefined
  #define PAGE_MASK (~(PAGE_SIZE-1))

 In file included from /data/home/joel/rtems-work/tools/5/powerpc-
 rtems5/include/sys/_cpuset.h:36:0,
                  from /data/home/joel/rtems-work/tools/5/powerpc-
 rtems5/include/sys/cpuset.h:45,
                  from /data/home/joel/rtems-work/tools/5/powerpc-
 rtems5/include/sys/_pthreadtypes.h:24,
                  from /data/home/joel/rtems-work/tools/5/powerpc-
 rtems5/include/sys/types.h:239,
                  from /data/home/joel/rtems-work/tools/5/powerpc-
 rtems5/include/sys/time.h:43,
                  from /home/joel/rtems-work/rtems-
 testing/rtems/rtems/cpukit/include/rtems/score/timestamp.h:43,
                  from /home/joel/rtems-work/rtems-
 testing/rtems/rtems/cpukit/include/rtems/score/thread.h:36,
                  from /home/joel/rtems-work/rtems-
 testing/rtems/rtems/cpukit/include/rtems/score/heap.h:22,
                  from /home/joel/rtems-work/rtems-
 testing/rtems/rtems/cpukit/include/rtems/rtems/types.h:26,
                  from /home/joel/rtems-work/rtems-
 testing/rtems/rtems/cpukit/include/rtems.h:31,
                  from
 ../../../../../../../../rtems/c/src/lib/libbsp/powerpc/mvme5500/../../powerpc/shared/startup/pgtbl_setup.c:1:
 /data/home/joel/rtems-work/tools/5/powerpc-
 rtems5/include/machine/param.h:70:0: note: this is the location of the
 previous definition
  #define PAGE_MASK (PAGE_SIZE - 1)

--
Ticket URL: <http://devel.rtems.org/ticket/3354>
RTEMS Project <http://www.rtems.org/>
RTEMS Project