--- skiboot-6.3.1/ccan/endian/endian.h.old 2019-05-10 06:50:45.000000000 +0000 +++ skiboot-6.3.1/ccan/endian/endian.h 2019-06-04 07:57:14.416435679 +0000 @@ -112,9 +112,9 @@ #error "Unknown endian" #elif HAVE_LITTLE_ENDIAN && HAVE_BIG_ENDIAN #error "Can't compile for both big and little endian." -#elif HAVE_LITTLE_ENDIAN +#elif HAVE_LITTLE_ENDIAN && !defined(__BYTE_ORDER) #define __BYTE_ORDER __LITTLE_ENDIAN -#elif HAVE_BIG_ENDIAN +#elif HAVE_BIG_ENDIAN && !defined(__BYTE_ORDER) #define __BYTE_ORDER __BIG_ENDIAN #endif --- skiboot-6.3.1/include/inttypes.h.old 2019-05-10 06:50:45.000000000 +0000 +++ skiboot-6.3.1/include/inttypes.h 2019-06-04 08:07:42.108161539 +0000 @@ -25,15 +25,15 @@ #include <stdint.h> -#ifndef __WORDSIZE -/* If we don't have __WORDSIZE it means we're *certainly* building skiboot +#ifndef __LONG_WIDTH__ +/* If we don't have __LONG_WIDTH__ it means we're *certainly* building skiboot * which will *ALWAYS* have a word size of 32bits. * (unless someone goes and ports skiboot to something that isn't powerpc) */ -#define __WORDSIZE 32 +#define __LONG_WIDTH__ 32 #endif -#if __WORDSIZE == 64 +#if __LONG_WIDTH__ == 64 #define PRIu64 "lu" #define PRIx64 "lx" #else