diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-12 20:53:33 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-08-12 20:53:33 +0000 |
| commit | 717391f502346161f64a26d3b6c4ea0aef0fb39f (patch) | |
| tree | e0cc472327cf628f75061b970cc96662de3e9b0b /cpukit | |
| parent | 2009-08-12 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-717391f502346161f64a26d3b6c4ea0aef0fb39f.tar.bz2 | |
2009-08-12 Joel Sherrill <joel.sherrill@OARcorp.com>
* libcsupport/src/malloc_boundary.c: This is currently non-funcitonal.
Do not build it when doing coverage until it works again.
* sapi/include/confdefs.h: Address linking errors when building for
configuration.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/malloc_boundary.c | 5 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 25 |
3 files changed, 31 insertions, 6 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 689e36bba1..b5fb9e6adc 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,12 @@ 2009-08-12 Joel Sherrill <joel.sherrill@OARcorp.com> + * libcsupport/src/malloc_boundary.c: This is currently non-funcitonal. + Do not build it when doing coverage until it works again. + * sapi/include/confdefs.h: Address linking errors when building for + configuration. + +2009-08-12 Joel Sherrill <joel.sherrill@OARcorp.com> + * libcsupport/Makefile.am: Obsolete coverage file. * libcsupport/src/end_profile.c: Removed. diff --git a/cpukit/libcsupport/src/malloc_boundary.c b/cpukit/libcsupport/src/malloc_boundary.c index 4f5bbc47c6..4dd9bb6916 100644 --- a/cpukit/libcsupport/src/malloc_boundary.c +++ b/cpukit/libcsupport/src/malloc_boundary.c @@ -38,7 +38,10 @@ #include <stdio.h> +/* only supported on newlib targets */ #ifdef RTEMS_NEWLIB +/* not completely implemented so not included in coverage analysis */ +#ifndef RTEMS_COVERAGE #define SENTINELSIZE 12 #define SENTINEL "\xD1\xAC\xB2\xF1" "BITE ME" @@ -191,4 +194,4 @@ void checkMallocArena(void) } #endif - +#endif diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 57b7d5cc52..6a3df813c8 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -99,8 +99,13 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #endif -#ifdef CONFIGURE_APPLICATION_DISABLE_FILESYSTEM - #define CONFIGURE_HAS_OWN_MOUNT_TABLE +/* + * When building for coverage, we always need a mount table + */ +#if !defined(RTEMS_COVERAGE) + #ifdef CONFIGURE_APPLICATION_DISABLE_FILESYSTEM + #define CONFIGURE_HAS_OWN_MOUNT_TABLE + #endif #endif /** @@ -171,7 +176,9 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #ifdef CONFIGURE_INIT #ifdef CONFIGURE_APPLICATION_DISABLE_FILESYSTEM - extern uint32_t rtems_device_table_size; + #if defined(RTEMS_COVERAGE) + uint32_t rtems_device_table_size = 0; + #endif #define CONFIGURE_MEMORY_FOR_DEVFS 0 #elif defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) #ifndef CONFIGURE_MAXIMUM_DEVICES @@ -179,7 +186,12 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #endif #include <rtems/devfs.h> uint32_t rtems_device_table_size = CONFIGURE_MAXIMUM_DEVICES; - #define CONFIGURE_MEMORY_FOR_DEVFS _Configure_Object_RAM(CONFIGURE_MAXIMUM_DEVICES, sizeof (rtems_device_name_t)) + #define CONFIGURE_MEMORY_FOR_DEVFS \ + _Configure_Object_RAM(CONFIGURE_MAXIMUM_DEVICES, \ + sizeof (rtems_device_name_t)) + #elif defined(RTEMS_COVERAGE) + uint32_t rtems_device_table_size = 0; + #define CONFIGURE_MEMORY_FOR_DEVFS 0 #else #define CONFIGURE_MEMORY_FOR_DEVFS 0 #endif @@ -207,8 +219,11 @@ rtems_fs_init_functions_t rtems_fs_init_helper = #ifdef CONFIGURE_INIT /** * This disables the inclusion of pipe support in the full IMFS. + * + * NOTE: When building for coverage, we need this variable all the time. */ - #if !defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) + #if !defined(CONFIGURE_USE_DEVFS_AS_BASE_FILESYSTEM) || \ + defined(RTEMS_COVERAGE) #if defined(CONFIGURE_PIPES_ENABLED) bool rtems_pipe_configured = true; #else |