Index: libcfa/src/concurrency/kernel/startup.cfa
===================================================================
--- libcfa/src/concurrency/kernel/startup.cfa	(revision fe610abf35d4cefad3cca4fdc4a9af6b7a838d96)
+++ libcfa/src/concurrency/kernel/startup.cfa	(revision 028404fb3a9c1d07a784937b1d0d497ae2c6930f)
@@ -122,7 +122,8 @@
 extern "C" {
 	struct { __dllist_t(cluster) list; __spinlock_t lock; } __cfa_dbg_global_clusters;
-	extern size_t __cfa_page_size;
-	extern int __map_prot;
-}
+}
+
+extern size_t __page_size;
+extern int __map_prot;
 
 //-----------------------------------------------------------------------------
@@ -573,4 +574,5 @@
 }
 
+extern size_t __page_size;
 void ^?{}(processor & this) with( this ){
 	/* paranoid */ verify( !__atomic_load_n(&do_terminate, __ATOMIC_ACQUIRE) );
@@ -738,17 +740,17 @@
 	void * stack;
 	#if CFA_PROCESSOR_USE_MMAP
-		stacksize = ceiling( stacksize, __cfa_page_size ) + __cfa_page_size;
+		stacksize = ceiling( stacksize, __page_size ) + __page_size;
 		stack = mmap(0p, stacksize, __map_prot, MAP_PRIVATE | MAP_ANONYMOUS, 0, 0);
 		if(stack == ((void*)-1)) {
 			abort( "pthread stack creation : internal error, mmap failure, error(%d) %s.", errno, strerror( errno ) );
 		}
-		if ( mprotect( stack, __cfa_page_size, PROT_NONE ) == -1 ) {
+		if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
 			abort( "pthread stack creation : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
 		} // if
 	#else
 		__cfaabi_dbg_debug_do(
-			stack = memalign( __cfa_page_size, stacksize + __cfa_page_size );
+			stack = memalign( __page_size, stacksize + __page_size );
 			// pthread has no mechanism to create the guard page in user supplied stack.
-			if ( mprotect( stack, __cfa_page_size, PROT_NONE ) == -1 ) {
+			if ( mprotect( stack, __page_size, PROT_NONE ) == -1 ) {
 				abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
 			} // if
@@ -777,5 +779,5 @@
 		check( pthread_attr_getstacksize( &attr, &stacksize ), "pthread_attr_getstacksize" );
 		assert( stacksize >= PTHREAD_STACK_MIN );
-		stacksize += __cfa_page_size;
+		stacksize += __page_size;
 
 		if(munmap(stack, stacksize) == -1) {
@@ -785,5 +787,5 @@
 		__cfaabi_dbg_debug_do(
 			// pthread has no mechanism to create the guard page in user supplied stack.
-			if ( mprotect( stack, __cfa_page_size, __map_prot ) == -1 ) {
+			if ( mprotect( stack, __page_size, __map_prot ) == -1 ) {
 				abort( "mprotect : internal error, mprotect failure, error(%d) %s.", errno, strerror( errno ) );
 			} // if