From 8a1ae17d4a9af54285c7891a680620e7e24c6280 Mon Sep 17 00:00:00 2001 From: Simon Frankenberger Date: Mon, 28 Jan 2019 01:04:51 +0100 Subject: testing/openjdk11: New aport Closes GH-7808 --- testing/openjdk11/arm.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 testing/openjdk11/arm.patch (limited to 'testing/openjdk11/arm.patch') diff --git a/testing/openjdk11/arm.patch b/testing/openjdk11/arm.patch new file mode 100644 index 0000000000..b2be6b3f4d --- /dev/null +++ b/testing/openjdk11/arm.patch @@ -0,0 +1,29 @@ +--- 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 -- cgit v1.2.3