The attached patch removes the constant definitions of PAGE_SIZE, PAGE_SHIFT, and PAGE_MASK, from sys/user.h on architectures that allow configurable page sizes. Additionally, it also removes NBPG, UPAGES, HOST_TEXT_START_ADDR, HOST_DATA_START_ADDR, and HOST_STACK_END_ADDR, partly because they are defined in terms of PAGE_SIZE, but also because these are only needed for trad-core support, and these architecture don't use that anyway. This has been discussed previously here: https://sourceware.org/ml/libc-ports/2013-11/msg00028.html And on bugzilla here: https://sourceware.org/bugzilla/show_bug.cgi?id=16191 Finally, I've adjusted tst-limits.c so that its PAGE_SIZE test is applied to the definitions remaining in other architecture's user.h. OK? Andrew