From dd0e6bf6d6e946c28e72a81bb25f1e70cd4dff4c Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 29 Nov 2007 06:40:47 +0000 Subject: 2007-11-29 Chris Johns * iostream/Makefile.am: Change the executable name so it does not create a file which is the same name as the standard header file. * iostream/system.h: Need to increase the number of semaphores for the libstdc++ runtime. --- testsuites/samples/iostream/Makefile.am | 14 +++++++------- testsuites/samples/iostream/system.h | 2 ++ 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'testsuites/samples/iostream') diff --git a/testsuites/samples/iostream/Makefile.am b/testsuites/samples/iostream/Makefile.am index bf333454b5..db49fe8495 100644 --- a/testsuites/samples/iostream/Makefile.am +++ b/testsuites/samples/iostream/Makefile.am @@ -4,8 +4,8 @@ MANAGERS = all -rtems_tests_PROGRAMS = iostream.exe -iostream_exe_SOURCES = init.cc system.h +rtems_tests_PROGRAMS = cxx_iostream.exe +cxx_iostream_exe_SOURCES = init.cc system.h dist_rtems_tests_DATA = iostream.scn dist_rtems_tests_DATA += iostream.doc @@ -14,13 +14,13 @@ include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../automake/compile.am include $(top_srcdir)/../automake/leaf.am -iostream_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) +cxx_iostream_exe_LDADD = $(MANAGERS_NOT_WANTED:%=$(PROJECT_LIB)/no-%.rel) -LINK_OBJS = $(iostream_exe_OBJECTS) $(iostream_exe_LDADD) -LINK_LIBS = $(iostream_exe_LDLIBS) +LINK_OBJS = $(cxx_iostream_exe_OBJECTS) $(cxx_iostream_exe_LDADD) +LINK_LIBS = $(cxx_iostream_exe_LDLIBS) -iostream.exe$(EXEEXT): $(iostream_exe_OBJECTS) $(iostream_exe_DEPENDENCIES) - @rm -f iostream.exe$(EXEEXT) +cxx_iostream.exe$(EXEEXT): $(cxx_iostream_exe_OBJECTS) $(cxx_iostream_exe_DEPENDENCIES) + @rm -f cxx_iostream.exe$(EXEEXT) $(make-cxx-exe) include $(top_srcdir)/../automake/local.am diff --git a/testsuites/samples/iostream/system.h b/testsuites/samples/iostream/system.h index e738b1a631..be7660867b 100644 --- a/testsuites/samples/iostream/system.h +++ b/testsuites/samples/iostream/system.h @@ -29,6 +29,8 @@ rtems_task Init( #define CONFIGURE_MAXIMUM_TASKS 1 +#define CONFIGURE_MAXIMUM_SEMAPHORES 5 + #define CONFIGURE_RTEMS_INIT_TASKS_TABLE #define CONFIGURE_USE_MINIIMFS_AS_BASE_FILESYSTEM -- cgit v1.2.3