Patch rtems-rc-20000104-13.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>

which does the following:

  * some cleanups, fixes, addtions to the libbsp automake transition
    patches
  * The missing Automake transistion patches all libcpu/<cpu>/<variant>/*
    previously not yet been converted to automake (libcpu/powerpc,
    libcpu/hppa1.1, libcpu/mips64orion, libcpu/sparc)

  => With this patch, libcpu/*/* is under full automake control.

  NOTES:
  * This patch is tested by building for random set of bsps affected by
    this patch, but not tested for all BSPs.
  * The parts of this patch related to libcpu/powerpc fix many small bugs
    inside of those Makefiles.
  * Have a look into libcpu/powerpc/mpc6xx/, which is in rather bad shape,
    IMO. Obviously most subdirectories seem to be build but are not included
    into libcpu.a by wrapup/Makefile. Addtionally, no actual BSP uses this
    cpu-variant subdirectory. Furthermore libcpu/powerpc/mpc6xx has a
    different directory layout than all other powerpc/<variant>/
    directories.

    Joel's note:  I agree but the issue is that there is a conflict between
    including timer or clock in libcpu/XXX/wrapup/Makefile.* and letting
    a BSP specifically decide to pick it up.  There is no clear solution
    to this at the moment.
This commit is contained in:
Joel Sherrill
2000-01-10 14:50:45 +00:00
parent 5fa147949d
commit bc2f04f8a8
63 changed files with 1017 additions and 2037 deletions

View File

@@ -0,0 +1,44 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
PGM = ${ARCH}/exceptions.rel
## C sources
C_FILES = raw_exception.c
## Assembly sources
S_FILES = asm_utils.S
H_FILES = raw_exception.h
noinst_HEADERS = $(H_FILES)
exceptions_rel_OBJECTS = $(C_FILES:%.c=${ARCH}/%.o) $(S_FILES:%.S=${ARCH}/%.o)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(top_srcdir)/../../../../../automake/lib.am
$(PROJECT_INCLUDE)/libcpu:
$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/libcpu/%.h: %.h
$(INSTALL_DATA) $< $@
TMPINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu \
$(PROJECT_INCLUDE)/libcpu/raw_exception.h
#
# (OPTIONAL) Add local stuff here using +=
#
AM_CFLAGS = $(CFLAGS_OS_V)
$(PGM): $(exceptions_rel_OBJECTS)
$(make-rel)
all-local: ${ARCH} $(PGM) $(TMPINSTALL_FILES)
EXTRA_DIST = $(C_FILES) $(S_FILES)
include $(top_srcdir)/../../../../../automake/local.am

View File

@@ -1,79 +0,0 @@
#
# $Id$
#
@SET_MAKE@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
top_builddir = ../..
subdir = mpc6xx/exceptions
RTEMS_ROOT = @RTEMS_ROOT@
PROJECT_ROOT = @PROJECT_ROOT@
VPATH = @srcdir@
PGM = ${ARCH}/exceptions.rel
# C source names, if any, go here -- minus the .c
C_PIECES = raw_exception
C_FILES = $(C_PIECES:%=%.c)
C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
H_FILES = $(srcdir)/raw_exception.h
# Assembly source names, if any, go here -- minus the .S
S_PIECES = asm_utils
S_FILES = $(S_PIECES:%=%.S)
S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o)
SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES)
OBJS = $(C_O_FILES) $(CC_O_FILES) $(S_O_FILES)
include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
include $(RTEMS_ROOT)/make/leaf.cfg
INSTALL_CHANGE = @INSTALL_CHANGE@
mkinstalldirs = $(SHELL) $(top_srcdir)/@RTEMS_TOPdir@/mkinstalldirs
INSTALLDIRS = $(PROJECT_INCLUDE)/libcpu
$(INSTALLDIRS):
@$(mkinstalldirs) $(INSTALLDIRS)
#
# (OPTIONAL) Add local stuff here using +=
#
DEFINES +=
CPPFLAGS +=
CFLAGS +=
LD_PATHS +=
LD_LIBS +=
LDFLAGS +=
#
# Add your list of files to delete here. The config files
# already know how to delete some stuff, so you may want
# to just run 'make clean' first to see what gets missed.
# 'make clobber' already includes 'make clean'
#
CLEAN_ADDITIONS +=
CLOBBER_ADDITIONS +=
${PGM}: ${OBJS}
$(make-rel)
preinstall: $(INSTALLDIRS) $(H_FILES)
@$(INSTALL_CHANGE) -m 644 $(H_FILES) $(PROJECT_INCLUDE)/libcpu
all: ${ARCH} $(SRCS) preinstall $(PGM)
# the .rel file built here will be put into libbsp.a by ../wrapup/Makefile
install: all
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status