mirror of
https://abf.rosa.ru/djam/java-1.8.0-openjdk.git
synced 2025-04-20 07:24:16 +00:00
Updated to 1.8.0.45 b14
This commit is contained in:
parent
ae1fafae8d
commit
2349d9f749
13 changed files with 275 additions and 309 deletions
2
.abf.yml
2
.abf.yml
|
@ -1,4 +1,6 @@
|
|||
sources:
|
||||
aarch64-port-jdk8-b128-aarch64-992.tar.xz: dc388a21e1e446ad72b72716831bf82493b18f9e
|
||||
jdk8-jdk8u45-b13-aarch64-jdk8u45-b13.tar.xz: 1f44e78df64b2f8722cf1bf5e3cde65bdd980be9
|
||||
jdk8u-jdk8u5-b13.tar.xz: e05b8b3d45a5948eed9a629f410bfdfe7e474a12
|
||||
jdk8u45-jdk8u45-b14.tar.xz: a6cf00b8730b18ae63305c886f1c08119dc46495
|
||||
systemtap-tapset.tar.gz: 44444c943de42c8d08dbf6954cb05a5275d1fa56
|
||||
|
|
|
@ -1,43 +0,0 @@
|
|||
From ebf2be47870510a6348db5fe3419578ec6fea877 Mon Sep 17 00:00:00 2001
|
||||
From: Brent Baude <baude@us.ibm.com>
|
||||
Date: Thu, 24 Apr 2014 09:32:36 -0500
|
||||
Subject: [PATCH] PPC64LE arch support in openjdk-1.8
|
||||
|
||||
---
|
||||
jdk8/common/autoconf/platform.m4 | 6 ++++++
|
||||
jdk8/hotspot/src/os/linux/vm/os_linux.cpp | 2 ++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/jdk8/common/autoconf/platform.m4 b/jdk8/common/autoconf/platform.m4
|
||||
index 757bf22..2506fc8 100644
|
||||
--- a/jdk8/common/autoconf/platform.m4
|
||||
+++ b/jdk8/common/autoconf/platform.m4
|
||||
@@ -60,6 +60,12 @@ AC_DEFUN([PLATFORM_EXTRACT_VARS_FROM_CPU],
|
||||
VAR_CPU_BITS=64
|
||||
VAR_CPU_ENDIAN=big
|
||||
;;
|
||||
+ powerpc64le)
|
||||
+ VAR_CPU=ppc64le
|
||||
+ VAR_CPU_ARCH=ppc
|
||||
+ VAR_CPU_BITS=64
|
||||
+ VAR_CPU_ENDIAN=little
|
||||
+ ;;
|
||||
s390)
|
||||
VAR_CPU=s390
|
||||
VAR_CPU_ARCH=s390
|
||||
diff --git a/jdk8/hotspot/src/os/linux/vm/os_linux.cpp b/jdk8/hotspot/src/os/linux/vm/os_linux.cpp
|
||||
index 68314bb..5885d10 100644
|
||||
--- a/jdk8/hotspot/src/os/linux/vm/os_linux.cpp
|
||||
+++ b/jdk8/hotspot/src/os/linux/vm/os_linux.cpp
|
||||
@@ -1978,6 +1978,8 @@ void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
|
||||
static Elf32_Half running_arch_code=EM_SPARC;
|
||||
#elif (defined __powerpc64__)
|
||||
static Elf32_Half running_arch_code=EM_PPC64;
|
||||
+ #elif (defined __powerpc64le__)
|
||||
+ static Elf32_Half running_arch_code=EM_PPC64LE;
|
||||
#elif (defined __powerpc__)
|
||||
static Elf32_Half running_arch_code=EM_PPC;
|
||||
#elif (defined ARM)
|
||||
--
|
||||
1.9.0
|
||||
|
45
atomic_linux_zero.inline.hpp.patch
Normal file
45
atomic_linux_zero.inline.hpp.patch
Normal file
|
@ -0,0 +1,45 @@
|
|||
diff --git a/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp b/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
|
||||
--- jdk8/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
|
||||
+++ jdk8/hotspot/src/os_cpu/linux_zero/vm/atomic_linux_zero.inline.hpp
|
||||
@@ -222,31 +222,35 @@
|
||||
|
||||
inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
|
||||
#ifdef ARM
|
||||
- return arm_lock_test_and_set(dest, exchange_value);
|
||||
+ jint result = arm_lock_test_and_set(dest, exchange_value);
|
||||
#else
|
||||
#ifdef M68K
|
||||
- return m68k_lock_test_and_set(dest, exchange_value);
|
||||
+ jint result = m68k_lock_test_and_set(dest, exchange_value);
|
||||
#else
|
||||
// __sync_lock_test_and_set is a bizarrely named atomic exchange
|
||||
// operation. Note that some platforms only support this with the
|
||||
// limitation that the only valid value to store is the immediate
|
||||
// constant 1. There is a test for this in JNI_CreateJavaVM().
|
||||
- return __sync_lock_test_and_set (dest, exchange_value);
|
||||
+ jint result = __sync_lock_test_and_set (dest, exchange_value);
|
||||
+ __sync_synchronize();
|
||||
#endif // M68K
|
||||
#endif // ARM
|
||||
+ return result;
|
||||
}
|
||||
|
||||
inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value,
|
||||
volatile intptr_t* dest) {
|
||||
#ifdef ARM
|
||||
- return arm_lock_test_and_set(dest, exchange_value);
|
||||
+ intptr_t result = arm_lock_test_and_set(dest, exchange_value);
|
||||
#else
|
||||
#ifdef M68K
|
||||
- return m68k_lock_test_and_set(dest, exchange_value);
|
||||
+ intptr_t result = m68k_lock_test_and_set(dest, exchange_value);
|
||||
#else
|
||||
- return __sync_lock_test_and_set (dest, exchange_value);
|
||||
+ intptr_t result = __sync_lock_test_and_set (dest, exchange_value);
|
||||
+ __sync_synchronize();
|
||||
#endif // M68K
|
||||
#endif // ARM
|
||||
+ return result;
|
||||
}
|
||||
|
||||
inline void* Atomic::xchg_ptr(void* exchange_value, volatile void* dest) {
|
114
d318d83c4e74.patch
Normal file
114
d318d83c4e74.patch
Normal file
|
@ -0,0 +1,114 @@
|
|||
--- jdk8/jdk/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java Tue Mar 17 00:09:12 2015 +0300
|
||||
+++ jdk8/jdk/src/share/classes/com/sun/crypto/provider/DHKeyPairGenerator.java Wed Apr 08 14:25:54 2015 +0100
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2014 Red Hat Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -80,10 +81,10 @@
|
||||
* @param random the source of randomness
|
||||
*/
|
||||
public void initialize(int keysize, SecureRandom random) {
|
||||
- if ((keysize < 512) || (keysize > 2048) || (keysize % 64 != 0)) {
|
||||
+ if ((keysize < 512) || (keysize > 4096) || (keysize % 64 != 0)) {
|
||||
throw new InvalidParameterException("Keysize must be multiple "
|
||||
+ "of 64, and can only range "
|
||||
- + "from 512 to 2048 "
|
||||
+ + "from 512 to 4096 "
|
||||
+ "(inclusive)");
|
||||
}
|
||||
this.pSize = keysize;
|
||||
@@ -115,11 +116,11 @@
|
||||
|
||||
params = (DHParameterSpec)algParams;
|
||||
pSize = params.getP().bitLength();
|
||||
- if ((pSize < 512) || (pSize > 2048) ||
|
||||
+ if ((pSize < 512) || (pSize > 4096) ||
|
||||
(pSize % 64 != 0)) {
|
||||
throw new InvalidAlgorithmParameterException
|
||||
("Prime size must be multiple of 64, and can only range "
|
||||
- + "from 512 to 2048 (inclusive)");
|
||||
+ + "from 512 to 4096 (inclusive)");
|
||||
}
|
||||
|
||||
// exponent size is optional, could be 0
|
||||
--- jdk8/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java Tue Mar 17 00:09:12 2015 +0300
|
||||
+++ jdk8/jdk/src/share/classes/com/sun/crypto/provider/DHParameterGenerator.java Wed Apr 08 14:25:54 2015 +0100
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2014 Red Hat Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -60,11 +61,11 @@
|
||||
|
||||
private static void checkKeySize(int keysize)
|
||||
throws InvalidAlgorithmParameterException {
|
||||
- if ((keysize != 2048) &&
|
||||
+ if ((keysize != 2048) && (keysize != 4096) &&
|
||||
((keysize < 512) || (keysize > 1024) || (keysize % 64 != 0))) {
|
||||
throw new InvalidAlgorithmParameterException(
|
||||
"Keysize must be multiple of 64 ranging from "
|
||||
- + "512 to 1024 (inclusive), or 2048");
|
||||
+ + "512 to 1024 (inclusive), or 2048, or 4096");
|
||||
}
|
||||
}
|
||||
|
||||
--- jdk8/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java Tue Mar 17 00:09:12 2015 +0300
|
||||
+++ jdk8/jdk/src/share/classes/sun/security/pkcs11/P11KeyPairGenerator.java Wed Apr 08 14:25:54 2015 +0100
|
||||
@@ -278,11 +278,11 @@
|
||||
// this restriction is in the spec for DSA
|
||||
// since we currently use DSA parameters for DH as well,
|
||||
// it also applies to DH if no parameters are specified
|
||||
- if ((keySize != 2048) &&
|
||||
+ if ((keySize != 2048) && (keySize != 4096) &&
|
||||
((keySize > 1024) || ((keySize & 0x3f) != 0))) {
|
||||
throw new InvalidAlgorithmParameterException(algorithm +
|
||||
" key must be multiples of 64 if less than 1024 bits" +
|
||||
- ", or 2048 bits");
|
||||
+ ", or 2048 bits, or 4096 bits");
|
||||
}
|
||||
}
|
||||
}
|
||||
--- jdk8/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java Tue Mar 17 00:09:12 2015 +0300
|
||||
+++ jdk8/jdk/test/com/sun/crypto/provider/KeyAgreement/TestExponentSize.java Wed Apr 08 14:25:54 2015 +0100
|
||||
@@ -1,5 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * Copyright (c) 2014 Red Hat Inc.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@@ -58,7 +59,7 @@
|
||||
*/
|
||||
private enum Sizes {
|
||||
two56(256), three84(384), five12(512), seven68(768), ten24(1024),
|
||||
- twenty48(2048);
|
||||
+ twenty48(2048), forty96(4096);
|
||||
|
||||
private final int intSize;
|
||||
private final BigInteger bigIntValue;
|
||||
@@ -130,6 +131,19 @@
|
||||
kp = kpg.generateKeyPair();
|
||||
checkKeyPair(kp, Sizes.twenty48, Sizes.five12);
|
||||
|
||||
+ kpg.initialize(Sizes.forty96.getIntSize());
|
||||
+ kp = kpg.generateKeyPair();
|
||||
+ checkKeyPair(kp, Sizes.forty96, Sizes.twenty48);
|
||||
+
|
||||
+ publicKey = (DHPublicKey)kp.getPublic();
|
||||
+ p = publicKey.getParams().getP();
|
||||
+ g = publicKey.getParams().getG();
|
||||
+
|
||||
+ // test w/ all values specified
|
||||
+ kpg.initialize(new DHParameterSpec(p, g, Sizes.ten24.getIntSize()));
|
||||
+ kp = kpg.generateKeyPair();
|
||||
+ checkKeyPair(kp, Sizes.forty96, Sizes.ten24);
|
||||
+
|
||||
System.out.println("OK");
|
||||
}
|
||||
|
||||
|
|
@ -1,16 +1,16 @@
|
|||
diff -uNr openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java jdk8/jdk/src/share/classes/java/awt/Toolkit.java
|
||||
--- openjdk-orig/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 11:59:47.000000000 -0500
|
||||
+++ jdk8/jdk/src/share/classes/java/awt/Toolkit.java 2009-01-23 12:05:20.000000000 -0500
|
||||
@@ -871,7 +871,11 @@
|
||||
return null;
|
||||
}
|
||||
});
|
||||
- loadAssistiveTechnologies();
|
||||
+ try {
|
||||
+ loadAssistiveTechnologies();
|
||||
+ } catch ( AWTError error) {
|
||||
+ // ignore silently
|
||||
+ }
|
||||
} finally {
|
||||
// Make sure to always re-enable the JIT.
|
||||
java.lang.Compiler.enable();
|
||||
@@ -883,7 +883,11 @@
|
||||
return null;
|
||||
}
|
||||
});
|
||||
- loadAssistiveTechnologies();
|
||||
+ try {
|
||||
+ loadAssistiveTechnologies();
|
||||
+ } catch ( AWTError error) {
|
||||
+ // ignore silently
|
||||
+ }
|
||||
}
|
||||
return toolkit;
|
||||
}
|
||||
|
|
12
java-1.8.0-openjdk-giflib5.1.patch
Normal file
12
java-1.8.0-openjdk-giflib5.1.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
--- jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig 2015-05-20 10:39:35.248345148 +0100
|
||||
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2015-05-20 10:40:00.157795239 +0100
|
||||
@@ -310,7 +310,8 @@
|
||||
free(pBitmapBits);
|
||||
free(pOldBitmapBits);
|
||||
|
||||
- DGifCloseFile(gif);
|
||||
+ int errorCode = 0;
|
||||
+ DGifCloseFile(gif, &errorCode);
|
||||
|
||||
return 1;
|
||||
}
|
|
@ -1,12 +0,0 @@
|
|||
diff -Naur jdk8.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c
|
||||
--- jdk8.orig/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-06-03 10:43:23.974016819 +0400
|
||||
+++ jdk8/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c 2014-06-03 10:50:46.133994749 +0400
|
||||
@@ -310,7 +310,7 @@
|
||||
free(pBitmapBits);
|
||||
free(pOldBitmapBits);
|
||||
|
||||
- DGifCloseFile(gif);
|
||||
+ DGifCloseFile(gif, NULL);
|
||||
|
||||
return 1;
|
||||
}
|
|
@ -1,11 +0,0 @@
|
|||
--- java-1.8.0-openjdk/jdk8/hotspot/make/linux/makefiles/adjust-mflags.sh.make 2013-10-14 18:55:57.416829431 -0400
|
||||
+++ java-1.8.0-openjdk/jdk8/hotspot/make/linux/makefiles/adjust-mflags.sh 2013-10-14 18:56:13.183389765 -0400
|
||||
@@ -64,7 +64,7 @@ MFLAGS=`
|
||||
echo "$MFLAGS" \
|
||||
| sed '
|
||||
s/^-/ -/
|
||||
- s/ -\([^ ][^ ]*\)j/ -\1 -j/
|
||||
+ s/ -\([^ I][^ I]*\)j/ -\1 -j/
|
||||
s/ -j[0-9][0-9]*/ -j/
|
||||
s/ -j\([^ ]\)/ -j -\1/
|
||||
s/ -j/ -j'${HOTSPOT_BUILD_JOBS:-${default_build_jobs}}'/
|
|
@ -1,8 +1,6 @@
|
|||
# If debug is 1, OpenJDK is built with all debug info present.
|
||||
%global debug 0
|
||||
|
||||
%global aarch64_hg_tag 992
|
||||
|
||||
%global aarch64 aarch64 arm64 armv8
|
||||
%global multilib_arches %{power64} sparc64 x86_64 %{aarch64}
|
||||
%global jit_arches %{ix86} x86_64 sparcv9 sparc64 %{aarch64}
|
||||
|
@ -62,11 +60,7 @@
|
|||
|
||||
%global buildoutputdir jdk8/build/jdk8.build
|
||||
|
||||
%ifarch %{jit_arches}
|
||||
%global with_systemtap 1
|
||||
%else
|
||||
%global with_systemtap 0
|
||||
%endif
|
||||
%{?build_systap}%{?!build_systap:%bcond_without systap}
|
||||
|
||||
# Convert an absolute path to a relative path. Each symbolic link is
|
||||
# specified relative to the directory in which it is installed so that
|
||||
|
@ -89,10 +83,11 @@
|
|||
|
||||
# Standard JPackage naming and versioning defines.
|
||||
%global origin openjdk
|
||||
%global updatever 5
|
||||
%global buildver b13
|
||||
%global aarch64_updatever 0
|
||||
%global aarch64_buildver b128
|
||||
%global updatever 45
|
||||
%global buildver b14
|
||||
%global aarch64_updatever 45
|
||||
%global aarch64_buildver b13
|
||||
%global aarch64_changesetid aarch64-jdk8u45-b13
|
||||
# priority must be 6 digits in total
|
||||
%global priority 18000%{updatever}
|
||||
%global javaver 1.8.0
|
||||
|
@ -117,7 +112,7 @@
|
|||
%global jvmjardir %{_jvmjardir}/%{name}-%{version}
|
||||
%endif
|
||||
|
||||
%if %{with_systemtap}
|
||||
%if %{with_systap}
|
||||
# Where to install systemtap tapset (links)
|
||||
# We would like these to be in a package specific subdir,
|
||||
# but currently systemtap doesn't support that, so we have to
|
||||
|
@ -135,7 +130,7 @@
|
|||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{javaver}.%{updatever}
|
||||
Release: 4.%{buildver}%{?dist}
|
||||
Release: 2.%{buildver}
|
||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
|
||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||
# also included the epoch in their virtual provides. This created a
|
||||
|
@ -154,9 +149,9 @@ URL: http://openjdk.java.net/
|
|||
|
||||
# Source from upstrem OpenJDK8 project. To regenerate, use
|
||||
# ./generate_source_tarball.sh jdk8u jdk8u jdk8u%{updatever}-%{buildver}
|
||||
# ./generate_source_tarball.sh aarch64-port jdk8 %{aarch64_hg_tag}
|
||||
Source0: jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
|
||||
Source1: aarch64-port-jdk8-%{aarch64_buildver}-aarch64-%{aarch64_hg_tag}.tar.xz
|
||||
# ./generate_source_tarball.sh aarch64-port jdk8 jdk8u%{aarch64_updatever}-%{aarch64_buildver}-aarch64
|
||||
Source0: jdk8u%{updatever}-jdk8u%{updatever}-%{buildver}.tar.xz
|
||||
Source1: jdk8-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz
|
||||
|
||||
# Custom README for -src subpackage
|
||||
Source2: README.src
|
||||
|
@ -223,13 +218,18 @@ Patch103: %{name}-ppc-zero-hotspot.patch
|
|||
Patch201: system-libjpeg.patch
|
||||
Patch202: system-libpng.patch
|
||||
Patch203: system-lcms.patch
|
||||
Patch204: zero-interpreter-fix.patch
|
||||
|
||||
Patch301: java-1.8.0-openjdk-giflib5.patch
|
||||
Patch302: java-1.8.0-openjdk-make-4.0.patch
|
||||
Patch303: java-1.8.0-openjdk-gilib-5.1.patch
|
||||
Patch302: java-1.8.0-openjdk-giflib5.1.patch
|
||||
|
||||
# Fixed in upstream 9. See upstream bug:
|
||||
# https://bugs.openjdk.java.net/browse/JDK-8067331
|
||||
Patch402: atomic_linux_zero.inline.hpp.patch
|
||||
# Fixes StackOverflowError on ARM32 bit Zero. See RHBZ#1206656
|
||||
Patch403: rhbz1206656_fix_current_stack_pointer.patch
|
||||
|
||||
Patch999: 0001-PPC64LE-arch-support-in-openjdk-1.8.patch
|
||||
Patch503: d318d83c4e74.patch
|
||||
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
|
@ -256,7 +256,7 @@ BuildRequires: pkgconfig(xproto)
|
|||
#BuildRequires: redhat-lsb
|
||||
BuildRequires: zip
|
||||
# OpenJDK X officially requires OpenJDK (X-1) to build
|
||||
BuildRequires: java-1.7.0-openjdk-devel
|
||||
BuildRequires: java-1.8.0-openjdk-devel
|
||||
# Zero-assembler build requirement.
|
||||
%ifnarch %{jit_arches}
|
||||
BuildRequires: pkgconfig(libffi)
|
||||
|
@ -269,7 +269,7 @@ BuildRequires: openssl
|
|||
%ifnarch %{arm} %{aarch64} ppc64le
|
||||
BuildRequires: prelink
|
||||
%endif
|
||||
%if %{with_systemtap}
|
||||
%if %{with_systap}
|
||||
BuildRequires: systemtap
|
||||
%endif
|
||||
|
||||
|
@ -432,7 +432,7 @@ sh %{SOURCE12}
|
|||
%patch201
|
||||
%patch202
|
||||
%patch203
|
||||
|
||||
%patch204
|
||||
|
||||
%patch1
|
||||
%patch2
|
||||
|
@ -453,16 +453,19 @@ sh %{SOURCE12}
|
|||
%ifarch ppc %{power64}
|
||||
# PPC fixes
|
||||
%patch103
|
||||
%patch999 -p1
|
||||
%endif
|
||||
|
||||
# omv/rosa patches
|
||||
# omv patches
|
||||
%patch301
|
||||
%patch302 -p1
|
||||
%patch303 -p0
|
||||
%patch302
|
||||
|
||||
%patch402
|
||||
%patch403
|
||||
|
||||
%patch503
|
||||
|
||||
# Extract systemtap tapsets
|
||||
%if %{with_systemtap}
|
||||
%if %{with_systap}
|
||||
|
||||
tar xzf %{SOURCE8}
|
||||
|
||||
|
@ -521,12 +524,10 @@ bash ../../configure \
|
|||
%endif
|
||||
--disable-zip-debug-info \
|
||||
--with-milestone="fcs" \
|
||||
%ifnarch %{aarch64}
|
||||
--with-update-version=%{updatever} \
|
||||
--with-build-number=%{buildver} \
|
||||
%else
|
||||
--with-build-number=%{aarch64_buildver} \
|
||||
--with-user-release-suffix="aarch64-%{aarch64_hg_tag}" \
|
||||
%ifarch %{aarch64}
|
||||
--with-user-release-suffix="aarch64-%{aarch64_updatever}-%{aarch64_buildver}" \
|
||||
%endif
|
||||
--with-boot-jdk=/usr/lib/jvm/java-openjdk \
|
||||
--with-debug-level=%{debugbuild} \
|
||||
|
@ -601,7 +602,7 @@ pushd %{buildoutputdir}/images/j2sdk-image
|
|||
install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
|
||||
cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
|
||||
|
||||
%if %{with_systemtap}
|
||||
%if %{with_systap}
|
||||
# Install systemtap support files.
|
||||
install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset
|
||||
cp -a $RPM_BUILD_DIR/%{name}/tapset/*.stp $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/tapset/
|
||||
|
@ -707,7 +708,7 @@ done
|
|||
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
|
||||
| grep -v jre/lib/security \
|
||||
| sed 's|'$RPM_BUILD_ROOT'|%dir |' \
|
||||
> %{name}.files.headless
|
||||
> %{name}.files-headless
|
||||
# Find JRE files.
|
||||
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type f -o -type l \
|
||||
| grep -v jre/lib/security \
|
||||
|
@ -720,7 +721,8 @@ NOT_HEADLESS=\
|
|||
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libpulse-java.so
|
||||
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libsplashscreen.so
|
||||
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libawt_xawt.so
|
||||
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjawt.so"
|
||||
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libjawt.so
|
||||
%{_jvmdir}/%{uniquesuffix}/jre/bin/policytool"
|
||||
#filter %{name}.files from %{name}.files.all to %{name}.files-headless
|
||||
ALL=`cat %{name}.files.all`
|
||||
for file in $ALL ; do
|
||||
|
@ -1030,13 +1032,13 @@ exit 0
|
|||
%dir %{_jvmdir}/%{sdkdir}/bin
|
||||
%dir %{_jvmdir}/%{sdkdir}/include
|
||||
%dir %{_jvmdir}/%{sdkdir}/lib
|
||||
%if %{with_systemtap}
|
||||
%if %{with_systap}
|
||||
%dir %{_jvmdir}/%{sdkdir}/tapset
|
||||
%endif
|
||||
%{_jvmdir}/%{sdkdir}/bin/*
|
||||
%{_jvmdir}/%{sdkdir}/include/*
|
||||
%{_jvmdir}/%{sdkdir}/lib/*
|
||||
%if %{with_systemtap}
|
||||
%if %{with_systap}
|
||||
%{_jvmdir}/%{sdkdir}/tapset/*.stp
|
||||
%endif
|
||||
%{_jvmdir}/%{sdklnk}
|
||||
|
@ -1073,7 +1075,7 @@ exit 0
|
|||
%{_mandir}/man1/wsgen-%{name}.1*
|
||||
%{_mandir}/man1/wsimport-%{name}.1*
|
||||
%{_mandir}/man1/xjc-%{name}.1*
|
||||
%if %{with_systemtap}
|
||||
%if %{with_systap}
|
||||
%{tapsetroot}
|
||||
%endif
|
||||
|
||||
|
@ -1095,183 +1097,3 @@ exit 0
|
|||
%{_jvmdir}/%{jredir}/lib/%{archinstall}/libatk-wrapper.so
|
||||
%{_jvmdir}/%{jredir}/lib/ext/java-atk-wrapper.jar
|
||||
%{_jvmdir}/%{jredir}/lib/accessibility.properties
|
||||
|
||||
%changelog
|
||||
* Mon Apr 28 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.5-4.b13
|
||||
- Check for debug symbols in libjvm.so
|
||||
|
||||
* Thu Apr 24 2014 Brent Baude <baude@us.ibm.com> - 1:1.8.0.5-3.b13
|
||||
- Add ppc64le support, bz# 1088344
|
||||
|
||||
* Wed Apr 23 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.5-2.b13
|
||||
- Build with -fno-devirtualize
|
||||
- Don't strip debuginfo from files
|
||||
|
||||
* Wed Apr 16 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.5-1.b13
|
||||
- Instrument build with various sanitizers.
|
||||
|
||||
* Tue Apr 15 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.5-1.b13
|
||||
- Update to the latest security release: OpenJDK8 u5 b13
|
||||
|
||||
* Fri Mar 28 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-2.b132
|
||||
- Include version information in desktop files
|
||||
- Move desktop files from tarball to top level source
|
||||
|
||||
* Tue Mar 25 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-1.0.b132
|
||||
- Switch from java8- style provides to java- style
|
||||
- Bump priority to reflect java version
|
||||
|
||||
* Fri Mar 21 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.35.b132
|
||||
- Disable doclint for compatiblity
|
||||
- Patch contributed by Andrew John Hughes
|
||||
|
||||
* Tue Mar 11 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.34.b132
|
||||
- Include jdeps and jjs for aarch64. These are present in b128.
|
||||
|
||||
* Mon Mar 10 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.33.b132
|
||||
- Update aarch64 tarball to the latest upstream release
|
||||
|
||||
* Fri Mar 07 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.32.b132
|
||||
- Fix `java -version` output
|
||||
|
||||
* Fri Mar 07 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.31.b132
|
||||
- updated to rc4 aarch64 tarball
|
||||
- outdated removed: patch2031 system-lcmsAARCH64.patch patch2011 system-libjpeg-aarch64.patch
|
||||
patch2021 system-libpng-aarch64.patch
|
||||
|
||||
* Thu Mar 06 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.30.b132
|
||||
- Update to b132
|
||||
|
||||
* Thu Mar 06 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.29.b129
|
||||
- Fix typo in STRIP_POLICY
|
||||
|
||||
* Mon Mar 03 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.28.b129
|
||||
- Remove redundant debuginfo files
|
||||
- Generate complete debug information for libjvm
|
||||
|
||||
* Tue Feb 25 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.27.b129
|
||||
- Fix non-headless libraries
|
||||
|
||||
* Tue Feb 25 2014 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.26.b129
|
||||
- Fix incorrect Requires
|
||||
|
||||
* Thu Feb 13 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.26.b129
|
||||
- Add -headless subpackage based on java-1.7.0-openjdk
|
||||
- Add abrt connector support
|
||||
- Add -accessibility subpackage
|
||||
|
||||
* Thu Feb 13 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.26.b129
|
||||
- Update to b129.
|
||||
|
||||
* Fri Feb 07 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.25.b126
|
||||
- Update to candidate Reference Implementation release.
|
||||
|
||||
* Fri Jan 31 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.24.b123
|
||||
- Forward port more patches from java-1.7.0-openjdk
|
||||
|
||||
* Mon Jan 20 2014 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.23.b123
|
||||
- Update to jdk8-b123
|
||||
|
||||
* Thu Nov 14 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.22.b115
|
||||
- Update to jdk8-b115
|
||||
|
||||
* Wed Oct 30 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.21.b106
|
||||
- added jre/lib/security/blacklisted.certs for aarch64
|
||||
- updated to preview_rc2 aarch64 tarball
|
||||
|
||||
* Sun Oct 06 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.20.b106
|
||||
- Fix paths in tapsets to work on non-x86_64
|
||||
- Use system libjpeg
|
||||
|
||||
* Thu Sep 05 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.19.b106
|
||||
- Fix with_systemtap conditionals
|
||||
|
||||
* Thu Sep 05 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.18.b106
|
||||
- Update to jdk8-b106
|
||||
|
||||
* Tue Aug 13 2013 Deepak Bhole <dbhole@redhat.com> - 1:1.8.0.0-0.17.b89x
|
||||
- Updated aarch64 to latest head
|
||||
- Dropped upstreamed patches
|
||||
|
||||
* Wed Aug 07 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.16.b89x
|
||||
- The zero fix only applies on b89 tarball
|
||||
|
||||
* Tue Aug 06 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.16.b89x
|
||||
- Add patch to fix zero on 32-bit build
|
||||
|
||||
* Mon Aug 05 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.16.b89x
|
||||
- Added additional build fixes for aarch64
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.0.0-0.16.b89x
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Fri Aug 02 2013 Deepak Bhole <dbhole@redhat.com> - 1:1.8.0.0-0.15.b89
|
||||
- Added a missing includes patch (#302/%{name}-arm64-missing-includes.patch)
|
||||
- Added --disable-precompiled-headers for arm64 build
|
||||
|
||||
* Mon Jul 29 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.14.b89
|
||||
- added patch 301 - removeMswitchesFromx11.patch
|
||||
|
||||
* Fri Jul 26 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.13.b89
|
||||
- added new aarch64 tarball
|
||||
|
||||
* Thu Jul 25 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.12.b89
|
||||
- ifarchaarch64 then --with-jvm-variants=client
|
||||
|
||||
* Tue Jul 23 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.11.b89
|
||||
- prelink dependence excluded also for aaech64
|
||||
- arm64 added to jitarches
|
||||
- added source100 config.guess to repalce the outdated one in-tree
|
||||
- added source101 config.sub to repalce the outdated one in-tree
|
||||
- added patch2011 system-libjpegAARCH64.patch (as aarch64-port is little bit diferent)
|
||||
- added patch2031 system-lcmsAARCH64.patch (as aarch64-port is little bit diferent)
|
||||
- added gcc-c++ build depndece so builddep will result to better situation
|
||||
|
||||
* Tue Jul 23 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.10.b89
|
||||
- moved to latest working osurces
|
||||
|
||||
* Tue Jul 23 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.10.b89
|
||||
- Moved to hg clone for generating sources.
|
||||
|
||||
* Sun Jul 21 2013 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.0-0.9.b89
|
||||
- added aarch 64 tarball, proposed usage of clone instead of tarballs
|
||||
|
||||
* Mon Jul 15 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.9.b89
|
||||
- Switch to xz for compression
|
||||
- Fixes RHBZ#979823
|
||||
|
||||
* Mon Jul 15 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.9.b89
|
||||
- Priority should be 0 until openjdk8 is released by upstream
|
||||
- Fixes RHBZ#964409
|
||||
|
||||
* Mon Jun 3 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.8.b89
|
||||
- Fix incorrect permissions on ct.sym
|
||||
|
||||
* Mon May 20 2013 Omair Majid <omajid@redhat.com> - 1:1.8.0.0-0.7.b89
|
||||
- Fix incorrect permissions on jars
|
||||
|
||||
* Fri May 10 2013 Adam Williamson <awilliam@redhat.com>
|
||||
- update scriptlets to follow current guidelines for updating icon cache
|
||||
|
||||
* Tue Apr 30 2013 Omair Majid <omajid@redhat.com> 1:1.8.0.0-0.5.b87
|
||||
- Update to b87
|
||||
- Remove all rhino support; use nashorn instead
|
||||
- Remove upstreamed/unapplied patches
|
||||
|
||||
* Tue Apr 23 2013 Karsten Hopp <karsten@redhat.com> 1:1.8.0.0-0.4.b79
|
||||
- update java-1.8.0-openjdk-ppc-zero-hotspot patch
|
||||
- use power64 macro
|
||||
|
||||
* Thu Mar 28 2013 Omair Majid <omajid@redhat.com> 1:1.8.0.0-0.3.b79
|
||||
- Add build fix for zero
|
||||
- Drop gstabs fixes; enable full debug info instead
|
||||
|
||||
* Wed Mar 13 2013 Omair Majid <omajid@redhat.com> 1:1.8.0.0-0.2.b79
|
||||
- Fix alternatives priority
|
||||
|
||||
* Tue Mar 12 2013 Omair Majid <omajid@redhat.com> 1:1.8.0.0-0.1.b79.f19
|
||||
- Update to jdk8-b79
|
||||
- Initial version for Fedora 19
|
||||
|
||||
* Tue Sep 04 2012 Andrew John Hughes <gnu.andrew@redhat.com> - 1:1.8.0.0-b53.1
|
||||
- Initial build from java-1.7.0-openjdk RPM
|
||||
|
|
|
@ -1,28 +1,25 @@
|
|||
--- jdk8/jdk/src/share/lib/security/java.security-linux.orig
|
||||
+++ jdk8/jdk/src/share/lib/security/java.security-linux
|
||||
@@ -154,9 +154,11 @@
|
||||
org.jcp.xml.dsig.internal.,\
|
||||
@@ -211,7 +211,9 @@
|
||||
jdk.internal.,\
|
||||
jdk.nashorn.internal.,\
|
||||
- jdk.nashorn.tools.
|
||||
+ jdk.nashorn.tools,\
|
||||
jdk.nashorn.tools.,\
|
||||
- com.sun.activation.registries.
|
||||
+ com.sun.activation.registries.,\
|
||||
+ org.GNOME.Accessibility.,\
|
||||
+ org.GNOME.Bonobo.
|
||||
|
||||
|
||||
#
|
||||
# List of comma-separated packages that start with or equal this string
|
||||
# will cause a security exception to be thrown when
|
||||
@@ -192,9 +194,11 @@
|
||||
org.jcp.xml.dsig.internal.,\
|
||||
@@ -258,7 +260,9 @@
|
||||
jdk.internal.,\
|
||||
jdk.nashorn.internal.,\
|
||||
- jdk.nashorn.tools.
|
||||
+ jdk.nashorn.tools.,\
|
||||
jdk.nashorn.tools.,\
|
||||
- com.sun.activation.registries.
|
||||
+ com.sun.activation.registries.,\
|
||||
+ org.GNOME.Accessibility.,\
|
||||
+ org.GNOME.Bonobo.
|
||||
|
||||
|
||||
#
|
||||
# Determines whether this properties file can be appended to
|
||||
# or overridden on the command line via -Djava.security.properties
|
||||
|
||||
|
|
14
rhbz1206656_fix_current_stack_pointer.patch
Normal file
14
rhbz1206656_fix_current_stack_pointer.patch
Normal file
|
@ -0,0 +1,14 @@
|
|||
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) {
|
|
@ -62,12 +62,13 @@ diff -ruN jdk8/jdk/make/lib/Awt2dLibraries.gmk jdk8/jdk/make/lib/Awt2dLibraries.
|
|||
OUTPUT_DIR := $(INSTALL_LIBRARIES_HERE), \
|
||||
SRC := $(JDK_TOPDIR)/src/share/native/sun/java2d/cmm/lcms, \
|
||||
LANG := C, \
|
||||
@@ -680,18 +680,18 @@
|
||||
@@ -680,19 +680,19 @@
|
||||
LDFLAGS_windows := $(WIN_AWT_LIB) $(WIN_JAVA_LIB), \
|
||||
LDFLAGS_SUFFIX_solaris := -lawt -ljava -ljvm -lc, \
|
||||
LDFLAGS_SUFFIX_macosx := $(LIBM) -lawt -ljava -ljvm, \
|
||||
- LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm, \
|
||||
+ LDFLAGS_SUFFIX_linux := -lm -lawt -ljava -ljvm -llcms2, \
|
||||
LDFLAGS_SUFFIX_aix := -lm -lawt -ljava -ljvm,\
|
||||
VERSIONINFO_RESOURCE := $(JDK_TOPDIR)/src/windows/resource/version.rc, \
|
||||
RC_FLAGS := $(RC_FLAGS) \
|
||||
- -D "JDK_FNAME=lcms.dll" \
|
||||
|
|
25
zero-interpreter-fix.patch
Normal file
25
zero-interpreter-fix.patch
Normal file
|
@ -0,0 +1,25 @@
|
|||
# HG changeset patch
|
||||
# User roland
|
||||
# Date 1418632606 -3600
|
||||
# Node ID a733dad6fc1e2572ed227e898da35e0053cbb7c5
|
||||
# Parent db035d4ba1bd25ac8803bb2d177cb35681eb6907
|
||||
8067231: Zero builds fails after JDK-6898462
|
||||
Summary: Interpreter::remove_activation_entry() is not defined for the C++ interpreter
|
||||
Reviewed-by: roland, coleenp
|
||||
Contributed-by: Severin Gehwolf <sgehwolf@redhat.com>
|
||||
|
||||
--- jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Sat Dec 13 01:24:10 2014 +0300
|
||||
+++ jdk8/hotspot/src/share/vm/interpreter/interpreterRuntime.cpp Mon Dec 15 09:36:46 2014 +0100
|
||||
@@ -394,7 +394,11 @@
|
||||
// during deoptimization so the interpreter needs to skip it when
|
||||
// the frame is popped.
|
||||
thread->set_do_not_unlock_if_synchronized(true);
|
||||
+#ifdef CC_INTERP
|
||||
+ return (address) -1;
|
||||
+#else
|
||||
return Interpreter::remove_activation_entry();
|
||||
+#endif
|
||||
}
|
||||
|
||||
// Need to do this check first since when _do_not_unlock_if_synchronized
|
||||
|
Loading…
Add table
Reference in a new issue