diff options
Diffstat (limited to 'c/src/exec/score/include')
| -rw-r--r-- | c/src/exec/score/include/rtems/score/.cvsignore | 2 | ||||
| -rw-r--r-- | c/src/exec/score/include/rtems/score/Makefile.am | 63 | ||||
| -rw-r--r-- | c/src/exec/score/include/rtems/system.h | 4 |
3 files changed, 16 insertions, 53 deletions
diff --git a/c/src/exec/score/include/rtems/score/.cvsignore b/c/src/exec/score/include/rtems/score/.cvsignore index 282522db03..fffa6b8f3b 100644 --- a/c/src/exec/score/include/rtems/score/.cvsignore +++ b/c/src/exec/score/include/rtems/score/.cvsignore @@ -1,2 +1,4 @@ Makefile Makefile.in +stamp-h.in +cpuopts-tmp.h.in diff --git a/c/src/exec/score/include/rtems/score/Makefile.am b/c/src/exec/score/include/rtems/score/Makefile.am index bcf11a067f..867fbe6468 100644 --- a/c/src/exec/score/include/rtems/score/Makefile.am +++ b/c/src/exec/score/include/rtems/score/Makefile.am @@ -14,12 +14,11 @@ STD_H_FILES = address.h apiext.h bitfield.h chain.h context.h copyrt.h \ coremsg.h coremutex.h coresem.h heap.h interr.h isr.h object.h \ priority.h stack.h states.h sysstate.h thread.h threadq.h tod.h tqdata.h \ userext.h watchdog.h wkspace.h -TARGOPTS = targopts.h if HAS_MP -H_FILES = $(STD_H_FILES) $(TARGOPTS) $(MP_H_FILES) +H_FILES = $(STD_H_FILES) $(MP_H_FILES) cpuopts.h else -H_FILES = $(STD_H_FILES) $(TARGOPTS) +H_FILES = $(STD_H_FILES) cpuopts.h endif PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \ @@ -31,59 +30,17 @@ $(PROJECT_INCLUDE)/rtems/score: $(PROJECT_INCLUDE)/rtems/score/%.h: %.h $(INSTALL_DATA) $< $@ -CLEANFILES += $(TARGOPTS) - -# Until RTEMS_CPU is removed from all the make configuration files, -# this will need to be here to transform hppa1.1 into hppa1_1 to -# make it a valid cpp symbol. At some point in the near future, -# targopts.h should not define RTEMS_CPU. As best I can tell, -# gcc cpp predefines eliminate the need for RTEMS_CPU_MODEL -# on some families but not on others. For example, the i386 -# family does not give us enough information from the predefines. -RTEMS_CPU_DEFINED = $(subst .,_,$(RTEMS_CPU)) - -# make the target dependent options file -$(TARGOPTS): - @echo "/* target board dependent options file */" >$@ +# make the cpu dependent options file +# FIXME: We are exporting a config-header here, which is a bad idea in +# general +cpuopts.h: cpuopts-tmp.h + @echo "/* target cpu dependent options file */" >$@ @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@ @echo >>$@ - @echo "#ifndef __TARGET_OPTIONS_h" >>$@ - @echo "#define __TARGET_OPTIONS_h" >>$@ - @echo >>$@ - @echo "#ifdef $(RTEMS_CPU_DEFINED)" >>$@ - @echo "#undef $(RTEMS_CPU_DEFINED)" >>$@ - @echo "#endif" >>$@ - @echo "#define $(RTEMS_CPU_DEFINED) 1" >>$@ - @echo >>$@ - @echo "#ifdef $(RTEMS_CPU_MODEL)" >>$@ - @echo "#undef $(RTEMS_CPU_MODEL)" >>$@ - @echo "#endif" >>$@ - @echo "#define $(RTEMS_CPU_MODEL) 1" >>$@ - @echo >>$@ - @echo "#ifdef @RTEMS_BSP@" >>$@ - @echo "#undef @RTEMS_BSP@" >>$@ - @echo "#endif" >>$@ - @echo "#define @RTEMS_BSP@ 1" >>$@ + @echo "#ifndef __CPU_OPTIONS_h" >>$@ + @echo "#define __CPU_OPTIONS_h" >>$@ @echo >>$@ - @$(make-target-options) - @if test "$(RTEMS_USE_MACROS)" = "yes"; then \ - echo "#define USE_MACROS 1" >>$@; \ - else \ - echo "#define USE_INLINES 1" >>$@; \ - fi - @if test "$(HAS_MP)" = "yes"; then \ - echo "#define RTEMS_MULTIPROCESSING 1" >>$@; \ - fi - @if test "$(HAS_POSIX_API)" = "yes"; then \ - echo "#define RTEMS_POSIX_API 1" >>$@; \ - fi - @if test "$(HAS_ITRON_API)" = "yes"; then \ - echo "#define RTEMS_ITRON_API 1" >>$@; \ - fi - @if test "$(RTEMS_USE_NEWLIB)" = "yes"; then \ - echo "#define RTEMS_NEWLIB 1" >>$@; \ - echo "#define MALLOC_PROVIDED 1" >>$@; \ - fi + @cat cpuopts-tmp.h >>$@ @echo >>$@ @echo "#endif" >>$@ diff --git a/c/src/exec/score/include/rtems/system.h b/c/src/exec/score/include/rtems/system.h index b1a2382ea4..5e9cabb448 100644 --- a/c/src/exec/score/include/rtems/system.h +++ b/c/src/exec/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> /* |