diff options
| author | Carlo Landmeter <clandmeter@gmail.com> | 2016-08-25 09:42:17 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@gmail.com> | 2016-08-25 09:42:42 +0000 |
| commit | c733852c04953d157183cf8c5bc7410d366d4eaf (patch) | |
| tree | c143d8330bf13820aa19e1b8abd3a7af7d7e5e02 /community/openjdk7/icedtea-hotspot-musl.patch | |
| parent | d474fa1320e23acb028f4e7c8ae7a04c439f76d9 (diff) | |
community/openjdk7: build fix aarch64
Diffstat (limited to 'community/openjdk7/icedtea-hotspot-musl.patch')
| -rw-r--r-- | community/openjdk7/icedtea-hotspot-musl.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/community/openjdk7/icedtea-hotspot-musl.patch b/community/openjdk7/icedtea-hotspot-musl.patch index 41072defe26..1f980bcbcb0 100644 --- a/community/openjdk7/icedtea-hotspot-musl.patch +++ b/community/openjdk7/icedtea-hotspot-musl.patch @@ -53,3 +53,27 @@ static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)]; public: +--- openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp.orig ++++ openjdk/hotspot/src/os_cpu/linux_aarch64/vm/os_linux_aarch64.cpp +@@ -76,7 +76,7 @@ + # include <pwd.h> + # include <poll.h> + # include <ucontext.h> +-# include <fpu_control.h> ++# include <linux/types.h> + + #ifdef BUILTIN_SIM + #define REG_SP REG_RSP +--- openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp.orig ++++ openjdk/hotspot/src/cpu/aarch64/vm/sharedRuntime_aarch64.cpp +@@ -194,10 +194,6 @@ + return (r->reg2stack() + SharedRuntime::out_preserve_stack_slots()) * VMRegImpl::stack_slot_size; + } + +-template <class T> static const T& min (const T& a, const T& b) { +- return (a > b) ? b : a; +-} +- + // --------------------------------------------------------------------------- + // Read the array of BasicTypes from a signature, and compute where the + // arguments should go. Values in the VMRegPair regs array refer to 4-byte |