diff --git a/arch/arm/include/arch.h b/arch/arm/include/arch.h
index ea8bd1a99e..1d1661c0d9 100644
--- a/arch/arm/include/arch.h
+++ b/arch/arm/include/arch.h
@@ -133,10 +133,10 @@ do { \
 
 struct group_addrenv_s
 {
-  FAR uint32_t *text[ARCH_TEXT_NSECTS];
-  FAR uint32_t *data[ARCH_DATA_NSECTS];
+  FAR uintptr_t *text[ARCH_TEXT_NSECTS];
+  FAR uintptr_t *data[ARCH_DATA_NSECTS];
 #if 0 /* Not yet implemented */
-  FAR uint32_t *heap[ARCH_HEAP_NSECTS];
+  FAR uintptr_t *heap[ARCH_HEAP_NSECTS];
 #endif
 };
 
diff --git a/arch/arm/include/armv7-a/irq.h b/arch/arm/include/armv7-a/irq.h
index 702cd07020..a7cccf607d 100755
--- a/arch/arm/include/armv7-a/irq.h
+++ b/arch/arm/include/armv7-a/irq.h
@@ -250,7 +250,7 @@ struct xcptcontext
    */
 
 #if 0 /* Not yet implemented */
-  FAR uint32_t *stack[ARCH_STACK_NSECTS];
+  FAR uintptr_t *stack[ARCH_STACK_NSECTS];
 #endif
 #endif
 };