Patches for musl taken from Alpine linux: https://git.alpinelinux.org/aports/commit/?id=8a1ae17d4a9af54285c7891a680620e7e24c6280 --- old/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp +++ new/src/hotspot/os_cpu/linux_arm/os_linux_arm.cpp @@ -71,7 +71,6 @@ # include # include # include -# include # include #define SPELL_REG_SP "sp" @@ -104,6 +103,18 @@ #define ARM_REGS_IN_CONTEXT 31 #else + +// Stupid hack as the origin if below doesnt compile with gcc 8.2.0: +// +// os_linux_arm.cpp:114:5: error: missing binary operator before token "(" +// #if NGREG == 16 +// ^~~~~ +// +// The NGREG is 18, so force it to that value. +#ifdef NGREG +# undef NGREG +#endif +#define NGREG 18 #if NGREG == 16 // These definitions are based on the observation that until