From 432834560293094335873531fef84a4a98606180 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 2 Dec 1999 17:45:14 +0000 Subject: Patch rtems-rc-19991123-rc-2.diff from Ralf Corsepius : 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. --- .../support/new_exception_processing/Makefile.am | 66 ++++++++++++++++ .../support/old_exception_processing/Makefile.am | 66 ++++++++++++++++ .../powerpc/new_exception_processing/Makefile.am | 66 ++++++++++++++++ .../powerpc/new_exception_processing/Makefile.in | 90 ---------------------- .../powerpc/old_exception_processing/Makefile.am | 66 ++++++++++++++++ .../powerpc/old_exception_processing/Makefile.in | 90 ---------------------- 6 files changed, 264 insertions(+), 180 deletions(-) create mode 100644 c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am create mode 100644 c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am create mode 100644 c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am delete mode 100644 c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.in create mode 100644 c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am delete mode 100644 c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.in (limited to 'c/src/lib') diff --git a/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am new file mode 100644 index 0000000000..f7299a4103 --- /dev/null +++ b/c/src/lib/libbsp/powerpc/support/new_exception_processing/Makefile.am @@ -0,0 +1,66 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +# C source names, if any, go here -- minus the .c +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +ROOT_H_FILES = +RTEMS_SCORE_H_FILES = cpu.h c_isr.inl +noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) + +# Assembly source names, if any, go here -- minus the .S +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE) \ +$(PROJECT_INCLUDE)/rtems/score \ +$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ +$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) + +##TMPINSTALL_FILES += \ +##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o +## $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%: % + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +REL = ../$(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) $(S_O_FILES) + test -d ../$(ARCH) || mkdir ../$(ARCH) + $(make-rel) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) +## all-local: $(ARCH)/rtems.o +all-local: $(TMPINSTALL_FILES) + +clean-local: + $(RM) -r ../o-optimize ../o-debug ../o-profile + +EXTRA_DIST = \ +$(C_FILES) $(S_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am new file mode 100644 index 0000000000..afd66502eb --- /dev/null +++ b/c/src/lib/libbsp/powerpc/support/old_exception_processing/Makefile.am @@ -0,0 +1,66 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +# C source names +C_FILES = cpu.c ppccache.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +ROOT_H_FILES = +RTEMS_SCORE_H_FILES = cpu.h c_isr.inl +noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) + +# Assembly source names +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE) \ +$(PROJECT_INCLUDE)/rtems/score \ +$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ +$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) + +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%: % + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +REL = ../$(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) $(S_O_FILES) + test -d ../$(ARCH) || mkdir ../$(ARCH) + $(make-rel) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) +all-local: $(ARCH)/rtems.o +all-local: $(TMPINSTALL_FILES) + +clean-local: + $(RM) -r ../o-optimize ../o-debug ../o-profile + +UNUSED_FILES = irq_stub.S + +EXTRA_DIST = \ +TODO \ +rtems.S \ +$(C_FILES) $(S_FILES) $(UNUSED_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am new file mode 100644 index 0000000000..f7299a4103 --- /dev/null +++ b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.am @@ -0,0 +1,66 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +# C source names, if any, go here -- minus the .c +C_FILES = cpu.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +ROOT_H_FILES = +RTEMS_SCORE_H_FILES = cpu.h c_isr.inl +noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) + +# Assembly source names, if any, go here -- minus the .S +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +# +# (OPTIONAL) Add local stuff here using += +# + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE) \ +$(PROJECT_INCLUDE)/rtems/score \ +$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ +$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) + +##TMPINSTALL_FILES += \ +##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +##$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o +## $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%: % + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +REL = ../$(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) $(S_O_FILES) + test -d ../$(ARCH) || mkdir ../$(ARCH) + $(make-rel) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) +## all-local: $(ARCH)/rtems.o +all-local: $(TMPINSTALL_FILES) + +clean-local: + $(RM) -r ../o-optimize ../o-debug ../o-profile + +EXTRA_DIST = \ +$(C_FILES) $(S_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.in b/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.in deleted file mode 100644 index 19f78a0a4b..0000000000 --- a/c/src/lib/libcpu/powerpc/new_exception_processing/Makefile.in +++ /dev/null @@ -1,90 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = powerpc/new_exception_processing - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -RELS = ../$(ARCH)/rtems-cpu.rel - -# C source names, if any, go here -- minus the .c -C_PIECES = cpu -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -ROOT_H_PIECES = -ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%) -RTEMS_SCORE_H_PIECES = cpu.h -RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) -H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) -H_FILES = $(H_PIECES%=$(srcdir)/%) -I_PIECES = c_isr -I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) - -# Assembly source names, if any, go here -- minus the .S -S_PIECES = cpu_asm -S_FILES = $(S_PIECES:%=%.S) -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) \ - $(I_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)/rtems/score $(PROJECT_INCLUDE) - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) - -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 += - -../$(ARCH)/rtems-cpu.rel: $(OBJS) - test -d ../$(ARCH) || mkdir ../$(ARCH) - $(make-rel) - -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL_CHANGE) -install: all - -preinstall: ${ARCH} - @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(I_FILES) $(PROJECT_INCLUDE)/rtems/score - @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE) - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status diff --git a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am new file mode 100644 index 0000000000..afd66502eb --- /dev/null +++ b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.am @@ -0,0 +1,66 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +# C source names +C_FILES = cpu.c ppccache.c +C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o) + +ROOT_H_FILES = +RTEMS_SCORE_H_FILES = cpu.h c_isr.inl +noinst_HEADERS = $(ROOT_H_FILES) $(RTEMS_SCORE_H_FILES) + +# Assembly source names +S_FILES = cpu_asm.S +S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../../../../automake/lib.am + +PREINSTALL_FILES = \ +$(PROJECT_INCLUDE) \ +$(PROJECT_INCLUDE)/rtems/score \ +$(ROOT_H_FILES:%=$(PROJECT_INCLUDE)/%) \ +$(RTEMS_SCORE_H_FILES:%=$(PROJECT_INCLUDE)/rtems/score/%) + +TMPINSTALL_FILES += \ +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o + +$(PROJECT_RELEASE)/lib/rtems$(LIB_VARIANT).o: $(ARCH)/rtems.o + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE): + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score: + $(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems/score/%: % + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE)/%: % + $(INSTALL_DATA) $< $@ + +REL = ../$(ARCH)/rtems-cpu.rel + +$(REL): $(C_O_FILES) $(S_O_FILES) + test -d ../$(ARCH) || mkdir ../$(ARCH) + $(make-rel) + +all-local: $(ARCH) $(PREINSTALL_FILES) $(REL) +all-local: $(ARCH)/rtems.o +all-local: $(TMPINSTALL_FILES) + +clean-local: + $(RM) -r ../o-optimize ../o-debug ../o-profile + +UNUSED_FILES = irq_stub.S + +EXTRA_DIST = \ +TODO \ +rtems.S \ +$(C_FILES) $(S_FILES) $(UNUSED_FILES) + +include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.in b/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.in deleted file mode 100644 index 252b424d51..0000000000 --- a/c/src/lib/libcpu/powerpc/old_exception_processing/Makefile.in +++ /dev/null @@ -1,90 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = ../.. -subdir = powerpc/old_exception_processing - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -RELS = ../$(ARCH)/rtems-cpu.rel - -# C source names, if any, go here -- minus the .c -C_PIECES = cpu ppccache -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -ROOT_H_PIECES = -ROOT_H_FILES = $(ROOT_H_PIECES:%=$(srcdir)/%) -RTEMS_SCORE_H_PIECES = cpu.h -RTEMS_SCORE_H_FILES = $(RTEMS_SCORE_H_PIECES:%=$(srcdir)/%) -H_PIECES = $(ROOT_H_PIECES) $(RTEMS_SCORE_H_PIECES) -H_FILES = $(H_PIECES%=$(srcdir)/%) -I_PIECES = c_isr -I_FILES = $(I_PIECES:%=$(srcdir)/%.inl) - -# Assembly source names, if any, go here -- minus the .S -S_PIECES = cpu_asm rtems # irq_stub -S_FILES = $(S_PIECES:%=%.S) -S_O_FILES = $(S_FILES:%.S=${ARCH}/%.o) - -SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) $(S_FILES) $(EXTERNAL_H_FILES) \ - $(I_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)/rtems/score $(PROJECT_INCLUDE) - -$(INSTALLDIRS): - @$(mkinstalldirs) $(INSTALLDIRS) - -# -# (OPTIONAL) Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += $(CFLAGS_OS_V) - -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 += - -../$(ARCH)/rtems-cpu.rel: $(OBJS) - test -d ../$(ARCH) || mkdir ../$(ARCH) - $(make-rel) - -all: ${ARCH} $(SRCS) preinstall $(OBJS) $(RELS) - -# Install the program(s), appending _g or _p as appropriate. -# for include files, just use $(INSTALL_CHANGE) -install: all - -preinstall: ${ARCH} - @$(INSTALL_CHANGE) -m 644 $(RTEMS_SCORE_H_FILES) $(I_FILES) $(PROJECT_INCLUDE)/rtems/score - @$(INSTALL_CHANGE) -m 644 $(ROOT_H_FILES) $(PROJECT_INCLUDE) - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- cgit v1.2.3