From 623ffdb1555b66935ef4b0624ec7953134fd2f26 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 20 Oct 2000 13:33:28 +0000 Subject: [PATCH] 2000-10-20 Joel Sherrill * configure.in, Makefile.am: Explicitly specify whether an RTEMS_CPU_MODEL is using old or new exception processing. This is important because when building multilib, you do not know the RTEMS_CPU_MODEL. So everything built in a multilib'ed RTEMS must be independent of the exception model and allow for late binding to the exception code. --- c/src/lib/libcpu/powerpc/ChangeLog | 9 +++++++++ c/src/lib/libcpu/powerpc/Makefile.am | 5 ++++- c/src/lib/libcpu/powerpc/configure.in | 12 ++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/c/src/lib/libcpu/powerpc/ChangeLog b/c/src/lib/libcpu/powerpc/ChangeLog index c577f682df..00019acfc9 100644 --- a/c/src/lib/libcpu/powerpc/ChangeLog +++ b/c/src/lib/libcpu/powerpc/ChangeLog @@ -1,3 +1,12 @@ +2000-10-20 Joel Sherrill + + * configure.in, Makefile.am: Explicitly specify whether an + RTEMS_CPU_MODEL is using old or new exception processing. This + is important because when building multilib, you do not know + the RTEMS_CPU_MODEL. So everything built in a multilib'ed RTEMS + must be independent of the exception model and allow for late + binding to the exception code. + 2000-10-18 Sergei Organov * Added full support for MPC505. diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index 17ebfd2b9a..115a02c80e 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -10,9 +10,12 @@ if shared SHARED_LIB = shared endif +## Use new or old exception processing based on the CPU if new_exception_processing EXCEPTION_SUBDIR = new_exception_processing -else +endif + +if old_exception_processing EXCEPTION_SUBDIR = old_exception_processing endif diff --git a/c/src/lib/libcpu/powerpc/configure.in b/c/src/lib/libcpu/powerpc/configure.in index d4ed2d415b..61cfc36089 100644 --- a/c/src/lib/libcpu/powerpc/configure.in +++ b/c/src/lib/libcpu/powerpc/configure.in @@ -34,10 +34,22 @@ AM_CONDITIONAL(shared, test "$RTEMS_CPU_MODEL" = "mpc750" \ || test "$RTEMS_CPU_MODEL" = "mpc860" \ || test "$RTEMS_CPU_MODEL" = "mpc8xx" ) +## there are no 601 or 602 BSPs currently. The 505 BSPs are in user land. AM_CONDITIONAL(new_exception_processing, \ test "$RTEMS_CPU_MODEL" = "mpc750" || \ test "$RTEMS_CPU_MODEL" = "mpc604") +## The goal is to get rid of the old exception processing code but +## but all BSPs in the distribution must be migrated to the new model +## first. +AM_CONDITIONAL(old_exception_processing, \ +test "$RTEMS_CPU_MODEL" = "ppc403" || \ +test "$RTEMS_CPU_MODEL" = "mpc505" || \ +test "$RTEMS_CPU_MODEL" = "ppc603e" || \ +test "$RTEMS_CPU_MODEL" = "mpc8xx" \ +) + +## test on CPU type AM_CONDITIONAL(mpc505, test "$RTEMS_CPU_MODEL" = "mpc505") AM_CONDITIONAL(mpc6xx, test "$RTEMS_CPU_MODEL" = "mpc6xx" \ || test "$RTEMS_CPU_MODEL" = "mpc604" \