diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-07-10 19:23:38 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-07-10 19:23:38 +0000 |
commit | e0ba3e80ef20420f6dd06503745a1e5ed7cac633 (patch) | |
tree | 024fc5014616f586c07cf0c9ba6ad3cb68ada11f /cpukit/score/include/rtems | |
parent | Patch rtems-rc-20000708-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-e0ba3e80ef20420f6dd06503745a1e5ed7cac633.tar.bz2 |
Patch rtems-rc-20000709-1.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>
that addresses aspects of the targopts.h multilib related
issues.
Changes:
* Move targopts.h to libbsp/include, because the current targopts.h
actually is a per-BSP-header and therefore can not stay below exec/.
* Introduce an autoheader generated header file
(exec/score/include/rtems/score/cpuopts.h), which shall take per-cpu
configuration options only.
* Move all autoconf-detectable/configure specified per-cpu
option-defines from targopts.h to cpuopts.h.
* Add Makefiles to the libbsp/shared directory hierarchy.
Notes:
* The new per-bsp targopts.h in libbsp includes the per-cpu
cpuopts.h. This way, the new targopts.h is kept backward compatible
to the old targopts.h and existing BSPs which (carelessly) include
targopts.h (i386, ppc) should be kept working when using the
multilib-disabled configuration scheme.
* cpuopts.h is not yet complete, because the per-BSP make-targopts
rules from custom/<BSP>.cfg files can not be applied to files below
exec/ when building multilibs.
* All files below exec/ should not include targopts.h anymore, but
should include cpuopts.h instead. However, eliminating inclusion of
targopts.h currently triggers further structural / header file inclusion
related issues, because several ports apply BSP or CPU_MODEL specific
defines from targopts.h below exec/
Diffstat (limited to 'cpukit/score/include/rtems')
-rw-r--r-- | cpukit/score/include/rtems/score/.cvsignore | 2 | ||||
-rw-r--r-- | cpukit/score/include/rtems/system.h | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/cpukit/score/include/rtems/score/.cvsignore b/cpukit/score/include/rtems/score/.cvsignore index 282522db03..fffa6b8f3b 100644 --- a/cpukit/score/include/rtems/score/.cvsignore +++ b/cpukit/score/include/rtems/score/.cvsignore @@ -1,2 +1,4 @@ Makefile Makefile.in +stamp-h.in +cpuopts-tmp.h.in diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h index b1a2382ea4..5e9cabb448 100644 --- a/cpukit/score/include/rtems/system.h +++ b/cpukit/score/include/rtems/system.h @@ -27,6 +27,10 @@ extern "C" { * first so the basic macro definitions are in place. */ +/* + * FIXME: Instead of targopts.h, cpuopts.h should be included here. + * #include <rtems/score/cpuopts.h> + */ #include <rtems/score/targopts.h> /* |