mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
extra/java8-openjdk-aarch64 to 8.u111-1
This commit is contained in:
Kevin Mihelich
parent
40e8326276
commit
1ce67f210e
4 changed files with 1168 additions and 31 deletions
47
extra/java8-openjdk-aarch64/8154210.patch
Normal file
47
extra/java8-openjdk-aarch64/8154210.patch
Normal file
|
|
@ -0,0 +1,47 @@
|
|||
# HG changeset patch
|
||||
# User aph
|
||||
# Date 1461121375 -3600
|
||||
# Wed Apr 20 04:02:55 2016 +0100
|
||||
# Node ID 5605c859f0ec47d6f507cc83e783554a4210ccf6
|
||||
# Parent 7458e5178c8646a9b4f76ac3d13b222abed3f16f
|
||||
8154210: Zero: Better byte behaviour
|
||||
Summary: Complete support for 8132051 on Zero and fix failure on 64-bit big-endian systems
|
||||
Reviewed-by: andrew, chrisphi
|
||||
|
||||
diff -r 7458e5178c86 -r 5605c859f0ec src/cpu/zero/vm/cppInterpreter_zero.cpp
|
||||
--- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue May 17 03:03:36 2016 +0100
|
||||
+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Wed Apr 20 04:02:55 2016 +0100
|
||||
@@ -220,9 +220,16 @@
|
||||
// Push our result
|
||||
for (int i = 0; i < result_slots; i++) {
|
||||
// Adjust result to smaller
|
||||
- intptr_t res = result[-i];
|
||||
+ union {
|
||||
+ intptr_t res;
|
||||
+ jint res_jint;
|
||||
+ };
|
||||
+ res = result[-i];
|
||||
if (result_slots == 1) {
|
||||
- res = narrow(method->result_type(), res);
|
||||
+ BasicType t = method->result_type();
|
||||
+ if (is_subword_type(t)) {
|
||||
+ res_jint = (jint)narrow(t, res_jint);
|
||||
+ }
|
||||
}
|
||||
stack->push(res);
|
||||
}
|
||||
diff -r 7458e5178c86 -r 5605c859f0ec src/share/vm/interpreter/bytecodeInterpreter.cpp
|
||||
--- openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Tue May 17 03:03:36 2016 +0100
|
||||
+++ openjdk/hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp Wed Apr 20 04:02:55 2016 +0100
|
||||
@@ -593,8 +593,9 @@
|
||||
/* 0xDC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
|
||||
|
||||
/* 0xE0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
|
||||
-/* 0xE4 */ &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w, &&opc_return_register_finalizer,
|
||||
-/* 0xE8 */ &&opc_invokehandle,&&opc_default, &&opc_default, &&opc_default,
|
||||
+/* 0xE4 */ &&opc_default, &&opc_default, &&opc_fast_aldc, &&opc_fast_aldc_w,
|
||||
+/* 0xE8 */ &&opc_return_register_finalizer,
|
||||
+ &&opc_invokehandle, &&opc_default, &&opc_default,
|
||||
/* 0xEC */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
|
||||
|
||||
/* 0xF0 */ &&opc_default, &&opc_default, &&opc_default, &&opc_default,
|
||||
|
|
@ -20,8 +20,8 @@ pkgname=('jre8-openjdk-headless' 'jre8-openjdk' 'jdk8-openjdk' 'openjdk8-src' 'o
|
|||
pkgbase=java8-openjdk-aarch64
|
||||
_java_ver=8
|
||||
# Found @ http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html
|
||||
_jdk_update=65
|
||||
# Found @ http://hg.openjdk.java.net/aarch64-port/jdk8u60/
|
||||
_jdk_update=111
|
||||
# Found @ http://hg.openjdk.java.net/aarch64-port/jdk8u/
|
||||
_jdk_build=17
|
||||
pkgver=${_java_ver}.u${_jdk_update}
|
||||
_repo_ver=aarch64-jdk${_java_ver}u${_jdk_update}-b${_jdk_build}
|
||||
|
|
@ -32,7 +32,7 @@ license=('custom')
|
|||
options=('!distcc')
|
||||
makedepends=('jdk7-openjdk' 'ccache' 'cpio' 'unzip' 'zip'
|
||||
'libxrender' 'libxtst' 'fontconfig' 'libcups' 'alsa-lib')
|
||||
_url_src=http://hg.openjdk.java.net/aarch64-port/jdk8u60
|
||||
_url_src=http://hg.openjdk.java.net/aarch64-port/jdk8u
|
||||
source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
|
||||
corba-${_repo_ver}.tar.gz::${_url_src}/corba/archive/${_repo_ver}.tar.gz
|
||||
hotspot-${_repo_ver}.tar.gz::${_url_src}/hotspot/archive/${_repo_ver}.tar.gz
|
||||
|
|
@ -41,16 +41,18 @@ source=(jdk8u-${_repo_ver}.tar.gz::${_url_src}/archive/${_repo_ver}.tar.gz
|
|||
jaxp-${_repo_ver}.tar.gz::${_url_src}/jaxp/archive/${_repo_ver}.tar.gz
|
||||
langtools-${_repo_ver}.tar.gz::${_url_src}/langtools/archive/${_repo_ver}.tar.gz
|
||||
nashorn-${_repo_ver}.tar.gz::${_url_src}/nashorn/archive/${_repo_ver}.tar.gz
|
||||
rhbz1206656_fix_current_stack_pointer.patch)
|
||||
sha256sums=('4ddb97b86fda007776e7873e967618f75fd9051ac02fedb0e9ef3c4168f2421e'
|
||||
'abe1e4c94a66d95df56eb41bed5a71650a89d54630498e6914fe6ac77ee20abc'
|
||||
'b3e79bd52174a4ff6153ba5752a91170a2c1df8c5c5aaad77c6a39c84f5c5e56'
|
||||
'adbb9db8abc2d734cd3bbaa58c3a5294f48c923f00c5966d71f492b103b2a7ed'
|
||||
'093a0de5dd1a4a15f955e4407c1758d9e584b958d87ee3779a8de95222e8d26c'
|
||||
'f8e1183aeb140cd3e258270e4684b7771ff0cc3c53b2d09120669b0f4e0a56e8'
|
||||
'7fdb39f8d698bbb688aeecb2dbd7e26c262e3393d912fcf9469c230979ef61fd'
|
||||
'98ad0b9e1194107c30d13a88c5c2d13977f2c5dc6ae7d14e891e3bc3535b2749'
|
||||
'85d396e1663514390e73b0b072a5f93c51ca6e324ee0a08aa2ace599e3df83bf')
|
||||
build_with_gcc6.patch
|
||||
8154210.patch)
|
||||
sha256sums=('5bfc749e26b5964964e4e63781d2116f271b6055611656ad3dbfd60679c1c9db'
|
||||
'39713ebcfa767f6103d28e305873b15520c75d5c6fe6dbe1472dd8b3f3e495c6'
|
||||
'285531fe37c1ee795f9485c5dd3a3409088b9ce95905842b012682d99b11738e'
|
||||
'9210376b14295adf3676d024fbd40ba2d049efc463bf212fa51031910aac0093'
|
||||
'977775f19b82ff236f0475c2f6acd933536efa35309794fdc103175ba9d5c59e'
|
||||
'4d680cac6b299f38bc75d5dd314318af22a28b92d09b6012a8acf6e9b65386a1'
|
||||
'fc310c2bc1604c942f3da8aea024a590efe2617cd1d30f104502934959bd8eb4'
|
||||
'cb97c0083f1289000c209e8a4493ba79e5a3389f4151ddfc8bc2c2df06c71202'
|
||||
'dcf5f495620231068b0c925a33ba7246bbeb85e9ae822b30ab77a66839c2d3b6'
|
||||
'292443358b7b7b570b3b42c3cb3dd6f1ac8bc79ada90b979aec10f52013958ae')
|
||||
|
||||
case "${CARCH}" in
|
||||
'x86_64') _JARCH=amd64 ; _DOC_ARCH=x86_64 ;;
|
||||
|
|
@ -69,23 +71,27 @@ _nonheadless=(bin/policytool
|
|||
lib/${_JARCH}/libsplashscreen.so)
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/jdk8u60-${_repo_ver}"
|
||||
cd "${srcdir}/jdk8u-${_repo_ver}"
|
||||
|
||||
for subrepo in corba hotspot jdk jaxws jaxp langtools nashorn
|
||||
do
|
||||
ln -s ../${subrepo}-${_repo_ver} ${subrepo}
|
||||
done
|
||||
|
||||
patch -p1 < ../build_with_gcc6.patch
|
||||
|
||||
cd "${srcdir}/hotspot-${_repo_ver}"
|
||||
patch -p2 -i ../rhbz1206656_fix_current_stack_pointer.patch
|
||||
patch -p2 -i ../8154210.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/jdk8u60-${_repo_ver}"
|
||||
cd "${srcdir}/jdk8u-${_repo_ver}"
|
||||
|
||||
unset JAVA_HOME
|
||||
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=1346
|
||||
export MAKEFLAGS=${MAKEFLAGS/-j*}
|
||||
# https://hydra.nixos.org/build/41230444/log
|
||||
export CFLAGS+=" -Wno-error=deprecated-declarations"
|
||||
|
||||
install -d -m 755 "${srcdir}/${_prefix}/"
|
||||
sh configure \
|
||||
|
|
@ -296,6 +302,6 @@ package_openjdk8-doc() {
|
|||
pkgdesc='OpenJDK Java 8 documentation'
|
||||
|
||||
install -d -m 755 "${pkgdir}/usr/share/doc/${pkgbase}/"
|
||||
cp -r "${srcdir}"/jdk8u60-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-zero-release/docs/* \
|
||||
cp -r "${srcdir}"/jdk8u-${_repo_ver}/build/linux-${_DOC_ARCH}-normal-zero-release/docs/* \
|
||||
"${pkgdir}/usr/share/doc/${pkgbase}/"
|
||||
}
|
||||
|
|
|
|||
1098
extra/java8-openjdk-aarch64/build_with_gcc6.patch
Normal file
1098
extra/java8-openjdk-aarch64/build_with_gcc6.patch
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/src/os_cpu/linux_zero/vm/os_linux_zero.cpp b/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
--- jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
|
||||
@@ -55,8 +55,8 @@
|
||||
#include "utilities/vmError.hpp"
|
||||
|
||||
address os::current_stack_pointer() {
|
||||
- address dummy = (address) &dummy;
|
||||
- return dummy;
|
||||
+ // return the address of the current function
|
||||
+ return (address)__builtin_frame_address(0);
|
||||
}
|
||||
|
||||
frame os::get_sender_for_C_frame(frame* fr) {
|
||||
Loading…
Reference in a new issue