diff options
Diffstat (limited to 'c/src/exec/score/include/rtems/system.h')
| -rw-r--r-- | c/src/exec/score/include/rtems/system.h | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h index d11e3ea8d7..3fdff9c92b 100644 --- a/c/src/exec/score/include/rtems/system.h +++ b/c/src/exec/score/include/rtems/system.h @@ -27,23 +27,21 @@ extern "C" { * first so the basic macro definitions are in place. */ +#include <rtems/score/cpuopts.h> + /* - * FIXME: cpuopts.h should be included here. + * 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(_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 */ + +#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 |