From 3b89891244d64e1053e758b05df1877b93de9e41 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 14 Apr 1998 20:54:26 +0000 Subject: Now accounts for region used by RTEMS malloc and extension used by newlib. --- cpukit/sapi/include/confdefs.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'cpukit') diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index df926196f5..6b7363f530 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -30,6 +30,15 @@ extern rtems_multiprocessing_table Multiprocessing_configuration; extern posix_api_configuration_table Configuration_POSIX_API; #endif +/* + * RTEMS C Library and Newlib support + * + * NOTE: This ends up defining these even when newlib is not used. + */ + +#define CONFIGURE_NEWLIB_EXTENSION 1 +#define CONFIGURE_MALLOC_REGION 1 + /* * Default User Initialization Task Table. This table guarantees that * one user initialization table is defined. @@ -412,6 +421,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = { #define CONFIGURE_MEMORY_FOR_MP 0 #endif + #ifndef CONFIGURE_MEMORY_OVERHEAD #define CONFIGURE_MEMORY_OVERHEAD 0 #endif @@ -428,10 +438,12 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = { CONFIGURE_MEMORY_FOR_SEMAPHORES(CONFIGURE_MAXIMUM_SEMAPHORES) + \ CONFIGURE_MEMORY_FOR_MESSAGE_QUEUES(CONFIGURE_MAXIMUM_MESSAGE_QUEUES) + \ CONFIGURE_MEMORY_FOR_PARTITIONS(CONFIGURE_MAXIMUM_PARTITIONS) + \ - CONFIGURE_MEMORY_FOR_REGIONS(CONFIGURE_MAXIMUM_REGIONS) + \ + CONFIGURE_MEMORY_FOR_REGIONS( \ + CONFIGURE_MAXIMUM_REGIONS + CONFIGURE_MALLOC_REGION ) + \ CONFIGURE_MEMORY_FOR_PORTS(CONFIGURE_MAXIMUM_PORTS) + \ CONFIGURE_MEMORY_FOR_PERIODS(CONFIGURE_MAXIMUM_PERIODS) + \ - CONFIGURE_MEMORY_FOR_USER_EXTENSIONS(CONFIGURE_MAXIMUM_USER_EXTENSIONS) + \ + CONFIGURE_MEMORY_FOR_USER_EXTENSIONS( \ + CONFIGURE_MAXIMUM_USER_EXTENSIONS + CONFIGURE_NEWLIB_EXTENSION ) + \ CONFIGURE_MEMORY_FOR_DEVICES(CONFIGURE_MAXIMUM_DEVICES) + \ CONFIGURE_MEMORY_FOR_MP + \ CONFIGURE_MEMORY_FOR_SYSTEM_OVEREHAD + \ @@ -464,7 +476,7 @@ rtems_api_configuration_table Configuration_RTEMS_API = { CONFIGURE_MAXIMUM_SEMAPHORES, CONFIGURE_MAXIMUM_MESSAGE_QUEUES, CONFIGURE_MAXIMUM_PARTITIONS, - CONFIGURE_MAXIMUM_REGIONS, + CONFIGURE_MAXIMUM_REGIONS + CONFIGURE_MALLOC_REGION, CONFIGURE_MAXIMUM_PORTS, CONFIGURE_MAXIMUM_PERIODS, CONFIGURE_INIT_TASK_TABLE_SIZE, @@ -488,7 +500,7 @@ posix_api_configuration_table Configuration_POSIX_API = { rtems_configuration_table Configuration = { CONFIGURE_EXECUTIVE_RAM_WORK_AREA, CONFIGURE_EXECUTIVE_RAM_SIZE, - CONFIGURE_MAXIMUM_USER_EXTENSIONS, + CONFIGURE_MAXIMUM_USER_EXTENSIONS + CONFIGURE_NEWLIB_EXTENSION, CONFIGURE_MICROSECONDS_PER_TICK, CONFIGURE_TICKS_PER_TIMESLICE, CONFIGURE_MAXIMUM_DEVICES, -- cgit v1.2.3