diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-12 03:43:07 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2005-02-12 03:43:07 +0000 |
| commit | 9cd49d421a734f4f4b065889edf6b16acafa66f3 (patch) | |
| tree | 650dc61a558560504f240b7e9073e109a012cefb | |
| parent | 2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-9cd49d421a734f4f4b065889edf6b16acafa66f3.tar.bz2 | |
2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org>
* configure.ac: Remove HAS_WRAPUP_LIBBSP.
* wrapup/Makefile.am: Remove HAS_WRAPUP_LIBBSP.
| -rw-r--r-- | c/src/ChangeLog | 5 | ||||
| -rw-r--r-- | c/src/configure.ac | 12 | ||||
| -rw-r--r-- | c/src/wrapup/Makefile.am | 5 |
3 files changed, 5 insertions, 17 deletions
diff --git a/c/src/ChangeLog b/c/src/ChangeLog index 373de60fe3..788df10a5b 100644 --- a/c/src/ChangeLog +++ b/c/src/ChangeLog @@ -1,5 +1,10 @@ 2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org> + * configure.ac: Remove HAS_WRAPUP_LIBBSP. + * wrapup/Makefile.am: Remove HAS_WRAPUP_LIBBSP. + +2005-02-11 Ralf Corsepius <ralf.corsepius@rtems.org> + * aclocal/ppc.m4: Reflect changes to ppc exception processing building procedures. diff --git a/c/src/configure.ac b/c/src/configure.ac index 18c55a4496..d8d9fec025 100644 --- a/c/src/configure.ac +++ b/c/src/configure.ac @@ -219,18 +219,6 @@ AM_CONDITIONAL([LIBCHIP],[test "$RTEMS_BSP_FAMILY" != "posix"]) # FIXME: We should use a feature based check, here AM_CONDITIONAL([HAS_LIBBSP],[test "$RTEMS_BSP_FAMILY" != "bare"]) -# FIXME: HACK -# Temporarily, we need to consider 3 cases: -# 1. 4.7-style: lib/libbsp/<cpu>/<bsp>/libbsp.a w/o wrapup/Makefile.am -# 2. powerpc: lib/libbsp/<cpu>/<bsp>/libbsp.a w/ wrapup/Makefile.am -# 3. 4.6-style: lib/libbsp/<cpu>/<bsp>/wrapup/$(ARCH)/libbsp.a w/ wrapup/Makefile.am - -AS_IF([test -f $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am], - [AS_IF([grep ___libbsp_a $srcdir/lib/libbsp/$RTEMS_CPU/$RTEMS_BSP_FAMILY/wrapup/Makefile.am >/dev/null], - [HAS_WRAPUP_LIBBSP=no], - [HAS_WRAPUP_LIBBSP=yes])], - [HAS_WRAPUP_LIBBSP=no]) -AM_CONDITIONAL([HAS_WRAPUP_LIBBSP],[test $HAS_WRAPUP_LIBBSP = yes]) AM_CONDITIONAL([MULTILIB],[test x"${enable_multilib}" = x"yes"]) AM_CONDITIONAL([RPCTOOLS],[test "$RPCGEN" = rpcgen \ diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am index 5e3f18f6b3..aa8ad14cab 100644 --- a/c/src/wrapup/Makefile.am +++ b/c/src/wrapup/Makefile.am @@ -13,13 +13,8 @@ CLEANFILES = o-optimize/librtemsbsp.a SRCS = ../support/libsupport.a if HAS_LIBBSP -if HAS_WRAPUP_LIBBSP -SRCS += \ - ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/o-optimize/libbsp.a -else SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a endif -endif if HAS_NETWORKING SRCS += ../libnetworking/pppd/libpppd.a |