Changeset 4090ebe in rtems


Ignore:
Timestamp:
Dec 3, 1999, 1:25:00 PM (20 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, 4.8, 4.9, master
Children:
fc81cc9
Parents:
5ea0bd37
Message:

Patch rtems-rc-19991123-rc-3.diff from Ralf Corsepius
<corsepiu@…>:

The patch below provides

  • automake support for score/cpu/powerpc
  • The hack to propagate values from *.cfg to automake configuration
  • A fix for librdbg/powerpc/mcp750/Makefile.am (Was completely corrupted before)
  • Fixes some files which apparently where missing in rtems-rc-19991123-rc-2.diff
  • some minor configuration related patches

To apply:

rm -rf ./c/src/exec/score/cpu/powerpc/wrap
patch -p1 < rtems-rc-19991123-rc-3.diff

Attention:

c/src/exec/score/cpu/[configure.in|aclocal.m4|configure] should be
removed after applying the patch.

Modifications had been made to the score/cpu/powerpc directory after
the snapshot this was based on. In particular, the mpc750 and
other_cpu directories had been renamed to new_exception_processing
and old_exception_processing. After this patch was applied, modifications
were made to account for this.

Files:
1 deleted
14 edited

Legend:

Unmodified
Added
Removed
  • Makefile.am

    r5ea0bd37 r4090ebe  
    2424aclocal/canonicalize-tools.m4 \
    2525aclocal/check-bsps.m4 \
     26aclocal/check-bsp-cache.m4 \
    2627aclocal/check-cpu.m4 \
    2728aclocal/check-cxx.m4 \
  • c/src/exec/configure.in

    r5ea0bd37 r4090ebe  
    6868fi
    6969AC_CONFIG_SUBDIRS($cfg_subdirs)
    70 AC_CONFIG_SUBDIRS(score/cpu)
     70AC_CONFIG_SUBDIRS(score/cpu/$RTEMS_CPU)
    7171
    7272PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
  • c/src/exec/rtems/optman/Makefile.am

    r5ea0bd37 r4090ebe  
    1717include $(top_srcdir)/../../../automake/lib.am
    1818
    19 TMPINSTALL_FILES = \
    20 $(PROJECT_RELEASE)/lib \
     19TMPINSTALL_FILES += \
    2120$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
    22 
    23 $(PROJECT_RELEASE)/lib:
    24         @$(mkinstalldirs) $@
    2521
    2622$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
  • c/src/exec/score/cpu/powerpc/Makefile.am

    r5ea0bd37 r4090ebe  
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    8 if MPC750
    9 CPUDIR = mpc750
     8if PPC_NEW_EXCEPTION_PROCESSING
     9CPUDIR = new_exception_processing
    1010else
    11 CPUDIR = other_cpu
     11CPUDIR = old_exception_processing
    1212endif
    1313
  • c/src/exec/score/cpu/sh/configure.in

    r5ea0bd37 r4090ebe  
    3030# Check if there is custom/*.cfg for this BSP
    3131RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
     32RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
    3233
    3334PROJECT_INCLUDE="\$(PROJECT_ROOT)/$RTEMS_BSP/lib/include"
  • c/src/exec/score/cpu/sh/rtems/score/Makefile.am

    r5ea0bd37 r4090ebe  
    1111    iosh7032.h ispsh7032.h \
    1212    iosh7045.h ispsh7045.h
    13 
    14 ## HACK: this should not be here
    15 ## Currently needed to get RTEMS_CPU_MODEL
    16 include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    1713
    1814#
  • c/src/librdbg/src/powerpc/mcp750/Makefile.am

    r5ea0bd37 r4090ebe  
    4747
    4848include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    49 include $(RTEMS_ROOT)/make/lib.cfg
     49include $(top_srcdir)/../../../automake/lib.am
    5050
    51 INSTALL_CHANGE = @INSTALL_CHANGE@
    52 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
     51PREINSTALL_FILES = \
     52$(PROJECT_INCLUDE)/rdbg \
     53$(PROJECT_INCLUDE)/rdbg/remdeb.h
    5354
    54 INSTALLDIRS = $(PROJECT_INCLUDE)/rdbg
     55$(PROJECT_INCLUDE)/rdbg:
     56        @$(mkinstalldirs) $@
    5557
    56 $(INSTALLDIRS):
    57         @$(mkinstalldirs) $(INSTALLDIRS)
     58TMPINSTALL_FILES += \
     59$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
    5860
    5961#
    6062# Add local stuff here using +=
    6163#
    62 
    63 DEFINES +=
    64 CPPFLAGS +=
    65 #
    66 # Enable traces in RDBG
    67 #
    68 #CFLAGS   += -DDDEBUG
    69 #
    70 CFLAGS +=
    7164
    7265#
     
    7770#
    7871
    79 CLEAN_ADDITIONS += $(LIB) $(H_FILES) $(GEN_C_FILES)
    80 CLOBBER_ADDITIONS +=
     72CLEANFILES += $(LIB) $(H_FILES) $(GEN_C_FILES)
    8173
    8274FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
    8375
    84 all: ${ARCH} $(LIB)
    85         @$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
     76$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
     77        $(INSTALL_DATA) $< $@
    8678
    87 $(LIB): $(SRCS) ${OBJS}
     79all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     80
     81$(LIB): ${OBJS}
    8882        $(make-library)
    8983
     
    9387        $(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
    9488          -o $$pwd/$@ remdeb.x )
    95         @$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
     89
     90$(PROJECT_INCLUDE)/rdbg/remdeb.h: remdeb.h
     91        $(INSTALL_DATA) $< $@
    9692
    9793remdeb_xdr.c: $(X_FILES)
     
    109105        @rm -f tmpSvc.c
    110106
    111 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    112         cd $(top_builddir) \
    113          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
     107EXTRA_DIST = remdeb_f.x
     108
     109include $(top_srcdir)/../../../automake/local.am
  • c/src/librdbg/src/powerpc/new_exception_processing/Makefile.am

    r5ea0bd37 r4090ebe  
    4747
    4848include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
    49 include $(RTEMS_ROOT)/make/lib.cfg
     49include $(top_srcdir)/../../../automake/lib.am
    5050
    51 INSTALL_CHANGE = @INSTALL_CHANGE@
    52 mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
     51PREINSTALL_FILES = \
     52$(PROJECT_INCLUDE)/rdbg \
     53$(PROJECT_INCLUDE)/rdbg/remdeb.h
    5354
    54 INSTALLDIRS = $(PROJECT_INCLUDE)/rdbg
     55$(PROJECT_INCLUDE)/rdbg:
     56        @$(mkinstalldirs) $@
    5557
    56 $(INSTALLDIRS):
    57         @$(mkinstalldirs) $(INSTALLDIRS)
     58TMPINSTALL_FILES += \
     59$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a
    5860
    5961#
    6062# Add local stuff here using +=
    6163#
    62 
    63 DEFINES +=
    64 CPPFLAGS +=
    65 #
    66 # Enable traces in RDBG
    67 #
    68 #CFLAGS   += -DDDEBUG
    69 #
    70 CFLAGS +=
    7164
    7265#
     
    7770#
    7871
    79 CLEAN_ADDITIONS += $(LIB) $(H_FILES) $(GEN_C_FILES)
    80 CLOBBER_ADDITIONS +=
     72CLEANFILES += $(LIB) $(H_FILES) $(GEN_C_FILES)
    8173
    8274FRONTEND = \"$(RTEMS_CPU)/@RTEMS_BSP@/remdeb_f.x\"
    8375
    84 all: ${ARCH} $(LIB)
    85         @$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
     76$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIBVARIANT).a: $(LIB)
     77        $(INSTALL_DATA) $< $@
    8678
    87 $(LIB): $(SRCS) ${OBJS}
     79all: ${ARCH} $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
     80
     81$(LIB): ${OBJS}
    8882        $(make-library)
    8983
     
    9387        $(RPCGEN) -h -DFRONTEND=$(FRONTEND) \
    9488          -o $$pwd/$@ remdeb.x )
    95         @$(INSTALL_CHANGE) -m 755 $@ $(PROJECT_INCLUDE)/rdbg
     89
     90$(PROJECT_INCLUDE)/rdbg/remdeb.h: remdeb.h
     91        $(INSTALL_DATA) $< $@
    9692
    9793remdeb_xdr.c: $(X_FILES)
     
    109105        @rm -f tmpSvc.c
    110106
    111 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    112         cd $(top_builddir) \
    113          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
     107EXTRA_DIST = remdeb_f.x
     108
     109include $(top_srcdir)/../../../automake/local.am
  • c/src/make/Makefile.am

    r5ea0bd37 r4090ebe  
    4242SUBDIRS = compilers custom
    4343
     44include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
     45
     46@RTEMS_BSP@.cache: Makefile
     47        $(RM) $@
     48        @echo rtems_cv_RTEMS_CPU_MODEL=\$${rtems_cv_RTEMS_CPU_MODEL=$(RTEMS_CPU_MODEL)} >> $@
     49        @echo rtems_cv_RTEMS_BSP_FAMILY=\$${rtems_cv_RTEMS_BSP_FAMILY=$(RTEMS_BSP_FAMILY)} >> $@
     50
    4451include $(top_srcdir)/../../../automake/subdirs.am
    4552include $(top_srcdir)/../../../automake/local.am
  • c/src/make/configure.in

    r5ea0bd37 r4090ebe  
    129129custom/Makefile
    130130custom/default.cfg
    131 compilers/Makefile
     131compilers/Makefile,
     132make $RTEMS_BSP.cache,
     133RTEMS_BSP=${RTEMS_BSP}
    132134)
  • c/src/optman/rtems/Makefile.am

    r5ea0bd37 r4090ebe  
    1717include $(top_srcdir)/../../../automake/lib.am
    1818
    19 TMPINSTALL_FILES = \
    20 $(PROJECT_RELEASE)/lib \
     19TMPINSTALL_FILES += \
    2120$(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel)
    22 
    23 $(PROJECT_RELEASE)/lib:
    24         @$(mkinstalldirs) $@
    2521
    2622$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
  • c/src/tests/psxtests/psxsem01/init.c

    r5ea0bd37 r4090ebe  
    244244  return NULL; /* just so the compiler thinks we returned something */
    245245}
     246
  • cpukit/score/cpu/powerpc/Makefile.am

    r5ea0bd37 r4090ebe  
    66ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal
    77
    8 if MPC750
    9 CPUDIR = mpc750
     8if PPC_NEW_EXCEPTION_PROCESSING
     9CPUDIR = new_exception_processing
    1010else
    11 CPUDIR = other_cpu
     11CPUDIR = old_exception_processing
    1212endif
    1313
  • testsuites/psxtests/psxsem01/init.c

    r5ea0bd37 r4090ebe  
    244244  return NULL; /* just so the compiler thinks we returned something */
    245245}
     246
Note: See TracChangeset for help on using the changeset viewer.