2009-08-09 Xi Yang <hiyangxi@gmail.com>

	* libcsupport/Makefile.am, posix/Makefile.am, rtems/Makefile.am,
	sapi/Makefile.am, score/Makefile.am,
	score/include/rtems/score/heap.h: HEAP_BLOCK_USED_OVERHEAD was under
	by one uint32_t. This showed up in the unlimited and heapwalk tests
	on ARM targets.

7 files changed, 18 insertions, 4 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 446a105b1a..5bb9773b19 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,11 @@
+2009-08-09	Xi Yang <hiyangxi@gmail.com>
+
+	* libcsupport/Makefile.am, posix/Makefile.am, rtems/Makefile.am,
+	sapi/Makefile.am, score/Makefile.am,
+	score/include/rtems/score/heap.h: HEAP_BLOCK_USED_OVERHEAD was under
+	by one uint32_t. This showed up in the unlimited and heapwalk tests
+	on ARM targets.
+
 2009-08-06	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* score/src/objectextendinformation.c: Minor rework to eliminate
diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am
index 8b59c5830a..ad50d80723 100644
--- a/cpukit/libcsupport/Makefile.am
+++ b/cpukit/libcsupport/Makefile.am
@@ -113,6 +113,8 @@ libcsupport_a_SOURCES = src/gxx_wrappers.c src/getchark.c src/printk.c \
     $(BSD_LIBC_C_FILES) $(BASE_FS_C_FILES) $(MALLOC_C_FILES) \
     $(ERROR_C_FILES) $(ASSOCIATION_C_FILES)
 
+libcsupport_a_SOURCES += src/end_profile.c
+
 if UNIX
 libcsupport_a_SOURCES += src/unixlibc.c src/unixlibc_io.c src/hosterr.c
 else
diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index a229e1b69c..270a6e0b71 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -11,6 +11,7 @@ if LIBPOSIX
 
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 
+project_lib_LIBRARIES = libposix.a
 noinst_LIBRARIES = libposix.a
 libposix_a_CPPFLAGS = $(AM_CPPFLAGS)
 libposix_a_SOURCES =
diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am
index 400fc40ad7..863652e8f9 100644
--- a/cpukit/rtems/Makefile.am
+++ b/cpukit/rtems/Makefile.am
@@ -7,6 +7,7 @@ include $(top_srcdir)/automake/compile.am
 
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 
+project_lib_LIBRARIES = librtems.a
 noinst_LIBRARIES = librtems.a
 librtems_a_CPPFLAGS = $(AM_CPPFLAGS)
 
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index d279aa88e9..505fb1fd90 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -21,6 +21,7 @@ include_rtems_HEADERS += inline/rtems/chain.inl \
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 
 noinst_LIBRARIES = libsapi.a
+project_lib_LIBRARIES = libsapi.a
 libsapi_a_SOURCES = src/debug.c src/extension.c src/extensioncreate.c \
     src/extensiondelete.c src/extensionident.c src/fatal.c src/exinit.c \
     src/exshutdown.c src/io.c src/ioclose.c src/iocontrol.c src/iodata.c \
diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am
index de06241bd0..12a4be81f7 100644
--- a/cpukit/score/Makefile.am
+++ b/cpukit/score/Makefile.am
@@ -73,6 +73,7 @@ endif
 
 AM_CPPFLAGS += -D__RTEMS_INSIDE__
 
+project_lib_LIBRARIES = libscore.a
 noinst_LIBRARIES = libscore.a
 libscore_a_SOURCES =
 libscore_a_CPPFLAGS = $(AM_CPPFLAGS)
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
index 240cf0cd42..52b55fac70 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/score/include/rtems/score/heap.h
@@ -117,15 +117,15 @@ struct Heap_Block_struct {
 
 /**
  *  Offset of user data pointer from the block pointer. Equal to the
- *  offsetof(Heap_Block.next).
+ *  offset of(Heap_Block.next).
  */
 #define HEAP_BLOCK_USER_OFFSET (sizeof(uint32_t) * 2)
 
 /**
- *  Num bytes of overhead in used block. Equal to the sizeof(Heap_Block.size).
+ *  This is the number of bytes of overhead in a used block.
+ *  Equal to the sizeof(Heap_Block.previous and next).
  */
-#define HEAP_BLOCK_USED_OVERHEAD \
-  (HEAP_BLOCK_USER_OFFSET - HEAP_BLOCK_HEADER_OFFSET)
+#define HEAP_BLOCK_USED_OVERHEAD (sizeof(uint32_t) * 2)
 
 /** Size of the permanent dummy last block. */
 #define HEAP_OVERHEAD HEAP_BLOCK_USER_OFFSET