From 60fc00ff4cf84bb74c7ef84672c294f61aef1ab0 Mon Sep 17 00:00:00 2001 From: Simon Frankenberger Date: Mon, 28 Jan 2019 22:01:51 +0100 Subject: testing/openjdk10: New aport --- testing/openjdk10/arm.patch | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 testing/openjdk10/arm.patch (limited to 'testing/openjdk10/arm.patch') diff --git a/testing/openjdk10/arm.patch b/testing/openjdk10/arm.patch new file mode 100644 index 0000000000..e0f65348be --- /dev/null +++ b/testing/openjdk10/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 +@@ -70,7 +70,6 @@ + # include + # include + # include +-# include + # include + + #define SPELL_REG_SP "sp" +@@ -103,6 +102,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