diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-12 12:52:12 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2000-09-12 12:52:12 +0000 |
| commit | 03d570670a04a111a043b979fe4eb09da6168fb8 (patch) | |
| tree | 2963e020c1184ce7b4ca4ef3260e617c1fa6a885 | |
| parent | 2000-09-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-03d570670a04a111a043b979fe4eb09da6168fb8.tar.bz2 | |
2000-09-12 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* aclocal/enable-rtemsbsp.m4: Add RTEMS_ENABLE_BARE,
AC_SUBST(BARE_CPU_MODEL),AC_SUBST(BARE_CPU_CFLAGS).
* aclocal/i386-gas-code16.m4: AC_DEFINE NEW_GAS.
* aclocal/target.m4: Cleanup comments
* Automake/compile.am: Add DEFS support to keep building happy.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | aclocal/enable-rtemsbsp.m4 | 5 | ||||
| -rw-r--r-- | aclocal/i386-gas-code16.m4 | 1 | ||||
| -rw-r--r-- | aclocal/target.m4 | 4 | ||||
| -rw-r--r-- | automake/compile.am | 12 |
5 files changed, 27 insertions, 3 deletions
@@ -1,3 +1,11 @@ +2000-09-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * aclocal/enable-rtemsbsp.m4: Add RTEMS_ENABLE_BARE, + AC_SUBST(BARE_CPU_MODEL),AC_SUBST(BARE_CPU_CFLAGS). + * aclocal/i386-gas-code16.m4: AC_DEFINE NEW_GAS. + * aclocal/target.m4: Cleanup comments + * Automake/compile.am: Add DEFS support to keep building happy. + 2000-09-06 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * aclocal/project-root.m4: Introduce PROJECT_TOPdir, add comments. diff --git a/aclocal/enable-rtemsbsp.m4 b/aclocal/enable-rtemsbsp.m4 index 568979c9da..fd31997d3c 100644 --- a/aclocal/enable-rtemsbsp.m4 +++ b/aclocal/enable-rtemsbsp.m4 @@ -34,12 +34,17 @@ RTEMS_BSP="$rtems_cv_RTEMS_BSP" AC_MSG_RESULT(${RTEMS_BSP}) AC_SUBST(RTEMS_BSP) +RTEMS_ENABLE_BARE +AC_SUBST(BARE_CPU_MODEL) +AC_SUBST(BARE_CPU_CFLAGS) + ## 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 RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) diff --git a/aclocal/i386-gas-code16.m4 b/aclocal/i386-gas-code16.m4 index ec0314980e..864f38a5bd 100644 --- a/aclocal/i386-gas-code16.m4 +++ b/aclocal/i386-gas-code16.m4 @@ -23,5 +23,6 @@ EOF RTEMS_GAS_CODE16="$rtems_cv_prog_gas_code16" fi AC_SUBST(RTEMS_GAS_CODE16) + AC_DEFINE_UNQUOTED(NEW_GAS,1,[if using 16 bit mode assembler support]) ]) diff --git a/aclocal/target.m4 b/aclocal/target.m4 index 8312ff3438..517811d51b 100644 --- a/aclocal/target.m4 +++ b/aclocal/target.m4 @@ -8,9 +8,7 @@ target_subdirs="RTEMS_TGT_SUBDIRS" AC_SUBST(target_subdirs) ]) -dnl This is a subroutine of AC_OUTPUT. -dnl It is called after running config.status. -dnl AC_OUTPUT_SUBDIRS(DIRECTORY...) +dnl Derived from automake-1.4's AC_OUTPUT_SUBDIRS AC_DEFUN(RTEMS_OUTPUT_SUBDIRS, [ if test "$no_recursion" != yes; then diff --git a/automake/compile.am b/automake/compile.am index 878bf16b4e..ea4018ea3b 100644 --- a/automake/compile.am +++ b/automake/compile.am @@ -4,3 +4,15 @@ ## In future this file shall take compilation rules, now contained in ## gcc-target-default.cfg ## + +## ------------------------------------------------------------------------- +## NOTE: This is experimental. +## +## Expect frequent changes :( +## ------------------------------------------------------------------------- + +DEFS = @DEFS@ + +## +## FIXME: DEFS and INCLUDES should not be passed as AM_CPPFLAGS +AM_CPPFLAGS += $(DEFS) $(INCLUDES) $(RTEMS_CPPFLAGS) |