Changeset e4071cf in rtems


Ignore:
Timestamp:
Feb 18, 1999, 5:16:48 PM (23 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
0fc85c50
Parents:
0c04c377
Message:

Patch from Ralf Corsepius <corsepiu@…>:

This patch removes generation of targopts.h from leaf.cfg and generates
it in location at score/include/rtems/score instead.

To achieve this:

  • all rules in other Makefile.ins which have accessed targopts.h have been removed.
  • c/Makefile.in has been modified to generate the directories before doing anything else. I.e. to ensure the directories exist before any preinstall rule fires (This part is a bit kludgy, but it seems to work. Please check if the interaction with libhwapi still works).
Location:
c/src/exec/score
Files:
12 edited

Legend:

Unmodified
Added
Removed
  • c/src/exec/score/cpu/a29k/Makefile.in

    r0c04c377 re4071cf  
    6767
    6868preinstall: $(ARCH) \
    69             $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    7069            ${PROJECT_RELEASE}/lib/bsp_specs
    7170        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    7372        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7473
    75 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    76         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    77 
    78 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    79 
    8074${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    8175        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/hppa1.1/Makefile.in

    r0c04c377 re4071cf  
    6868        $(INSTALL) -m 444 $(ARCH)/offsets.h $(PROJECT_INCLUDE)/rtems/score
    6969
    70 install-headers: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     70install-headers: $(ARCH) \
    7171            ${PROJECT_RELEASE}/lib/bsp_specs
    7272        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    7474        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7575
    76 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    77         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    78 
    79 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    80 
    8176${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    8277        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/i386/Makefile.in

    r0c04c377 re4071cf  
    6565
    6666preinstall: $(ARCH) \
    67             $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    6867            ${PROJECT_RELEASE}/lib/bsp_specs
    6968        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    7170        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7271
    73 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    74         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    75 
    76 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    77 
    7872${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    7973        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/i960/Makefile.in

    r0c04c377 re4071cf  
    6464
    6565preinstall: $(ARCH) \
    66             $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    6766            ${PROJECT_RELEASE}/lib/bsp_specs
    6867        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    7069        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7170
    72 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    73         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    74 
    75 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    76 
    7771${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    7872        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/m68k/Makefile.in

    r0c04c377 re4071cf  
    6060all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
    6161
    62 preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     62preinstall: $(ARCH) \
    6363            ${PROJECT_RELEASE}/lib/bsp_specs
    6464        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    6666        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    6767
    68 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    69         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    70 
    71 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    72 
    7368${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    7469        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/mips64orion/Makefile.in

    r0c04c377 re4071cf  
    6666# for include files, just use $(INSTALL)
    6767
    68 preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     68preinstall: $(ARCH) \
    6969            ${PROJECT_RELEASE}/lib/bsp_specs
    7070        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    7272        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7373
    74 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    75         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    76 
    77 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    78 
    7974${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    8075        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/no_cpu/Makefile.in

    r0c04c377 re4071cf  
    6767# Real ports using the gnu tools will need to have bsp_specs!!!
    6868#            ${PROJECT_RELEASE}/lib/bsp_specs
    69 preinstall: $(ARCH) \
    70             $(PROJECT_INCLUDE)/rtems/score/targopts.h
     69preinstall: $(ARCH)
    7170        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7271# we will share the basic cpu file
    7372        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    74 
    75 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    76         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    77 
    78 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    7973
    8074# Real ports using the gnu tools will need to have bsp_specs!!!
  • c/src/exec/score/cpu/powerpc/Makefile.in

    r0c04c377 re4071cf  
    6868
    6969preinstall: $(ARCH) \
    70             $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    7170            ${PROJECT_RELEASE}/lib/bsp_specs
    7271        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    7675        #test -f irq_stub.s || $(LN) -s $(srcdir)/irq_stub.s irq_stub.s
    7776
    78 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    79         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    80 
    81 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    82 
    8377${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    8478        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/sh/Makefile.in

    r0c04c377 re4071cf  
    7171install:  all
    7272
    73 preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     73preinstall: $(ARCH) \
    7474            ${PROJECT_RELEASE}/lib/bsp_specs
    7575        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    7777        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    7878
    79 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    80         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    81 
    82 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    83 
    8479${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    8580        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/sparc/Makefile.in

    r0c04c377 re4071cf  
    5959all:    ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS)
    6060
    61 preinstall: $(ARCH) $(PROJECT_INCLUDE)/rtems/score/targopts.h \
     61preinstall: $(ARCH) \
    6262            ${PROJECT_RELEASE}/lib/bsp_specs
    6363        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
     
    6565        $(INSTALL) -m 444 ${EXTERNAL_H_FILES} $(PROJECT_INCLUDE)
    6666
    67 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    68         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    69 
    70 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    71 
    7267${PROJECT_RELEASE}/lib/bsp_specs: $(ARCH)/bsp_specs.tmp
    7368        $(INSTALL) -m 444 $(ARCH)/bsp_specs.tmp $@
  • c/src/exec/score/cpu/unix/Makefile.in

    r0c04c377 re4071cf  
    6868#            ${PROJECT_RELEASE}/lib/bsp_specs
    6969preinstall: $(ARCH) $(ARCH)/unixsize.h \
    70             $(PROJECT_INCLUDE)/rtems/score/targopts.h \
    7170            $(PROJECT_RELEASE)/lib/bsp_specs
    7271        $(INSTALL) -m 444 ${H_FILES} $(PROJECT_INCLUDE)/rtems/score
    7372        $(INSTALL) -m 444 ${ARCH}/unixsize.h $(PROJECT_INCLUDE)/rtems/score
    74 
    75 $(PROJECT_INCLUDE)/rtems/score/targopts.h: $(ARCH)/targopts.h-tmp
    76         $(INSTALL) -m 444 $(ARCH)/targopts.h-tmp $@
    77 
    78 # $(ARCH)/targopts.h-tmp rule is in leaf.cfg
    7973
    8074# Real ports using the gnu tools will need to have bsp_specs!!!
  • c/src/exec/score/include/rtems/score/Makefile.in

    r0c04c377 re4071cf  
    1818    priority stack states sysstate thread threadq \
    1919    tod tqdata userext watchdog wkspace
    20 H_FILES=$(H_PIECES:%=$(srcdir)/%.h)
     20H_FILES=$(H_PIECES:%=$(srcdir)/%.h) targopts.h
    2121
    2222SRCS=$(H_FILES)
     
    3232#
    3333
    34 CLEAN_ADDITIONS +=
     34CLEAN_ADDITIONS += targopts.h
    3535CLOBBER_ADDITIONS +=
     36
     37# Until RTEMS_CPU is removed from all the make configuration files,
     38# this will need to be here to transform hppa1.1 into hppa1_1 to
     39# make it a valid cpp symbol.  At some point in the near future,
     40# targopts.h should not define RTEMS_CPU.  As best I can tell,
     41# gcc cpp predefines eliminate the need for RTEMS_CPU_MODEL
     42# on some families but not on others.  For example, the i386
     43# family does not give us enough information from the predefines.
     44RTEMS_CPU_DEFINED=$(subst .,_,$(RTEMS_CPU))
     45
     46# make the target dependent options file
     47targopts.h:
     48        @echo "/* target board dependent options file */"       >$@
     49        @echo "/* automatically generated -- DO NOT EDIT!! */" >>$@
     50        @echo                                                  >>$@
     51        @echo "#ifndef __TARGET_OPTIONS_h"                     >>$@
     52        @echo "#define __TARGET_OPTIONS_h"                     >>$@
     53        @echo                                                  >>$@
     54        @echo "#ifdef $(RTEMS_CPU_DEFINED)"                    >>$@
     55        @echo "#undef $(RTEMS_CPU_DEFINED)"                    >>$@
     56        @echo "#endif"                                         >>$@
     57        @echo "#define $(RTEMS_CPU_DEFINED) 1"                 >>$@
     58        @echo                                                  >>$@
     59        @echo "#ifdef $(RTEMS_CPU_MODEL)"                      >>$@
     60        @echo "#undef $(RTEMS_CPU_MODEL)"                      >>$@
     61        @echo "#endif"                                         >>$@
     62        @echo "#define $(RTEMS_CPU_MODEL) 1"                   >>$@
     63        @echo                                                  >>$@
     64        @echo "#ifdef $(RTEMS_BSP)"                            >>$@
     65        @echo "#undef $(RTEMS_BSP)"                            >>$@
     66        @echo "#endif"                                         >>$@
     67        @echo "#define $(RTEMS_BSP) 1"                         >>$@
     68        @echo                                                  >>$@
     69        @$(make-target-options)
     70ifeq (${RTEMS_USE_MACROS},yes)
     71        @echo "#define USE_MACROS 1"                           >>$@
     72else
     73        @echo "#define USE_INLINES 1"                          >>$@
     74endif
     75ifeq ($(RTEMS_HAS_MULTIPROCESSING),yes)
     76        @echo "#define RTEMS_MULTIPROCESSING 1"                >>$@
     77endif
     78ifeq ($(RTEMS_HAS_POSIX_API),yes)
     79        @echo "#define RTEMS_POSIX_API 1"                      >>$@
     80endif
     81ifeq ($(RTEMS_USE_NEWLIB),yes)
     82        @echo "#define RTEMS_NEWLIB 1"                         >>$@
     83        @echo "#define MALLOC_PROVIDED 1"                      >>$@
     84endif
     85        @echo                                                  >>$@
     86        @echo "#endif"                                         >>$@
     87
    3688
    3789all:    $(SRCS)
Note: See TracChangeset for help on using the changeset viewer.