Mercurial > hg > icedtea8

changeset 2686:34f1297047cd icedtea-3.1.0pre03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
PR3094: Zero lacks declaration of VM_Version::initialize() 2016-07-15 Andrew John Hughes <gnu.andrew@member.fsf.org> PR3094: Zero lacks declaration of VM_Version::initialize() * Makefile.am: (ICEDTEA_PATCHES): Add new temporary patch for PR3094. * NEWS: Updated with PR3094 & PR3089. * patches/pr3094.patch: Backport initialize() definition from S8078504.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Sun, 17 Jul 2016 08:30:04 +0100
parents 2295b3681f88
children ad9381c0b385
files ChangeLog Makefile.am NEWS patches/pr3094.patch
diffstat 4 files changed, 35 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jul 15 16:05:16 2016 +0100
+++ b/ChangeLog	Sun Jul 17 08:30:04 2016 +0100
@@ -1,3 +1,15 @@
+2016-07-15  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR3094: Zero lacks declaration of
+	VM_Version::initialize()
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new temporary
+	patch for PR3094.
+	* NEWS: Updated with PR3094 & PR3089.
+	* patches/pr3094.patch:
+	Backport initialize() definition from
+	S8078504.
+
 2016-07-15  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	PR3089: Remove old memory limits patch
--- a/Makefile.am	Fri Jul 15 16:05:16 2016 +0100
+++ b/Makefile.am	Sun Jul 17 08:30:04 2016 +0100
@@ -332,7 +332,8 @@
 # Patch list
 
 ICEDTEA_PATCHES = \
-	patches/override-redirect-metacity.patch
+	patches/override-redirect-metacity.patch \
+	patches/pr3094.patch
 
 # Conditional patches
 
--- a/NEWS	Fri Jul 15 16:05:16 2016 +0100
+++ b/NEWS	Sun Jul 17 08:30:04 2016 +0100
@@ -160,6 +160,7 @@
   - S8073320, PR1061: Windows HiDPI Graphics support
   - S8074807, PR3077: Fix some tests unnecessary using internal API
   - S8076315, PR3077: move 4 manual functional swing tests to regression suite
+  - S8078504, PR3094: Zero lacks declaration of VM_Version::initialize()
   - S8129822, PR3077: Define "headful" jtreg keyword
   - S8132123, PR1061: MultiResolutionCachedImage unnecessarily creates base image to get its size
   - S8133539, PR1061: [TEST_BUG] Split java/awt/image/MultiResolutionImageTest.java in two to allow restricted access
@@ -182,6 +183,7 @@
   - PR2931, G478960: Provide Infinality Support via fontconfig
   - PR2974: PKCS#10 certificate requests now use CRLF line endings rather than system line endings
   - PR3083, RH1346460: Regression in SSL debug output without an ECC provider
+  - PR3089: Remove old memory limits patch
 * AArch64 port
   - S8145320, PR3078: Create unsafe_arraycopy and generic_arraycopy for AArch64
   - S8148328, PR3078: aarch64: redundant lsr instructions in stub code.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr3094.patch	Sun Jul 17 08:30:04 2016 +0100
@@ -0,0 +1,19 @@
+diff -r bb14c5df7088 src/cpu/zero/vm/vm_version_zero.hpp
+--- openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.hpp	Thu Jul 14 04:02:40 2016 +0100
++++ openjdk/hotspot/src/cpu/zero/vm/vm_version_zero.hpp	Fri Jul 15 17:17:17 2016 +0100
+@@ -1,6 +1,6 @@
+ /*
+  * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+- * Copyright 2007 Red Hat, Inc.
++ * Copyright 2015 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
+@@ -34,6 +34,7 @@
+   static const char* cpu_features() {
+     return "";
+   }
++  static void initialize();
+ };
+ 
+ #endif // CPU_ZERO_VM_VM_VERSION_ZERO_HPP