RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2001-01-18 Joel Sherrill <joel@OARcorp.com>

Browse Source 
* include/rtems/system.h: Only include cpuopts.h when building a
	multilib configuration.  Some ports still need targopts.h but this
	small modification lets those ports work non-multilib while
	fixing being fixed for multilib.
This commit is contained in:
Joel Sherrill
2002-01-18 22:33:49 +00:00
parent 8560ed944d
commit 61129cc54f
4 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
c/src/exec/score/ChangeLog
View File

@@ -1,3 +1,10 @@
2001-01-18 Joel Sherrill <joel@OARcorp.com>
* include/rtems/system.h: Only include cpuopts.h when building a
multilib configuration. Some ports still need targopts.h but this
small modification lets those ports work non-multilib while
fixing being fixed for multilib.
2002-01-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/seterr.h: Add do {..} while (0) in defines.

26
c/src/exec/score/include/rtems/system.h
View File

@@ -27,23 +27,21 @@ extern "C" {
* first so the basic macro definitions are in place.
*/
/*
* FIXME: cpuopts.h should be included here.
*/
#if defined(_AM29K) \
|| defined(__hppa__) \
|| defined(__h8300__) \
|| defined(__i960__) \
|| defined(__mc68000__) \
|| defined(__sh__) \
|| defined(__sparc__) \
|| defined(__i386__)
/* these cpus are ready to apply cpuopts.h */
#include <rtems/score/cpuopts.h>
#else
/* fallback to targopts.h for mips and powerpc */
/*
* FIXME: No port should have to include targopts.h
*
* Most cpus are ready to apply only cpuopts.h but these ports
* unfortunately still need targopts.h. This means these ports
* are not ready to be built multilib yet.
*/
#if !defined(RTEMS_MULTILIB)
#if defined(__PPC__) || defined(__sparc__) || defined(__i386__)
#include <rtems/score/targopts.h>
#endif
#endif
/*
* The following ensures that all data is declared in the space

7
cpukit/score/ChangeLog
View File

@@ -1,3 +1,10 @@
2001-01-18 Joel Sherrill <joel@OARcorp.com>
* include/rtems/system.h: Only include cpuopts.h when building a
multilib configuration. Some ports still need targopts.h but this
small modification lets those ports work non-multilib while
fixing being fixed for multilib.
2002-01-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/seterr.h: Add do {..} while (0) in defines.

26
cpukit/score/include/rtems/system.h
View File

@@ -27,23 +27,21 @@ extern "C" {
* first so the basic macro definitions are in place.
*/
/*
* FIXME: cpuopts.h should be included here.
*/
#if defined(_AM29K) \
|| defined(__hppa__) \
|| defined(__h8300__) \
|| defined(__i960__) \
|| defined(__mc68000__) \
|| defined(__sh__) \
|| defined(__sparc__) \
|| defined(__i386__)
/* these cpus are ready to apply cpuopts.h */
#include <rtems/score/cpuopts.h>
#else
/* fallback to targopts.h for mips and powerpc */
/*
* FIXME: No port should have to include targopts.h
*
* Most cpus are ready to apply only cpuopts.h but these ports
* unfortunately still need targopts.h. This means these ports
* are not ready to be built multilib yet.
*/
#if !defined(RTEMS_MULTILIB)
#if defined(__PPC__) || defined(__sparc__) || defined(__i386__)
#include <rtems/score/targopts.h>
#endif
#endif
/*
* The following ensures that all data is declared in the space