Version: 8u92.b31

diff --git a/CompileDemos.patch b/CompileDemos.patch
index d615c39c31fc75d7ac7f61b5354b855392c91bba..dcf138c6f55fd6aca28ff6b69c096382060a049b 100644 (file)
--- a/CompileDemos.patch
+++ b/CompileDemos.patch
@@ -1,18 +1,19 @@
 http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-June/032544.html
 
 http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2015-June/032544.html
 

---- jdk8u-jdk8u66-b02/jdk/make/CompileDemos.gmk.orig   2015-07-23 16:17:35.000000000 +0200
-+++ jdk8u-jdk8u66-b02/jdk/make/CompileDemos.gmk        2015-09-18 09:52:33.000000000 +0200
+diff -dur -x '*~' -x '*.orig' -x '*.rej' jdk8u-jdk8u92-b31.orig/jdk/make/CompileDemos.gmk jdk8u-jdk8u92-b31/jdk/make/CompileDemos.gmk
+--- jdk8u-jdk8u92-b31.orig/jdk/make/CompileDemos.gmk   2016-04-06 07:27:01.000000000 +0200
++++ jdk8u-jdk8u92-b31/jdk/make/CompileDemos.gmk        2016-07-29 09:37:19.000000000 +0200

 @@ -246,12 +246,12 @@
        -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
  
    # Remove the -incremental:no setting to get .ilk-files like in the old build.
 @@ -246,12 +246,12 @@
        -I$(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_INC) $3
  
    # Remove the -incremental:no setting to get .ilk-files like in the old build.

-+  BUILD_DEMO_JVMTI_$1_LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB))
++  BUILD_DEMO_JVMTI_$1_LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB))

    $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
        SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
        LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
        OPTIMIZATION := LOW, \
        CXXFLAGS := $$($1_CXXFLAGS), \
    $$(eval $$(call SetupNativeCompilation,BUILD_DEMO_JVMTI_$1, \
        SRC := $(JDK_TOPDIR)/src/share/demo/jvmti/$1 $$(BUILD_DEMO_JVMTI_$1_EXTRA_SRC), \
        LANG := $$(BUILD_DEMO_JVMTI_$1_LANG), \
        OPTIMIZATION := LOW, \
        CXXFLAGS := $$($1_CXXFLAGS), \

--      LDFLAGS := $(filter-out -incremental:no -opt:ref, $(LDFLAGS_JDKLIB)), \
-       LDFLAGS_macosx := $(call SET_EXECUTABLE_ORIGIN), \
+-      LDFLAGS := $(filter-out -incremental:no -opt:ref, $$(LDFLAGS_JDKLIB)), \
+       LDFLAGS_macosx := $$(call SET_EXECUTABLE_ORIGIN), \

        LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
        LDFLAGS_SUFFIX_posix := $5, \
        LDFLAGS_SUFFIX := $$($1_EXTRA_CXX), \
        LDFLAGS_SUFFIX_posix := $5, \

diff --git a/current_stack_pointer.patch b/current_stack_pointer.patch
deleted file mode 100644 (file)
index e3254f2..0000000
--- a/current_stack_pointer.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -dur jdk8u-jdk8u66-b02.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp jdk8u-jdk8u66-b02/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp
---- jdk8u-jdk8u66-b02.orig/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp  2015-07-22 19:12:56.000000000 +0200
-+++ jdk8u-jdk8u66-b02/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp       2015-09-21 20:19:55.821171221 +0200
-@@ -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) {

diff --git a/openjdk8.spec b/openjdk8.spec
index 75fd0ed1abc5a7610f88d2095e42c1667bb85ea5..ca0b95267b8ed4e3806ed59486a51160f35aec5e 100644 (file)
--- a/openjdk8.spec
+++ b/openjdk8.spec
@@ -22,8 +22,8 @@
 # JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
 %define                _jdkversion 1.8.0.internal
 
 # JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
 %define                _jdkversion 1.8.0.internal
 

-%define        ver_u   72
-%define        ver_b   15
+%define        ver_u   92
+%define        ver_b   31

 Summary:       Open-source implementation of the Java Platform, Standard Edition
 Summary(pl.UTF-8):     Wolnoźródłowa implementacja Java 8 SE
 Name:          openjdk8
 Summary:       Open-source implementation of the Java Platform, Standard Edition
 Summary(pl.UTF-8):     Wolnoźródłowa implementacja Java 8 SE
 Name:          openjdk8


@@ -32,21 +32,21 @@ Release:    1
 License:       GPL v2
 Group:         Development/Languages/Java
 Source0:       %{name}-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
 License:       GPL v2
 Group:         Development/Languages/Java
 Source0:       %{name}-jdk8u%{ver_u}-b%{ver_b}.tar.bz2

-# Source0-md5: 161dfcff6fbf49649b35c86fa5bbc2b4
+# Source0-md5: 12c37c3002601a22d3738fbfc7ce7fc4

 Source1:       %{name}-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
 Source1:       %{name}-corba-jdk8u%{ver_u}-b%{ver_b}.tar.bz2

-# Source1-md5: c822b9ac498d5bfbaa82ce6fa1c126a4
+# Source1-md5: 04527579bbf4d1d62174e580c73b37f4

 Source2:       %{name}-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
 Source2:       %{name}-hotspot-jdk8u%{ver_u}-b%{ver_b}.tar.bz2

-# Source2-md5: 67a98eef6eed6fde18ec5e422bbdd074
+# Source2-md5: 9af1f1d01de54a7f1ee775747e97f603

 Source3:       %{name}-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
 Source3:       %{name}-jaxp-jdk8u%{ver_u}-b%{ver_b}.tar.bz2

-# Source3-md5: fc20a017e3d3598de65240bc9a2ffbbc
+# Source3-md5: 462b944cbf7f082ded61dc4e4437a23c

 Source4:       %{name}-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
 Source4:       %{name}-jaxws-jdk8u%{ver_u}-b%{ver_b}.tar.bz2

-# Source4-md5: 669f95ee39534dcbbe538cb59bc78742
+# Source4-md5: 8e387a76f8d7c13cc3cb28efa400a134

 Source5:       %{name}-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
 Source5:       %{name}-jdk-jdk8u%{ver_u}-b%{ver_b}.tar.bz2

-# Source5-md5: 58fa5f03c7da51a07c000881ca8e1b1b
+# Source5-md5: 4a9c93dfef91c94779dd7606df04116e

 Source6:       %{name}-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
 Source6:       %{name}-langtools-jdk8u%{ver_u}-b%{ver_b}.tar.bz2

-# Source6-md5: b85df8468b42a7c14c5d55e84339a2dd
+# Source6-md5: 5f6e4140c3ac0b76f1841a8adcaf416a

 Source7:       %{name}-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2
 Source7:       %{name}-nashorn-jdk8u%{ver_u}-b%{ver_b}.tar.bz2

-# Source7-md5: 1f9358090dc4ba710a14f31115de7c5f
+# Source7-md5: dca7539d79ca8ff2695fab7dcd260971

 Source10:      make-cacerts.sh
 Patch0:                adjust-mflags.patch
 Patch1:                format_strings.patch
 Source10:      make-cacerts.sh
 Patch0:                adjust-mflags.patch
 Patch1:                format_strings.patch


@@ -56,8 +56,6 @@ Patch4:               system-libjpeg.patch
 Patch5:                system-libpng.patch
 Patch6:                system-lcms.patch
 Patch7:                system-pcsclite.patch
 Patch5:                system-libpng.patch
 Patch6:                system-lcms.patch
 Patch7:                system-pcsclite.patch

-Patch8:                x32.patch
-Patch9:                current_stack_pointer.patch

 URL:           http://openjdk.java.net/
 BuildRequires: /usr/bin/jar
 BuildRequires: alsa-lib-devel
 URL:           http://openjdk.java.net/
 BuildRequires: /usr/bin/jar
 BuildRequires: alsa-lib-devel


@@ -423,8 +421,6 @@ done
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1

-%patch8 -p1
-%patch9 -p1

 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.
 
 %build
 # Make sure we have /proc mounted - otherwise idlc will fail later.

diff --git a/x32.patch b/x32.patch
deleted file mode 100644 (file)
index 266061f..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -durN jdk8u-jdk8u66-b02.orig/common/autoconf/platform.m4 jdk8u-jdk8u66-b02/common/autoconf/platform.m4
---- jdk8u-jdk8u66-b02.orig/common/autoconf/platform.m4 2015-07-17 09:35:23.000000000 +0200
-+++ jdk8u-jdk8u66-b02/common/autoconf/platform.m4      2015-09-21 13:18:18.439165925 +0200
-@@ -31,10 +31,20 @@
-   # First argument is the cpu name from the trip/quad
-   case "$1" in
-     x86_64)
--      VAR_CPU=x86_64
--      VAR_CPU_ARCH=x86
--      VAR_CPU_BITS=64
--      VAR_CPU_ENDIAN=little
-+      case "$target_os" in
-+        *x32)
-+          VAR_CPU=x32
-+          VAR_CPU_ARCH=x86
-+          VAR_CPU_BITS=32
-+          VAR_CPU_ENDIAN=little
-+          ;;
-+        *)
-+          VAR_CPU=x86_64
-+          VAR_CPU_ARCH=x86
-+          VAR_CPU_BITS=64
-+          VAR_CPU_ENDIAN=little
-+          ;;
-+      esac
-       ;;
-     i?86)
-       VAR_CPU=x86
-@@ -375,7 +385,16 @@
-     ppc64)   ZERO_ARCHDEF=PPC64 ;;
-     s390*)   ZERO_ARCHDEF=S390  ;;
-     sparc*)  ZERO_ARCHDEF=SPARC ;;
--    x86_64*) ZERO_ARCHDEF=AMD64 ;;
-+    x86_64*)
-+      case "$target_os" in
-+        *x32)
-+          ZERO_ARCHDEF=X32
-+          ;;
-+        *)
-+          ZERO_ARCHDEF=AMD64
-+          ;;
-+      esac
-+      ;;
-     x86)     ZERO_ARCHDEF=IA32  ;;
-     *)      ZERO_ARCHDEF=$(echo "${OPENJDK_TARGET_CPU_LEGACY_LIB}" | tr a-z A-Z)
-   esac
-diff -durN jdk8u-jdk8u66-b02.orig/hotspot/src/os/linux/vm/os_linux.cpp jdk8u-jdk8u66-b02/hotspot/src/os/linux/vm/os_linux.cpp
---- jdk8u-jdk8u66-b02.orig/hotspot/src/os/linux/vm/os_linux.cpp        2015-09-21 13:05:51.883678088 +0200
-+++ jdk8u-jdk8u66-b02/hotspot/src/os/linux/vm/os_linux.cpp     2015-09-21 13:12:58.665870862 +0200
-@@ -1902,7 +1902,7 @@
- 
-   #if  (defined IA32)
-     static  Elf32_Half running_arch_code=EM_386;
--  #elif   (defined AMD64)
-+  #elif  (defined AMD64) || (defined X32)
-     static  Elf32_Half running_arch_code=EM_X86_64;
-   #elif  (defined IA64)
-     static  Elf32_Half running_arch_code=EM_IA_64;
-diff -durN jdk8u-jdk8u66-b02.orig/jdk/make/gensrc/GensrcX11Wrappers.gmk jdk8u-jdk8u66-b02/jdk/make/gensrc/GensrcX11Wrappers.gmk
---- jdk8u-jdk8u66-b02.orig/jdk/make/gensrc/GensrcX11Wrappers.gmk       2015-07-23 16:17:35.000000000 +0200
-+++ jdk8u-jdk8u66-b02/jdk/make/gensrc/GensrcX11Wrappers.gmk    2015-09-21 13:13:00.339291213 +0200
-@@ -87,9 +87,11 @@
-       $(TOOL_WRAPPERGENERATOR) $(@D) $(GENSRC_SIZER_DIR)/xlibtypes.txt "sizer" $*
- 
-   # use -m32/-m64 only if the compiler supports it
-+  ifneq ($(OPENJDK_TARGET_CPU),x32)
-   ifeq ($(COMPILER_SUPPORTS_TARGET_BITS_FLAG), true)
-     MEMORY_MODEL_FLAG="$(COMPILER_TARGET_BITS_FLAG)$*"
-   endif
-+  endif
- 
-   # Compile the C code into an executable.
-   $(GENSRC_X11WRAPPERS_TMP)/sizer.%.exe: $(GENSRC_X11WRAPPERS_TMP)/sizer.%.c
-diff -durN jdk8u-jdk8u66-b02.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c jdk8u-jdk8u66-b02/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c
---- jdk8u-jdk8u66-b02.orig/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c   2015-07-23 16:17:35.000000000 +0200
-+++ jdk8u-jdk8u66-b02/jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c        2015-09-21 13:13:00.335957707 +0200
-@@ -35,7 +35,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #include <sys/utsname.h>
- #include <netinet/ip.h>
- 
-diff -durN jdk8u-jdk8u66-b02.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c jdk8u-jdk8u66-b02/jdk/src/solaris/native/java/net/PlainSocketImpl.c
---- jdk8u-jdk8u66-b02.orig/jdk/src/solaris/native/java/net/PlainSocketImpl.c   2015-07-23 16:17:35.000000000 +0200
-+++ jdk8u-jdk8u66-b02/jdk/src/solaris/native/java/net/PlainSocketImpl.c        2015-09-21 13:13:00.335957707 +0200
-@@ -43,7 +43,6 @@
- #endif
- #ifdef __linux__
- #include <unistd.h>
--#include <sys/sysctl.h>
- #endif
- 
- #include "jvm.h"
- 
---- jdk8u-jdk8u66-b02.orig/common/autoconf/toolchain.m4        2015-07-17 09:35:23.000000000 +0200
-+++ jdk8u-jdk8u66-b02/common/autoconf/toolchain.m4     2015-09-21 16:00:30.328673989 +0200
-@@ -361,6 +361,7 @@
-   # Option used to tell the compiler whether to create 32- or 64-bit executables
-   # Notice that CC contains the full compiler path at this point.
-   case $CC in
-+    *x32-*) COMPILER_TARGET_BITS_FLAG="-mx";;
-     *xlc_r) COMPILER_TARGET_BITS_FLAG="-q";;
-     *)      COMPILER_TARGET_BITS_FLAG="-m";;
-   esac
-
---- jdk8u-jdk8u66-b02.orig/hotspot/src/cpu/zero/vm/frame_zero.cpp      2015-07-22 19:12:56.000000000 +0200
-+++ jdk8u-jdk8u66-b02/hotspot/src/cpu/zero/vm/frame_zero.cpp   2015-09-21 15:28:59.680331993 +0200
-@@ -216,7 +216,7 @@
-     valuebuf[buflen - 1] = '\0';
- 
-     // Print the result
--    st->print_cr(" " PTR_FORMAT ": %-21s = %s", addr, fieldbuf, valuebuf);
-+    st->print_cr(" " PTR_FORMAT ": %-21s = %s", (uintptr_t)addr, fieldbuf, valuebuf);
-   }
- }
-