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.
This commit is contained in:
Chris Johns
2007-11-29 06:40:47 +00:00
parent 922183809e
commit dd0e6bf6d6
2 changed files with 9 additions and 7 deletions

View File

@@ -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

View File

@@ -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