From df49c60c9671e4a28e636964d744c1f59fb6cb68 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Mon, 12 Jun 2000 15:00:15 +0000 Subject: Merged from 4.5.0-beta3a --- c/src/lib/libbsp/unix/Makefile.am | 4 ++-- c/src/lib/libbsp/unix/posix/Makefile.am | 4 ++-- c/src/lib/libbsp/unix/posix/clock/Makefile.am | 4 ++-- c/src/lib/libbsp/unix/posix/configure.in | 15 ++++++++----- c/src/lib/libbsp/unix/posix/console/Makefile.am | 4 ++-- c/src/lib/libbsp/unix/posix/include/Makefile.am | 4 ++-- c/src/lib/libbsp/unix/posix/include/bsp.h | 9 ++++++++ c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am | 4 ++-- c/src/lib/libbsp/unix/posix/startup/Makefile.am | 13 +++++------ c/src/lib/libbsp/unix/posix/startup/bspstart.c | 2 +- c/src/lib/libbsp/unix/posix/timer/Makefile.am | 6 ++--- c/src/lib/libbsp/unix/posix/tools/Makefile.am | 30 +++++++++++++++++++------ c/src/lib/libbsp/unix/posix/wrapup/Makefile.am | 4 ++-- 13 files changed, 65 insertions(+), 38 deletions(-) (limited to 'c/src/lib/libbsp/unix') diff --git a/c/src/lib/libbsp/unix/Makefile.am b/c/src/lib/libbsp/unix/Makefile.am index 6e02be9e8e..8515dfe07b 100644 --- a/c/src/lib/libbsp/unix/Makefile.am +++ b/c/src/lib/libbsp/unix/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/lib/libbsp/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am index 3dac7596bc..f3ddd4ff45 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal diff --git a/c/src/lib/libbsp/unix/posix/clock/Makefile.am b/c/src/lib/libbsp/unix/posix/clock/Makefile.am index 8bb38a0a0a..102b1aa9d8 100644 --- a/c/src/lib/libbsp/unix/posix/clock/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/clock/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/unix/posix/configure.in b/c/src/lib/libbsp/unix/posix/configure.in index 24398e2a0b..7287f9ebe0 100644 --- a/c/src/lib/libbsp/unix/posix/configure.in +++ b/c/src/lib/libbsp/unix/posix/configure.in @@ -11,17 +11,22 @@ RTEMS_CANONICAL_TARGET_CPU AM_INIT_AUTOMAKE(rtems-c-src-lib-libbsp-unix-posix,$RTEMS_VERSION,no) AM_MAINTAINER_MODE -RTEMS_PROG_CC_FOR_TARGET -RTEMS_PROG_CXX_FOR_TARGET -RTEMS_CANONICALIZE_TOOLS -RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENABLE_CXX +RTEMS_ENABLE_MULTIPROCESSING RTEMS_ENV_RTEMSBSP +RTEMS_CANONICAL_HOST + +RTEMS_PROG_CC_FOR_TARGET + +if test "$RTEMS_HAS_CPLUSPLUS" = "yes"; then + RTEMS_PROG_CXX_FOR_TARGET +fi + +RTEMS_CANONICALIZE_TOOLS RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP) RTEMS_CHECK_BSP_CACHE(RTEMS_BSP) RTEMS_CHECK_MULTIPROCESSING(RTEMS_BSP) -RTEMS_CANONICAL_HOST RTEMS_CHECK_CXX diff --git a/c/src/lib/libbsp/unix/posix/console/Makefile.am b/c/src/lib/libbsp/unix/posix/console/Makefile.am index 82b58ef82e..d4e5619fac 100644 --- a/c/src/lib/libbsp/unix/posix/console/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/console/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/unix/posix/include/Makefile.am b/c/src/lib/libbsp/unix/posix/include/Makefile.am index 08a74374a3..2f0d3a70f0 100644 --- a/c/src/lib/libbsp/unix/posix/include/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/include/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/unix/posix/include/bsp.h b/c/src/lib/libbsp/unix/posix/include/bsp.h index e775485090..ca0bdd0402 100644 --- a/c/src/lib/libbsp/unix/posix/include/bsp.h +++ b/c/src/lib/libbsp/unix/posix/include/bsp.h @@ -24,6 +24,15 @@ extern "C" { #include #include +/* + * confdefs.h overrides for this BSP: + * - number of termios serial ports (defaults to 1) + * - Interrupt stack space is not minimum if defined. + */ + +/* #define CONFIGURE_NUMBER_OF_TERMIOS_PORTS 2 */ +#define CONFIGURE_INTERRUPT_STACK_MEMORY (4 * 1024) + /* * Define the time limits for RTEMS Test Suite test durations. * Long test and short test duration limits are provided. These diff --git a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am b/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am index 1f1b64bb6d..b6d4bd3580 100644 --- a/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/shmsupp/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 diff --git a/c/src/lib/libbsp/unix/posix/startup/Makefile.am b/c/src/lib/libbsp/unix/posix/startup/Makefile.am index 709696b55e..56b991c4b6 100644 --- a/c/src/lib/libbsp/unix/posix/startup/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/startup/Makefile.am @@ -4,10 +4,10 @@ AUTOMAKE_OPTIONS = foreign 1.4 -PGM = ${ARCH}/startup.rel - VPATH = @srcdir@:@srcdir@/../../../shared +PGM = ${ARCH}/startup.rel + if HAS_CXX C_MAIN_C_FILES = else @@ -48,14 +48,13 @@ $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o: $(ARCH)/rtems-ctor.o $(INSTALL_DATA) $< $@ if HAS_CXX -all-local: $(ARCH) $(PGM) \ - $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \ - $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o +all-local: $(ARCH) $(PGM) $(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \ + $(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o else -all-local: $(ARCH) $(PGM) +all-local: $(ARCH) $(PGM) endif EXTRA_DIST = bspclean.c bspstart.c exit.c main.c no-ctor.c rtems-ctor.cc \ - setvec.c + setvec.c include $(top_srcdir)/../../../../../../automake/local.am diff --git a/c/src/lib/libbsp/unix/posix/startup/bspstart.c b/c/src/lib/libbsp/unix/posix/startup/bspstart.c index a9c682ca52..d4cfa83495 100644 --- a/c/src/lib/libbsp/unix/posix/startup/bspstart.c +++ b/c/src/lib/libbsp/unix/posix/startup/bspstart.c @@ -205,7 +205,7 @@ void bsp_start(void) * XXX; interrupt stack not currently used, so this doesn't matter */ - Cpu_table.interrupt_stack_size = (12 * 1024); + Cpu_table.interrupt_stack_size = CONFIGURE_INTERRUPT_STACK_MEMORY; Cpu_table.extra_mpci_receive_server_stack = 0; diff --git a/c/src/lib/libbsp/unix/posix/timer/Makefile.am b/c/src/lib/libbsp/unix/posix/timer/Makefile.am index 96bc1e047b..addbe3bfc5 100644 --- a/c/src/lib/libbsp/unix/posix/timer/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/timer/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 @@ -18,8 +18,6 @@ include $(top_srcdir)/../../../../../../automake/lib.am # (OPTIONAL) Add local stuff here using += # -AM_CFLAGS = $(CFLAGS_OS_V) - $(PGM): $(OBJS) $(make-rel) diff --git a/c/src/lib/libbsp/unix/posix/tools/Makefile.am b/c/src/lib/libbsp/unix/posix/tools/Makefile.am index 63929b60fc..6b498aa16a 100644 --- a/c/src/lib/libbsp/unix/posix/tools/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/tools/Makefile.am @@ -7,15 +7,31 @@ ACLOCAL_AMFLAGS = -I $(RTEMS_TOPdir)/aclocal if PERL perl_scripts = shmdump semdump +PERL_TMPINSTALL_FILES = $(PROJECT_ROOT)/posix/tests/shmdump \ + $(PROJECT_ROOT)/posix/tests/semdump endif -noinst_SCRIPTS=runtest looptest $(perl_scripts) +noinst_SCRIPTS = runtest looptest $(perl_scripts) + +$(PROJECT_ROOT)/posix/tests: + $(mkinstalldirs) $@ + +$(PROJECT_ROOT)/posix/tests/runtest: runtest + $(INSTALL_SCRIPT) $< $@ + +$(PROJECT_ROOT)/posix/tests/looptest: looptest + $(INSTALL_SCRIPT) $< $@ + +$(PROJECT_ROOT)/posix/tests/shmdump: shmdump + $(INSTALL_SCRIPT) $< $@ + +$(PROJECT_ROOT)/posix/tests/semdump: semdump + $(INSTALL_SCRIPT) $< $@ + +TMPINSTALL_FILES += $(PROJECT_ROOT)/posix/tests \ + $(PROJECT_ROOT)/posix/tests/runtest $(PROJECT_ROOT)/posix/tests/looptest ## HACK: install to build-tree -all-local: $(SCRIPTS) - $(mkinstalldirs) $(PROJECT_ROOT)/posix/tests - for i in $(SCRIPTS); do \ - $(INSTALL_SCRIPT) $$i $(PROJECT_ROOT)/posix/tests ; \ - done +all-local: $(TMPINSTALL_FILES) $(PERL_TMPINSTALL_FILES) -include $(top_srcdir)/../../../../../../../automake/local.am +include $(top_srcdir)/../../../../../../../automake/host.am diff --git a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.am b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.am index 3296105fea..ca08c1cbe8 100644 --- a/c/src/lib/libbsp/unix/posix/wrapup/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/wrapup/Makefile.am @@ -1,6 +1,6 @@ -## +## ## $Id$ -## +## AUTOMAKE_OPTIONS = foreign 1.4 -- cgit v1.2.3