diff options
| author | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2007-07-05 20:32:43 +0000 |
|---|---|---|
| committer | Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> | 2007-07-05 20:32:43 +0000 |
| commit | 78f96ab7c7ac4e8a2794eefc36813b56f8274e3c (patch) | |
| tree | 0a6aca020a3245a96eb28c9ce65a5a35806e1b24 /c/src/lib/libcpu | |
| parent | Needed to compile Ada. ACATS run on both psim and erc32. Results (diff) | |
| download | rtems-78f96ab7c7ac4e8a2794eefc36813b56f8274e3c.tar.bz2 | |
fixed some problems with shared PPC exception handling code
Diffstat (limited to 'c/src/lib/libcpu')
| -rw-r--r-- | c/src/lib/libcpu/powerpc/ChangeLog | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/Makefile.am | 6 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/configure.ac | 2 | ||||
| -rw-r--r-- | c/src/lib/libcpu/powerpc/preinstall.am | 9 |
4 files changed, 9 insertions, 14 deletions
diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index 8e840537c1..e38cf3a1a2 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,9 @@ +2007-07-05 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> + + * configure.ac, Makefile.am: + added ppc403 and ppc405 to "shared" conditional + adapted to shared setting + 2007-07-02 Thomas Doerfler <Thomas.Doerfler@embedded-brains.de> * ppc403/clock/clock.c, ppc403/console/console405.c, diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 0edf6f0a00..5a230bf54f 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -98,13 +98,9 @@ if OLD_EXCEPTIONS include_HEADERS = ppc403/ictrl/ictrl.h else include_HEADERS = -include_libcpu_HEADERS += shared/include/spr.h - -noinst_PROGRAMS += shared/cpuIdent.rel -shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c shared/include/cpuIdent.h +shared_cpuIdent_rel_SOURCES = shared/include/cpuIdent.c shared_cpuIdent_rel_CPPFLAGS = $(AM_CPPFLAGS) shared_cpuIdent_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -include_libcpu_HEADERS += shared/include/cpuIdent.h endif diff --git a/c/src/lib/libcpu/powerpc/configure.ac b/c/src/lib/libcpu/powerpc/configure.ac index 7e6ec76c00..e7e8efcc05 100644 --- a/c/src/lib/libcpu/powerpc/configure.ac +++ b/c/src/lib/libcpu/powerpc/configure.ac @@ -41,6 +41,8 @@ AM_CONDITIONAL(shared, \ || test "$RTEMS_CPU_MODEL" = "mpc555" \ || test "$RTEMS_CPU_MODEL" = "mpc5xx" \ || test "$RTEMS_CPU_MODEL" = "ppc603e" \ +|| test "$RTEMS_CPU_MODEL" = "ppc403" \ +|| test "$RTEMS_CPU_MODEL" = "ppc405" \ || test "$RTEMS_CPU_MODEL" = "mpc604" \ || test "$RTEMS_CPU_MODEL" = "mpc6xx" \ || test "$RTEMS_CPU_MODEL" = "mpc821" \ diff --git a/c/src/lib/libcpu/powerpc/preinstall.am b/c/src/lib/libcpu/powerpc/preinstall.am index 12b46f62f5..85531b8d83 100644 --- a/c/src/lib/libcpu/powerpc/preinstall.am +++ b/c/src/lib/libcpu/powerpc/preinstall.am @@ -97,15 +97,6 @@ if OLD_EXCEPTIONS $(PROJECT_INCLUDE)/ictrl.h: ppc403/ictrl/ictrl.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ictrl.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/ictrl.h - -else -$(PROJECT_INCLUDE)/libcpu/spr.h: shared/include/spr.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/spr.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/spr.h - -$(PROJECT_INCLUDE)/libcpu/cpuIdent.h: shared/include/cpuIdent.h $(PROJECT_INCLUDE)/libcpu/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/libcpu/cpuIdent.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/libcpu/cpuIdent.h endif if ppc405 $(PROJECT_INCLUDE)/tty_drv.h: ppc403/tty_drv/tty_drv.h $(PROJECT_INCLUDE)/$(dirstamp) |