diff options
| author | Chris Johns <chrisj@rtems.org> | 2007-11-29 06:40:47 +0000 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2007-11-29 06:40:47 +0000 |
| commit | dd0e6bf6d6e946c28e72a81bb25f1e70cd4dff4c (patch) | |
| tree | 6a67b767fdf55389fbea71a67ffcede1a4c403f6 /testsuites/samples/iostream | |
| parent | 2007-11-28 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-dd0e6bf6d6e946c28e72a81bb25f1e70cd4dff4c.tar.bz2 | |
2007-11-29 Chris Johns <chrisj@rtems.org>
* 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.
Diffstat (limited to 'testsuites/samples/iostream')
| -rw-r--r-- | testsuites/samples/iostream/Makefile.am | 14 | ||||
| -rw-r--r-- | testsuites/samples/iostream/system.h | 2 |
2 files changed, 9 insertions, 7 deletions
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 |