Context Navigation

← Previous Changeset
Next Changeset →

Changeset 04e6f7bf in rtems

Timestamp:

07/06/00 20:13:35 (23 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

02217e0b

Parents:

6c5aba2

Message:

Patch rtems-rc-20000705-3.diff from Ralf Corsepius <corsepiu@…>
that is a somewhat experimental, multilib-related patch:

Changes:

Use RTEMS_ENV_RTEMSCPU instead of RTEMS_ENV_RTEMSBSP in configure.ins below exec/. At the moment, RTEMS_ENV_RTEMSCPU is more or less an optical change to emphasize that these subdirectories shall not depend on RTEMS_BSP than a real behavioral change.
Add AC_DEFINE_* to several aclocal/*.m4 macros to prepare autoheader/autoconf generated targopts.h and similiar configuration headers.
c/src/configure.in: remove exec from cfg_subdirs if multilibs are enabled (c/src is build per bsp, exec shall be build per cpu in c/ or from the toplevel in future, when multilibs are enabled.)

Notes:

This patch should not have any impact on the current building scheme.
--enable-multilib still does not work.
running bootstrap from the toplevel directory is required.

CVS: ----------------------------------------------------------------------
CVS: Enter Log. Lines beginning with `CVS:' are removed automatically
CVS:
CVS: Committing in .
CVS:
CVS: Modified Files:
CVS: c/src/tests/libtests/termios/init.c
CVS: ----------------------------------------------------------------------

Files:

: 23 edited

aclocal/check-itron.m4 (modified) (2 diffs)
aclocal/check-multiprocessing.m4 (modified) (1 diff)
aclocal/check-posix.m4 (modified) (2 diffs)
aclocal/enable-inlines.m4 (modified) (1 diff)
aclocal/enable-rtemsbsp.m4 (modified) (1 diff)
c/src/configure.in (modified) (2 diffs)
c/src/exec/configure.in (modified) (2 diffs)
c/src/exec/itron/configure.in (modified) (1 diff)
c/src/exec/posix/configure.in (modified) (1 diff)
c/src/exec/score/cpu/a29k/configure.in (modified) (1 diff)
c/src/exec/score/cpu/h8300/configure.in (modified) (1 diff)
c/src/exec/score/cpu/hppa1.1/configure.in (modified) (1 diff)
c/src/exec/score/cpu/i386/configure.in (modified) (1 diff)
c/src/exec/score/cpu/i960/configure.in (modified) (1 diff)
c/src/exec/score/cpu/m68k/configure.in (modified) (1 diff)
c/src/exec/score/cpu/mips/configure.in (modified) (1 diff)
c/src/exec/score/cpu/mips64orion/configure.in (modified) (1 diff)
c/src/exec/score/cpu/no_cpu/configure.in (modified) (1 diff)
c/src/exec/score/cpu/powerpc/configure.in (modified) (2 diffs)
c/src/exec/score/cpu/sh/configure.in (modified) (2 diffs)
c/src/exec/score/cpu/sparc/configure.in (modified) (1 diff)
c/src/exec/score/cpu/unix/configure.in (modified) (1 diff)
c/src/exec/score/include/rtems/score/Makefile.am (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

aclocal/check-itron.m4

-                      r6c5aba2
+                      r04e6f7bf
 AC_REQUIRE([RTEMS_ENABLE_ITRON])dnl
 AC_CACHE_CHECK([whether BSP supports libitron],
+AC_CACHE_CHECK([whether CPU supports libitron],
   rtems_cv_HAS_ITRON_API,
   [dnl
 …
 fi
 AC_SUBST(HAS_ITRON_API)dnl
+if test x"${HAS_ITRON_API}" = x"yes";
+then
+  AC_DEFINE_UNQUOTED(RTEMS_ITRON_API,1,[if itron api is supported])
+fi
 ])

aclocal/check-multiprocessing.m4

-                      r6c5aba2
+                      r04e6f7bf
 fi
 AC_SUBST(HAS_MP)
+if test x"${HAS_MP}" = x"yes";
+then
+  AC_DEFINE_UNQUOTED(RTEMS_MULTIPROCESSING,1,[if multiprocessing is supported])
+fi
 ])

aclocal/check-posix.m4

-                      r6c5aba2
+                      r04e6f7bf
 AC_REQUIRE([RTEMS_ENABLE_POSIX])dnl
 AC_CACHE_CHECK([whether BSP supports libposix],
+AC_CACHE_CHECK([whether CPU supports libposix],
   rtems_cv_HAS_POSIX_API,
   [dnl
 …
 fi
 AC_SUBST(HAS_POSIX_API)dnl
+if test x"${HAS_POSIX_API}" = x"yes";
+then
+  AC_DEFINE_UNQUOTED(RTEMS_POSIX_API,1,[if posix api is supported])
+fi
 ])

aclocal/enable-inlines.m4

-                      r6c5aba2
+                      r04e6f7bf
 esac],[RTEMS_USE_MACROS=no])
 AC_SUBST(RTEMS_USE_MACROS)dnl
+if test x"${RTEMS_USE_MACROS}" = x"yes";
+then
+  AC_DEFINE_UNQUOTED(USE_MACROS,1,[if using macros])
+else
+  AC_DEFINE_UNQUOTED(USE_INLINES,1,[if using inlines])
+fi
 ])

aclocal/enable-rtemsbsp.m4

-                      r6c5aba2
+                      r04e6f7bf
 AC_MSG_RESULT(${RTEMS_BSP})
 AC_SUBST(RTEMS_BSP)
+## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c/$RTEMS_BSP
+## AC_SUBST(RTEMS_ROOT)
 ])
+AC_DEFUN(RTEMS_ENV_RTEMSCPU,
+[AC_REQUIRE([RTEMS_ENABLE_MULTILIB])
+if test x"$multilib" = x"no"; then
+  RTEMS_ENV_RTEMSBSP
+else
+  rtems_cv_RTEMS_BSP="multilib"
+  RTEMS_BSP="$rtems_cv_RTEMS_BSP"
+  AC_SUBST(RTEMS_BSP)
+## RTEMS_ROOT=$RTEMS_TOPdir/'$(top_builddir)'/c
+## AC_SUBST(RTEMS_ROOT)
+fi
+])

c/src/configure.in

-                      r6c5aba2
+                      r04e6f7bf
 AM_MAINTAINER_MODE
+RTEMS_ENABLE_MULTILIB
 RTEMS_ENV_RTEMSBSP
 RTEMS_CHECK_CPU
 …
 ## Note: the order of the directories below is essential
 cfg_subdirs="make"
+## Exclude exec from building if multilibs are enabled
+if test x"$multilib" = x"no"; then
 cfg_subdirs="$cfg_subdirs exec"
+fi
 cfg_subdirs="$cfg_subdirs lib"
 cfg_subdirs="$cfg_subdirs libmisc"

c/src/exec/configure.in

-                      r6c5aba2
+                      r04e6f7bf
 AM_INIT_AUTOMAKE(rtems-c-src-exec,$RTEMS_VERSION,no)
 AM_MAINTAINER_MODE
+RTEMS_ENABLE_MULTILIB
 RTEMS_ENABLE_MULTIPROCESSING
 RTEMS_ENABLE_POSIX
 …
 RTEMS_ENABLE_GCC28
 RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU
 RTEMS_CHECK_CPU

c/src/exec/itron/configure.in

r6c5aba2	r04e6f7bf
17	17	RTEMS_ENABLE_INLINES
18	18
19		RTEMS_ENV_RTEMS~~BSP~~
	19	RTEMS_ENV_RTEMSCPU
20	20
21	21	RTEMS_CHECK_CPU

c/src/exec/posix/configure.in

r6c5aba2	r04e6f7bf
17	17	RTEMS_ENABLE_INLINES
18	18
19		RTEMS_ENV_RTEMS~~BSP~~
	19	RTEMS_ENV_RTEMSCPU
20	20
21	21	RTEMS_CHECK_CPU

c/src/exec/score/cpu/a29k/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/h8300/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/hppa1.1/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/i386/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/i960/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/m68k/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/mips/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/mips64orion/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/no_cpu/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/powerpc/configure.in

-                      r6c5aba2
+                      r04e6f7bf
 AM_MAINTAINER_MODE
 RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU
 RTEMS_CHECK_CPU
 …
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
+# FIXME: This is in contradiction to multilibs
 RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
+# FIXME: This is in contradiction to multilibs
 AM_CONDITIONAL(PPC_NEW_EXCEPTION_PROCESSING,test "$RTEMS_CPU_MODEL" = "mpc750" -o "$RTEMS_CPU_MODEL" = "mpc604")

c/src/exec/score/cpu/sh/configure.in

-                      r6c5aba2
+                      r04e6f7bf
 AM_MAINTAINER_MODE
 RTEMS_ENV_RTEMSBSP
+RTEMS_ENV_RTEMSCPU
 RTEMS_CHECK_CPU
 …
 # Check if there is custom/*.cfg for this BSP
 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-RTEMS_CHECK_BSP_CACHE(RTEMS_BSP)
 # Explicitly list all Makefiles here

c/src/exec/score/cpu/sparc/configure.in

r6c5aba2	r04e6f7bf
13	13	AM_MAINTAINER_MODE
14	14
15		RTEMS_ENV_RTEMS~~BSP~~
	15	RTEMS_ENV_RTEMSCPU
16	16
17	17	RTEMS_CHECK_CPU

c/src/exec/score/cpu/unix/configure.in

r6c5aba2	r04e6f7bf
15	15	RTEMS_ENABLE_MULTIPROCESSING
16	16
17		RTEMS_ENV_RTEMS~~BSP~~
	17	RTEMS_ENV_RTEMSCPU
18	18
19	19	RTEMS_CHECK_CPU

c/src/exec/score/include/rtems/score/Makefile.am

r6c5aba2	r04e6f7bf
6	6
7	7	include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
8		~~include $(RTEMS_ROOT)/make/leaf.cfg~~
9	8
10	9	# We only build multiprocessing related files if HAS_MP was defined

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 04e6f7bf in rtems

Legend:

Download in other formats: