From d2c26e4bad11cf21129149adcc40b648ced967da Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Tue, 11 Mar 2003 08:10:00 +0000 Subject: Merger from rtems-4-6-branch. --- cpukit/aclocal/rtems-top.m4 | 2 +- cpukit/sapi/ChangeLog | 16 +++++++ cpukit/sapi/Makefile.am | 3 -- cpukit/sapi/include/.cvsignore | 2 - cpukit/sapi/include/rtems/.cvsignore | 3 -- cpukit/sapi/include/rtems/sptables.h | 73 +++++++++++++++++++++++++++++++ cpukit/sapi/inline/.cvsignore | 2 - cpukit/sapi/inline/rtems/.cvsignore | 2 - cpukit/sapi/macros/.cvsignore | 2 - cpukit/sapi/macros/rtems/.cvsignore | 2 - cpukit/sapi/src/.cvsignore | 2 - cpukit/score/ChangeLog | 4 ++ cpukit/score/cpu/arm/ChangeLog | 4 ++ cpukit/score/cpu/arm/configure.ac | 1 - cpukit/score/cpu/c4x/ChangeLog | 4 ++ cpukit/score/cpu/c4x/configure.ac | 1 - cpukit/score/cpu/h8300/ChangeLog | 4 ++ cpukit/score/cpu/h8300/configure.ac | 1 - cpukit/score/cpu/hppa1.1/ChangeLog | 4 ++ cpukit/score/cpu/hppa1.1/configure.ac | 1 - cpukit/score/cpu/i386/ChangeLog | 4 ++ cpukit/score/cpu/i386/configure.ac | 1 - cpukit/score/cpu/i960/ChangeLog | 4 ++ cpukit/score/cpu/i960/configure.ac | 1 - cpukit/score/cpu/m68k/ChangeLog | 4 ++ cpukit/score/cpu/m68k/configure.ac | 1 - cpukit/score/cpu/mips/ChangeLog | 4 ++ cpukit/score/cpu/mips/configure.ac | 1 - cpukit/score/cpu/mips64orion/ChangeLog | 4 ++ cpukit/score/cpu/mips64orion/configure.ac | 1 - cpukit/score/cpu/no_cpu/ChangeLog | 4 ++ cpukit/score/cpu/no_cpu/configure.ac | 1 - cpukit/score/cpu/or32/ChangeLog | 4 ++ cpukit/score/cpu/or32/configure.ac | 1 - cpukit/score/cpu/powerpc/ChangeLog | 4 ++ cpukit/score/cpu/powerpc/configure.ac | 1 - cpukit/score/cpu/sh/ChangeLog | 4 ++ cpukit/score/cpu/sh/configure.ac | 1 - cpukit/score/cpu/sparc/ChangeLog | 4 ++ cpukit/score/cpu/sparc/configure.ac | 1 - cpukit/score/cpu/unix/ChangeLog | 4 ++ cpukit/score/cpu/unix/configure.ac | 1 - cpukit/score/include/rtems/system.h | 3 +- 43 files changed, 156 insertions(+), 35 deletions(-) delete mode 100644 cpukit/sapi/include/.cvsignore delete mode 100644 cpukit/sapi/include/rtems/.cvsignore create mode 100644 cpukit/sapi/include/rtems/sptables.h delete mode 100644 cpukit/sapi/inline/.cvsignore delete mode 100644 cpukit/sapi/inline/rtems/.cvsignore delete mode 100644 cpukit/sapi/macros/.cvsignore delete mode 100644 cpukit/sapi/macros/rtems/.cvsignore delete mode 100644 cpukit/sapi/src/.cvsignore diff --git a/cpukit/aclocal/rtems-top.m4 b/cpukit/aclocal/rtems-top.m4 index 25572244d3..f8c3fc90ec 100644 --- a/cpukit/aclocal/rtems-top.m4 +++ b/cpukit/aclocal/rtems-top.m4 @@ -8,8 +8,8 @@ dnl AC_DEFUN(RTEMS_TOP, [dnl AC_REQUIRE([RTEMS_VERSIONING]) +AC_CONFIG_AUX_DIR([$1]) AC_CHECK_PROGS(MAKE, gmake make) -AC_BEFORE([$0], [AC_CONFIG_AUX_DIR])dnl AC_BEFORE([$0], [AM_INIT_AUTOMAKE])dnl AC_PREFIX_DEFAULT([/opt/rtems]) diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog index de76eb4b9c..c135074183 100644 --- a/cpukit/sapi/ChangeLog +++ b/cpukit/sapi/ChangeLog @@ -1,3 +1,19 @@ +2003-03-06 Ralf Corsepius + + * Makefile.am: Remove stray reference to sptables.h.in. + +2003-03-06 Ralf Corsepius + + * include/rtems/sptables.h.in: Remove. + * include/rtems/sptables.h: New. + * include/.cvsignore: Remove. + * include/rtems/.cvsignore: Remove. + * inline/.cvsignore: Remove. + * inline/rtems/.cvsignore: Remove. + * macros/.cvsignore: Remove. + * macros/rtems/.cvsignore: Remove. + * src/.cvsignore: Remove. + 2003-02-28 Ralf Corsepius * include/rtems/sptables.h.in: Remove RTEMS_VERSION (Moved to diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am index 39b19b3883..5d66a261e2 100644 --- a/cpukit/sapi/Makefile.am +++ b/cpukit/sapi/Makefile.am @@ -33,9 +33,6 @@ PREINSTALL_FILES += $(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%) EXTRA_DIST = include/rtems/README -include/rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems/sptables.h.in - cd $(top_builddir) && CONFIG_FILES=sapi/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status - ## inline inline_H_FILES = inline/rtems/extension.inl diff --git a/cpukit/sapi/include/.cvsignore b/cpukit/sapi/include/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/cpukit/sapi/include/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/cpukit/sapi/include/rtems/.cvsignore b/cpukit/sapi/include/rtems/.cvsignore deleted file mode 100644 index 4f09d19b6d..0000000000 --- a/cpukit/sapi/include/rtems/.cvsignore +++ /dev/null @@ -1,3 +0,0 @@ -Makefile -Makefile.in -sptables.h diff --git a/cpukit/sapi/include/rtems/sptables.h b/cpukit/sapi/include/rtems/sptables.h new file mode 100644 index 0000000000..ddd19afbb0 --- /dev/null +++ b/cpukit/sapi/include/rtems/sptables.h @@ -0,0 +1,73 @@ +/* sptables.h + * + * This include file contains the executive's pre-initialized tables + * used when in a single processor configuration. + * + * COPYRIGHT (c) 1989-1999. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.OARcorp.com/rtems/license.html. + * + * $Id$ + */ + +#ifndef __RTEMS_SPTABLES_h +#define __RTEMS_SPTABLES_h + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#if defined(RTEMS_MULTIPROCESSING) +#include +#endif +#include +#include +#include +#include +#include +#include + +/* + * This is the default Multiprocessing Configuration Table. + * It is used in single processor configurations. + */ + +#if defined(SAPI_INIT) +const rtems_multiprocessing_table + _Initialization_Default_multiprocessing_table = { + 1, /* local node number */ + 1, /* maximum number nodes in system */ + 0, /* maximum number global objects */ + 0, /* maximum number proxies */ + NULL, /* pointer to MPCI address table */ +}; +#else +extern const rtems_multiprocessing_table + _Initialization_Default_multiprocessing_table; +#endif + +extern const char _RTEMS_version[]; + +#ifdef __cplusplus +} +#endif + +#endif +/* end of include file */ diff --git a/cpukit/sapi/inline/.cvsignore b/cpukit/sapi/inline/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/cpukit/sapi/inline/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/cpukit/sapi/inline/rtems/.cvsignore b/cpukit/sapi/inline/rtems/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/cpukit/sapi/inline/rtems/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/cpukit/sapi/macros/.cvsignore b/cpukit/sapi/macros/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/cpukit/sapi/macros/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/cpukit/sapi/macros/rtems/.cvsignore b/cpukit/sapi/macros/rtems/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/cpukit/sapi/macros/rtems/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/cpukit/sapi/src/.cvsignore b/cpukit/sapi/src/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/cpukit/sapi/src/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog index 3eaa423ba1..d53dfc6537 100644 --- a/cpukit/score/ChangeLog +++ b/cpukit/score/ChangeLog @@ -1,3 +1,7 @@ +2002-03-04 Ralf Corsepius + + * include/rtems/system.h: Add __RTEMS_REVISION__. + 2002-02-28 Ralf Corsepius * include/rtems/system.h: Add __RTEMS_MAJOR__, __RTEMS_MINOR__. diff --git a/cpukit/score/cpu/arm/ChangeLog b/cpukit/score/cpu/arm/ChangeLog index 20796db12a..0773ffc585 100644 --- a/cpukit/score/cpu/arm/ChangeLog +++ b/cpukit/score/cpu/arm/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-03-03 Ralf Corsepius * rtems/score/arm.h: Remove ARM_HAS_THUMB (Unused). diff --git a/cpukit/score/cpu/arm/configure.ac b/cpukit/score/cpu/arm/configure.ac index d60a19052a..ef0201bd72 100644 --- a/cpukit/score/cpu/arm/configure.ac +++ b/cpukit/score/cpu/arm/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-arm],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/c4x/ChangeLog b/cpukit/score/cpu/c4x/ChangeLog index 1c88481777..3aedd9dec3 100644 --- a/cpukit/score/cpu/c4x/ChangeLog +++ b/cpukit/score/cpu/c4x/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Joel Sherrill * irq.c: Rework logic that decides when to call diff --git a/cpukit/score/cpu/c4x/configure.ac b/cpukit/score/cpu/c4x/configure.ac index 20acef65c1..10f417dc05 100644 --- a/cpukit/score/cpu/c4x/configure.ac +++ b/cpukit/score/cpu/c4x/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-c4x],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/h8300/ChangeLog b/cpukit/score/cpu/h8300/ChangeLog index 53b3e7aed3..0844d61686 100644 --- a/cpukit/score/cpu/h8300/ChangeLog +++ b/cpukit/score/cpu/h8300/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/h8300/configure.ac b/cpukit/score/cpu/h8300/configure.ac index b9a9f2a1ed..6cf8e67e2a 100644 --- a/cpukit/score/cpu/h8300/configure.ac +++ b/cpukit/score/cpu/h8300/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-h8300],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/hppa1.1/ChangeLog b/cpukit/score/cpu/hppa1.1/ChangeLog index ee1c58a6a2..b13f56db05 100644 --- a/cpukit/score/cpu/hppa1.1/ChangeLog +++ b/cpukit/score/cpu/hppa1.1/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/hppa1.1/configure.ac b/cpukit/score/cpu/hppa1.1/configure.ac index 8d95f73c71..2e71ef43ea 100644 --- a/cpukit/score/cpu/hppa1.1/configure.ac +++ b/cpukit/score/cpu/hppa1.1/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-hppa1.1],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/i386/ChangeLog b/cpukit/score/cpu/i386/ChangeLog index 0fcd00b84a..77bf188e71 100644 --- a/cpukit/score/cpu/i386/ChangeLog +++ b/cpukit/score/cpu/i386/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/i386/configure.ac b/cpukit/score/cpu/i386/configure.ac index 77b7ad5006..54d49b142a 100644 --- a/cpukit/score/cpu/i386/configure.ac +++ b/cpukit/score/cpu/i386/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-i386],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/i960/ChangeLog b/cpukit/score/cpu/i960/ChangeLog index df9e186e12..d681013b39 100644 --- a/cpukit/score/cpu/i960/ChangeLog +++ b/cpukit/score/cpu/i960/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/i960/configure.ac b/cpukit/score/cpu/i960/configure.ac index 067e6964cc..1cc5ad745a 100644 --- a/cpukit/score/cpu/i960/configure.ac +++ b/cpukit/score/cpu/i960/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-i960],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/m68k/ChangeLog b/cpukit/score/cpu/m68k/ChangeLog index 5cb173edbf..55602c4389 100644 --- a/cpukit/score/cpu/m68k/ChangeLog +++ b/cpukit/score/cpu/m68k/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-06 Ilya Alexeev * m68360.h: Correct the order of fields in the ethernet structure diff --git a/cpukit/score/cpu/m68k/configure.ac b/cpukit/score/cpu/m68k/configure.ac index ee57c640ff..e2609c6605 100644 --- a/cpukit/score/cpu/m68k/configure.ac +++ b/cpukit/score/cpu/m68k/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-m68k],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/mips/ChangeLog b/cpukit/score/cpu/mips/ChangeLog index 13d5377691..15bc930fb0 100644 --- a/cpukit/score/cpu/mips/ChangeLog +++ b/cpukit/score/cpu/mips/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/mips/configure.ac b/cpukit/score/cpu/mips/configure.ac index 9f652414c5..83de66fd5c 100644 --- a/cpukit/score/cpu/mips/configure.ac +++ b/cpukit/score/cpu/mips/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-mips],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/mips64orion/ChangeLog b/cpukit/score/cpu/mips64orion/ChangeLog index 2437fa190b..d496b6d967 100644 --- a/cpukit/score/cpu/mips64orion/ChangeLog +++ b/cpukit/score/cpu/mips64orion/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/mips64orion/configure.ac b/cpukit/score/cpu/mips64orion/configure.ac index f0990ececc..a881ca81f8 100644 --- a/cpukit/score/cpu/mips64orion/configure.ac +++ b/cpukit/score/cpu/mips64orion/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-mips64orion],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/no_cpu/ChangeLog b/cpukit/score/cpu/no_cpu/ChangeLog index f9b51ccfb8..6e7fcd367c 100644 --- a/cpukit/score/cpu/no_cpu/ChangeLog +++ b/cpukit/score/cpu/no_cpu/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-11 Joel Sherrill * cpu_asm.c: Rework logic that decides when to call diff --git a/cpukit/score/cpu/no_cpu/configure.ac b/cpukit/score/cpu/no_cpu/configure.ac index 052ea482ba..5cd100a1ff 100644 --- a/cpukit/score/cpu/no_cpu/configure.ac +++ b/cpukit/score/cpu/no_cpu/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-no_cpu],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.c]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/or32/ChangeLog b/cpukit/score/cpu/or32/ChangeLog index 3dbdca096e..886f49ca53 100644 --- a/cpukit/score/cpu/or32/ChangeLog +++ b/cpukit/score/cpu/or32/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/or32/configure.ac b/cpukit/score/cpu/or32/configure.ac index e46b492728..188fac3dd9 100644 --- a/cpukit/score/cpu/or32/configure.ac +++ b/cpukit/score/cpu/or32/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-or32],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.c]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/powerpc/ChangeLog b/cpukit/score/cpu/powerpc/ChangeLog index 11d496556e..744e94d5f8 100644 --- a/cpukit/score/cpu/powerpc/ChangeLog +++ b/cpukit/score/cpu/powerpc/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-02-20 Till Straumann PR 349/bsps diff --git a/cpukit/score/cpu/powerpc/configure.ac b/cpukit/score/cpu/powerpc/configure.ac index f9b352b662..f5b78b074a 100644 --- a/cpukit/score/cpu/powerpc/configure.ac +++ b/cpukit/score/cpu/powerpc/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-powerpc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([asm.h]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/sh/ChangeLog b/cpukit/score/cpu/sh/ChangeLog index 1c0687a5ef..5af8b7d1c5 100644 --- a/cpukit/score/cpu/sh/ChangeLog +++ b/cpukit/score/cpu/sh/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/sh/configure.ac b/cpukit/score/cpu/sh/configure.ac index 295fd69518..bef78182fa 100644 --- a/cpukit/score/cpu/sh/configure.ac +++ b/cpukit/score/cpu/sh/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-sh],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([asm.h]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/sparc/ChangeLog b/cpukit/score/cpu/sparc/ChangeLog index d29cd0ae03..f5460bb2e1 100644 --- a/cpukit/score/cpu/sparc/ChangeLog +++ b/cpukit/score/cpu/sparc/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2002-12-11 Ralf Corsepius * configure.ac: Require autoconf-2.57 + automake-1.7.2. diff --git a/cpukit/score/cpu/sparc/configure.ac b/cpukit/score/cpu/sparc/configure.ac index d3f7348014..c68aca9d02 100644 --- a/cpukit/score/cpu/sparc/configure.ac +++ b/cpukit/score/cpu/sparc/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-sparc],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu_asm.S]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/cpu/unix/ChangeLog b/cpukit/score/cpu/unix/ChangeLog index b41efa34a7..580ae2e08b 100644 --- a/cpukit/score/cpu/unix/ChangeLog +++ b/cpukit/score/cpu/unix/ChangeLog @@ -1,3 +1,7 @@ +2003-03-06 Ralf Corsepius + + * configure.ac: Remove AC_CONFIG_AUX_DIR. + 2003-01-03 Joel Sherrill * rtems/score/cpu.h: Per PR315, eliminate warning for structure diff --git a/cpukit/score/cpu/unix/configure.ac b/cpukit/score/cpu/unix/configure.ac index 2a1c4f45ba..1a4e02e7fe 100644 --- a/cpukit/score/cpu/unix/configure.ac +++ b/cpukit/score/cpu/unix/configure.ac @@ -6,7 +6,6 @@ AC_PREREQ(2.57) AC_INIT([rtems-cpukit-score-cpu-unix],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com]) AC_CONFIG_SRCDIR([cpu.c]) RTEMS_TOP(../../../..) -AC_CONFIG_AUX_DIR(../../../..) RTEMS_CANONICAL_TARGET_CPU diff --git a/cpukit/score/include/rtems/system.h b/cpukit/score/include/rtems/system.h index fc013750ff..97faf8b042 100644 --- a/cpukit/score/include/rtems/system.h +++ b/cpukit/score/include/rtems/system.h @@ -22,11 +22,12 @@ extern "C" { #endif /* - * Major and minor version number of RTEMS. + * Major, minor, revision version numbers of RTEMS. * Use these macros to test for features in specific releases. */ #define __RTEMS_MAJOR__ 4 #define __RTEMS_MINOR__ 6 +#define __RTEMS_REVISION__ 0 /* * The cpu options include file defines all cpu dependent -- cgit v1.2.3