diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-12 03:39:56 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-12 03:39:56 +0000 |
| commit | eb27a986383f258cd2b0fa06196f860c1bfc52dc (patch) | |
| tree | f33e02c938f6c88c83cd9e10da809357dde7f119 | |
| parent | 2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-eb27a986383f258cd2b0fa06196f860c1bfc52dc.tar.bz2 | |
2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org>
* Makefile.am: Build exception processing in old-exceptions rsp.
new-exceptions subdirs (Merge-in former libbsp/powerpc/support/*).
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/Makefile.am | 49 |
2 files changed, 52 insertions, 2 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index a53866ab99..5e0eab73da 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,5 +1,10 @@ 2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org> + * Makefile.am: Build exception processing in old-exceptions rsp. + new-exceptions subdirs (Merge-in former libbsp/powerpc/support/*). + +2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org> + * configure.ac: subdir-objects. Add compiler check for old/new-style exception processing. diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 47954c925f..8e12ff434f 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -4,13 +4,42 @@ ACLOCAL_AMFLAGS = -I ../../../aclocal +include $(top_srcdir)/../../../automake/compile.am + include_rtems_powerpcdir = $(includedir)/rtems/powerpc include_rtems_powerpc_HEADERS = rtems/powerpc/cache.h \ - rtems/powerpc/debugmod.h + rtems/powerpc/debugmod.h rtems/powerpc/powerpc.h SUBDIRS = shared mpc5xx mpc505 mpc6xx mpc8260 mpc8xx ppc403 -all-local: $(TMPINSTALL_FILES) +all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES) + +include_rtems_scoredir = $(includedir)/rtems/score + +if OLD_EXCEPTIONS +include_rtems_score_HEADERS = \ + ../../libbsp/powerpc/support/old_exception_processing/rtems/score/ppc_offs.h + +EXTRA_DIST = ../../libbsp/powerpc/support/old_exception_processing/TODO \ + ../../libbsp/powerpc/support/old_exception_processing/irq_stub.S \ + ../../libbsp/powerpc/support/old_exception_processing/ppccache.c + +noinst_PROGRAMS = old-exceptions/rtems-cpu.rel +old_exceptions_rtems_cpu_rel_SOURCES = \ + ../../libbsp/powerpc/support/old_exception_processing/cpu.c \ + ../../libbsp/powerpc/support/old_exception_processing/cpu_asm.S \ + ../../libbsp/powerpc/support/old_exception_processing/rtems/score/ppc_offs.h +old_exceptions_rtems_cpu_rel_CPPFLAGS = $(AM_CPPFLAGS) \ + -I$(srcdir)/../../libbsp/powerpc/support/old_exception_processing +old_exceptions_rtems_cpu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +else +noinst_PROGRAMS = new-exceptions/rtems-cpu.rel +new_exceptions_rtems_cpu_rel_SOURCES = \ + ../../libbsp/powerpc/support/new_exception_processing/cpu.c \ + ../../libbsp/powerpc/support/new_exception_processing/cpu_asm.S +new_exceptions_rtems_cpu_rel_CPPFLAGS = $(AM_CPPFLAGS) +new_exceptions_rtems_cpu_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) +endif PREINSTALL_DIRS = PREINSTALL_FILES = @@ -28,6 +57,22 @@ $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h: rtems/powerpc/debugmod.h $(PROJECT_ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/debugmod.h +$(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h: rtems/powerpc/powerpc.h $(PROJECT_INCLUDE)/rtems/powerpc/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/powerpc/powerpc.h + +$(PROJECT_INCLUDE)/rtems/score/$(dirstamp): + @$(mkdir_p) $(PROJECT_INCLUDE)/rtems/score + @: > $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) +PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + +if OLD_EXCEPTIONS +$(PROJECT_INCLUDE)/rtems/score/ppc_offs.h: ../../libbsp/powerpc/support/old_exception_processing/rtems/score/ppc_offs.h $(PROJECT_INCLUDE)/rtems/score/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/score/ppc_offs.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/ppc_offs.h + +endif + CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) |