updated to u60b16
- deleted upstreamed patches: patch501 1182011_JavaPrintApiDoesNotPrintUmlautCharsWithPostscriptOutputCorrectly.patch patch502 1182694_javaApplicationMenuMisbehave.patch patch504 1210739_dns_naming_ipv6_addresses.patch patch402 atomic_linux_zero.inline.hpp.patch patch401 fix_ZERO_ARCHDEF_ppc.patch patch400 ppc_stack_overflow_fix.patch patch204 zero-interpreter-fix.patch
This commit is contained in:
Jiri Vanek
parent
1d4d7113c0
commit
0a6a4e3c41
1
.gitignore
vendored
1
.gitignore
vendored
@ -40,3 +40,4 @@
|
||||
/jdk8-jdk8u45-b13-aarch64-jdk8u45-b13.tar.xz
|
||||
/jdk8u45-jdk8u45-b13.tar.xz
|
||||
/jdk8u45-jdk8u45-b14.tar.xz
|
||||
/jdk8u-jdk8u60-b16.tar.xz
|
||||
|
||||
@ -1,148 +0,0 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User neugens
|
||||
# Date 1421686672 -3600
|
||||
# Node ID 868404fc8be0163f50c242f473ecfbe4eccfe519
|
||||
# Parent 36c8318010acb190176744eb0a67a321ae23e711
|
||||
8067364: Printing to Postscript doesn't support dieresis
|
||||
Summary: Fix regression caused by fix for 8023990
|
||||
Reviewed-by: bae, prr
|
||||
Contributed-by: neugens@redhat.com, philip.race@oracle.com
|
||||
|
||||
diff -r 36c8318010ac -r 868404fc8be0 src/solaris/classes/sun/font/FcFontConfiguration.java
|
||||
--- jdk8/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java Tue Dec 16 19:46:22 2014 +0000
|
||||
+++ jdk8/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java Mon Jan 19 17:57:52 2015 +0100
|
||||
@@ -180,7 +180,7 @@
|
||||
String[] componentFaceNames = cfi[idx].getComponentFaceNames();
|
||||
FontDescriptor[] ret = new FontDescriptor[componentFaceNames.length];
|
||||
for (int i = 0; i < componentFaceNames.length; i++) {
|
||||
- ret[i] = new FontDescriptor(componentFaceNames[i], StandardCharsets.UTF_8.newEncoder(), new int[0]);
|
||||
+ ret[i] = new FontDescriptor(componentFaceNames[i], StandardCharsets.ISO_8859_1.newEncoder(), new int[0]);
|
||||
}
|
||||
|
||||
return ret;
|
||||
diff -r 36c8318010ac -r 868404fc8be0 test/javax/print/PrintSEUmlauts/PrintSEUmlauts.java
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ jdk8/jdk/test/javax/print/PrintSEUmlauts/PrintSEUmlauts.java Mon Jan 19 17:57:52 2015 +0100
|
||||
@@ -0,0 +1,120 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
+ *
|
||||
+ * This code is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License version 2 only, as
|
||||
+ * published by the Free Software Foundation. Oracle designates this
|
||||
+ * particular file as subject to the "Classpath" exception as provided
|
||||
+ * by Oracle in the LICENSE file that accompanied this code.
|
||||
+ *
|
||||
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
+ * version 2 for more details (a copy is included in the LICENSE file that
|
||||
+ * accompanied this code).
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License version
|
||||
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
||||
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
+ *
|
||||
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
+ * or visit www.oracle.com if you need additional information or have any
|
||||
+ * questions.
|
||||
+ */
|
||||
+import java.awt.Graphics;
|
||||
+import java.awt.GraphicsEnvironment;
|
||||
+import java.awt.print.PageFormat;
|
||||
+import java.awt.print.Printable;
|
||||
+import java.io.File;
|
||||
+import java.io.FileInputStream;
|
||||
+import java.io.FileOutputStream;
|
||||
+import java.io.IOException;
|
||||
+import java.nio.charset.StandardCharsets;
|
||||
+import javax.print.DocFlavor;
|
||||
+import javax.print.DocPrintJob;
|
||||
+import javax.print.SimpleDoc;
|
||||
+import javax.print.StreamPrintService;
|
||||
+import javax.print.StreamPrintServiceFactory;
|
||||
+import javax.print.attribute.HashDocAttributeSet;
|
||||
+import javax.print.attribute.HashPrintRequestAttributeSet;
|
||||
+import javax.print.event.PrintJobAdapter;
|
||||
+import javax.print.event.PrintJobEvent;
|
||||
+
|
||||
+/*
|
||||
+ * @test
|
||||
+ * @bug 8067364
|
||||
+ * @summary Printing to Postscript doesn't support dieresis
|
||||
+ * @build PrintSEUmlauts
|
||||
+ * @run main/othervm PrintSEUmlauts
|
||||
+ */
|
||||
+public class PrintSEUmlauts implements Printable {
|
||||
+
|
||||
+ public static void main(String[] args) throws Exception {
|
||||
+
|
||||
+ GraphicsEnvironment.getLocalGraphicsEnvironment();
|
||||
+
|
||||
+ DocFlavor flavor = DocFlavor.SERVICE_FORMATTED.PRINTABLE;
|
||||
+ String mime = DocFlavor.BYTE_ARRAY.POSTSCRIPT.getMimeType();
|
||||
+
|
||||
+ StreamPrintServiceFactory[] factories =
|
||||
+ StreamPrintServiceFactory.
|
||||
+ lookupStreamPrintServiceFactories(flavor, mime);
|
||||
+ if (factories.length == 0) {
|
||||
+ System.out.println("No print service found.");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ FileOutputStream output = new FileOutputStream("out.ps");
|
||||
+ StreamPrintService service = factories[0].getPrintService(output);
|
||||
+
|
||||
+ SimpleDoc doc =
|
||||
+ new SimpleDoc(new PrintSEUmlauts(),
|
||||
+ DocFlavor.SERVICE_FORMATTED.PRINTABLE,
|
||||
+ new HashDocAttributeSet());
|
||||
+ DocPrintJob job = service.createPrintJob();
|
||||
+ job.addPrintJobListener(new PrintJobAdapter() {
|
||||
+ @Override
|
||||
+ public void printJobCompleted(PrintJobEvent pje) {
|
||||
+ testPrintAndExit();
|
||||
+ }
|
||||
+ });
|
||||
+
|
||||
+ job.print(doc, new HashPrintRequestAttributeSet());
|
||||
+ }
|
||||
+
|
||||
+ private static final boolean DEBUG = false;
|
||||
+ private static void testPrintAndExit() {
|
||||
+ String expected = "<e4> 7.44 100.0 100.0 S";
|
||||
+ String content = "";
|
||||
+
|
||||
+ File file = new File("out.ps");
|
||||
+ if (!DEBUG) {
|
||||
+ file.deleteOnExit();
|
||||
+ }
|
||||
+
|
||||
+ try (FileInputStream stream = new FileInputStream(file)) {
|
||||
+ byte[] data = new byte[(int) file.length()];
|
||||
+ stream.read(data);
|
||||
+ content = new String(data, StandardCharsets.ISO_8859_1);
|
||||
+ } catch (IOException ex) {
|
||||
+ ex.printStackTrace();
|
||||
+ }
|
||||
+
|
||||
+ if (!content.contains(expected)) {
|
||||
+ System.err.println("FAIL");
|
||||
+ if (DEBUG) {
|
||||
+ System.err.println("printing content");
|
||||
+ System.err.println(content);
|
||||
+ }
|
||||
+ throw new RuntimeException("Expected <e4> to represent 'ä' but not found!");
|
||||
+ }
|
||||
+ System.err.println("SUCCESS");
|
||||
+ }
|
||||
+
|
||||
+ public int print(Graphics g, PageFormat pf, int pg) {
|
||||
+ if (pg > 0) return NO_SUCH_PAGE;
|
||||
+ g.drawString("ä", 100, 100);
|
||||
+ return PAGE_EXISTS;
|
||||
+ }
|
||||
+}
|
||||
|
||||
@ -1,232 +0,0 @@
|
||||
changeset: 10519:e1ca700aaa1f
|
||||
tag: tip
|
||||
user: neugens
|
||||
date: Fri Feb 27 15:50:03 2015 +0100
|
||||
summary: 8071705: Java application menu misbehaves when running multiple screen stacked vertically
|
||||
|
||||
diff --git jdk8/jdk/src/share/classes/javax/swing/JMenu.java jdk8/jdk/src/share/classes/javax/swing/JMenu.java
|
||||
--- jdk8/jdk/src/share/classes/javax/swing/JMenu.java
|
||||
+++ jdk8/jdk/src/share/classes/javax/swing/JMenu.java
|
||||
@@ -475,7 +475,8 @@
|
||||
}
|
||||
// Then the y:
|
||||
y = s.height + yOffset; // Prefer dropping down
|
||||
- if (position.y + y + pmSize.height >= screenBounds.height &&
|
||||
+ if (position.y + y + pmSize.height >= screenBounds.height
|
||||
+ + screenBounds.y &&
|
||||
// popup doesn't fit - place it wherever there's more room
|
||||
screenBounds.height - s.height < 2*(position.y
|
||||
- screenBounds.y)) {
|
||||
diff --git jdk8/jdk/test/javax/swing/JMenu/8071705/bug8071705.java jdk8/jdk/test/javax/swing/JMenu/8071705/bug8071705.java
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ jdk8/jdk/test/javax/swing/JMenu/8071705/bug8071705.java
|
||||
@@ -0,0 +1,207 @@
|
||||
+/*
|
||||
+ * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
|
||||
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
+ *
|
||||
+ * This code is free software; you can redistribute it and/or modify it
|
||||
+ * under the terms of the GNU General Public License version 2 only, as
|
||||
+ * published by the Free Software Foundation.
|
||||
+ *
|
||||
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
+ * version 2 for more details (a copy is included in the LICENSE file that
|
||||
+ * accompanied this code).
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License version
|
||||
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
||||
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
+ *
|
||||
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
+ * or visit www.oracle.com if you need additional information or have any
|
||||
+ * questions.
|
||||
+ */
|
||||
+
|
||||
+/*
|
||||
+ * @test
|
||||
+ * @bug 8071705
|
||||
+ * @summary Java application menu misbehaves when running multiple screen stacked vertically
|
||||
+ * @build bug8071705
|
||||
+ * @run main/othervm bug8071705
|
||||
+ */
|
||||
+
|
||||
+import java.awt.Dimension;
|
||||
+import java.awt.GraphicsConfiguration;
|
||||
+import java.awt.GraphicsDevice;
|
||||
+import java.awt.GraphicsEnvironment;
|
||||
+import java.awt.Point;
|
||||
+import java.awt.Rectangle;
|
||||
+import java.awt.Toolkit;
|
||||
+import java.awt.event.ComponentAdapter;
|
||||
+import java.awt.event.ComponentEvent;
|
||||
+import java.awt.event.KeyEvent;
|
||||
+import java.util.concurrent.CountDownLatch;
|
||||
+
|
||||
+import javax.swing.JFrame;
|
||||
+import javax.swing.JMenu;
|
||||
+import javax.swing.JMenuBar;
|
||||
+import javax.swing.JMenuItem;
|
||||
+import javax.swing.JPopupMenu;
|
||||
+import javax.swing.SwingUtilities;
|
||||
+import javax.swing.UIManager;
|
||||
+
|
||||
+public class bug8071705 {
|
||||
+
|
||||
+ public static void main(String[] args) throws Exception {
|
||||
+
|
||||
+ final CountDownLatch latch = new CountDownLatch(1);
|
||||
+ final boolean [] result = new boolean[1];
|
||||
+
|
||||
+ SwingUtilities.invokeLater(new Runnable() {
|
||||
+ @Override
|
||||
+ public void run() {
|
||||
+ JFrame frame = createGUI();
|
||||
+ GraphicsDevice[] devices = checkScreens();
|
||||
+
|
||||
+ // check if we have more than one and if they are stacked
|
||||
+ // vertically
|
||||
+ GraphicsDevice device = checkConfigs(devices);
|
||||
+ if (device == null) {
|
||||
+ // just pass the test
|
||||
+ frame.dispose();
|
||||
+ result[0] = true;
|
||||
+ latch.countDown();
|
||||
+ } else {
|
||||
+ FrameListener listener =
|
||||
+ new FrameListener(device, latch, result);
|
||||
+ frame.addComponentListener(listener);
|
||||
+ frame.setVisible(true);
|
||||
+ }
|
||||
+ }
|
||||
+ });
|
||||
+
|
||||
+ latch.await();
|
||||
+
|
||||
+ if (result[0] == false) {
|
||||
+ throw new RuntimeException("popup menu rendered in wrong position");
|
||||
+ }
|
||||
+
|
||||
+ System.out.println("OK");
|
||||
+ }
|
||||
+
|
||||
+ private static GraphicsDevice[] checkScreens() {
|
||||
+ GraphicsEnvironment ge =
|
||||
+ GraphicsEnvironment.getLocalGraphicsEnvironment();
|
||||
+ return ge.getScreenDevices();
|
||||
+ }
|
||||
+
|
||||
+ private static JFrame createGUI() {
|
||||
+ JMenuBar menuBar = new JMenuBar();
|
||||
+ JMenu menu = new JMenu("Some menu");
|
||||
+ menuBar.add(menu);
|
||||
+
|
||||
+ for (int i = 0; i < 10; i++) {
|
||||
+ menu.add(new JMenuItem("Some menu #" + i));
|
||||
+ }
|
||||
+
|
||||
+ JFrame frame = new JFrame();
|
||||
+ frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||
+ frame.setMinimumSize(new Dimension(200, 200));
|
||||
+ frame.setJMenuBar(menuBar);
|
||||
+ return frame;
|
||||
+ }
|
||||
+
|
||||
+ private static GraphicsDevice checkConfigs(GraphicsDevice[] devices) {
|
||||
+
|
||||
+ GraphicsDevice correctDevice = null;
|
||||
+ if (devices.length < 2) {
|
||||
+ return correctDevice;
|
||||
+ }
|
||||
+
|
||||
+ Toolkit toolkit = Toolkit.getDefaultToolkit();
|
||||
+ Rectangle screenBounds = new Rectangle(toolkit.getScreenSize());
|
||||
+ int halfScreen = screenBounds.height/2;
|
||||
+
|
||||
+ for(int i = 0; i < devices.length; i++) {
|
||||
+ if(devices[i].getType() == GraphicsDevice.TYPE_RASTER_SCREEN) {
|
||||
+ GraphicsConfiguration conf =
|
||||
+ devices[i].getDefaultConfiguration();
|
||||
+ Rectangle bounds = conf.getBounds();
|
||||
+ if (bounds.y >= halfScreen) {
|
||||
+ // found
|
||||
+ correctDevice = devices[i];
|
||||
+ break;
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ return correctDevice;
|
||||
+ }
|
||||
+
|
||||
+ private static class FrameListener extends ComponentAdapter {
|
||||
+
|
||||
+ private GraphicsDevice device;
|
||||
+ private CountDownLatch latch;
|
||||
+ private boolean [] result;
|
||||
+ public FrameListener(GraphicsDevice device,
|
||||
+ CountDownLatch latch,
|
||||
+ boolean [] result)
|
||||
+ {
|
||||
+ this.device = device;
|
||||
+ this.latch = latch;
|
||||
+ this.result = result;
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void componentShown(ComponentEvent e) {
|
||||
+ JFrame frame = (JFrame) e.getComponent();
|
||||
+
|
||||
+ runActualTest(device, latch, frame, result);
|
||||
+
|
||||
+ frame.setVisible(false);
|
||||
+ frame.dispose();
|
||||
+ latch.countDown();
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ private static Rectangle setLocation(JFrame frame, GraphicsDevice device) {
|
||||
+ GraphicsConfiguration conf = device.getDefaultConfiguration();
|
||||
+ Rectangle bounds = conf.getBounds();
|
||||
+
|
||||
+ // put just below half screen
|
||||
+ int x = bounds.x + bounds.width/2;
|
||||
+ int y = bounds.y + bounds.height/2;
|
||||
+ frame.setLocation(x, y);
|
||||
+
|
||||
+ return bounds;
|
||||
+ }
|
||||
+
|
||||
+ private static void runActualTest(GraphicsDevice device,
|
||||
+ CountDownLatch latch,
|
||||
+ JFrame frame,
|
||||
+ boolean [] result)
|
||||
+ {
|
||||
+ Rectangle screenBounds = setLocation(frame, device);
|
||||
+ JMenu menu = frame.getJMenuBar().getMenu(0);
|
||||
+ menu.doClick();
|
||||
+
|
||||
+ Point location = menu.getLocationOnScreen();
|
||||
+ JPopupMenu pm = menu.getPopupMenu();
|
||||
+ Dimension pmSize = pm.getSize();
|
||||
+
|
||||
+ int yOffset = UIManager.getInt("Menu.submenuPopupOffsetY");
|
||||
+ int height = location.y + yOffset + pmSize.height + menu.getHeight();
|
||||
+ int available = screenBounds.y + screenBounds.height - height;
|
||||
+ if (available > 0) {
|
||||
+ Point origin = pm.getLocationOnScreen();
|
||||
+ if (origin.y < location.y) {
|
||||
+ // growing upward, wrong!
|
||||
+ result[0] = false;
|
||||
+ } else {
|
||||
+ // growing downward, ok!
|
||||
+ result[0] = true;
|
||||
+ }
|
||||
+ } else {
|
||||
+ // there is no space, growing upward would be ok, so we pass
|
||||
+ result[0] = true;
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
|
||||
@ -1,138 +0,0 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User robm
|
||||
# Date 1430151427 -3600
|
||||
# Node ID b02550d62bdbaf61a258628b47acc3fc7982d7e5
|
||||
# Parent 70aaa6da3101e6c2feeabce3b36d50624ed918ad
|
||||
6991580: IPv6 Nameservers in resolv.conf throws NumberFormatException
|
||||
Reviewed-by: michaelm, andrew, alanb, rriggs
|
||||
Contributed-by: sgehwolf@redhat.com
|
||||
|
||||
diff -r 70aaa6da3101 -r b02550d62bdb src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java
|
||||
--- jdk8/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java Sun Apr 19 10:31:06 2015 +0300
|
||||
+++ jdk8/jdk/src/solaris/classes/sun/net/dns/ResolverConfigurationImpl.java Mon Apr 27 17:17:07 2015 +0100
|
||||
@@ -85,6 +85,15 @@
|
||||
if (val.charAt(0) == '#' || val.charAt(0) == ';') {
|
||||
break;
|
||||
}
|
||||
+ if ("nameserver".equals(keyword)) {
|
||||
+ if (val.indexOf(':') >= 0 &&
|
||||
+ val.indexOf('.') < 0 && // skip for IPv4 literals with port
|
||||
+ val.indexOf('[') < 0 &&
|
||||
+ val.indexOf(']') < 0 ) {
|
||||
+ // IPv6 literal, in non-BSD-style.
|
||||
+ val = "[" + val + "]";
|
||||
+ }
|
||||
+ }
|
||||
ll.add(val);
|
||||
if (--maxvalues == 0) {
|
||||
break;
|
||||
diff -r 70aaa6da3101 -r b02550d62bdb test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java
|
||||
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
|
||||
+++ jdk8/jdk/test/com/sun/jndi/dns/IPv6NameserverPlatformParsingTest.java Mon Apr 27 17:17:07 2015 +0100
|
||||
@@ -0,0 +1,104 @@
|
||||
+/*
|
||||
+ * Copyright (c) 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
|
||||
+ * under the terms of the GNU General Public License version 2 only, as
|
||||
+ * published by the Free Software Foundation.
|
||||
+ *
|
||||
+ * This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
+ * version 2 for more details (a copy is included in the LICENSE file that
|
||||
+ * accompanied this code).
|
||||
+ *
|
||||
+ * You should have received a copy of the GNU General Public License version
|
||||
+ * 2 along with this work; if not, write to the Free Software Foundation,
|
||||
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
+ *
|
||||
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
+ * or visit www.oracle.com if you need additional information or have any
|
||||
+ * questions.
|
||||
+ */
|
||||
+
|
||||
+import java.lang.reflect.Field;
|
||||
+import java.util.Hashtable;
|
||||
+
|
||||
+import javax.naming.Context;
|
||||
+import javax.naming.NamingException;
|
||||
+import javax.naming.spi.NamingManager;
|
||||
+
|
||||
+import com.sun.jndi.dns.DnsContext;
|
||||
+
|
||||
+/**
|
||||
+ * @test
|
||||
+ * @bug 6991580
|
||||
+ * @summary IPv6 Nameservers in resolv.conf throws NumberFormatException
|
||||
+ * @run main/manual IPv6NameserverPlatformParsingTest
|
||||
+ *
|
||||
+ * In order to run this test be sure to place, for example, the following
|
||||
+ * snippet into your platform's {@code /etc/resolv.conf}:
|
||||
+ * <pre>
|
||||
+ * nameserver 127.0.0.1
|
||||
+ * nameserver 2001:4860:4860::8888
|
||||
+ * nameserver [::1]:5353
|
||||
+ * nameserver 127.0.0.1:5353
|
||||
+ * </pre>
|
||||
+ *
|
||||
+ * Then, run this test as manual jtreg test.
|
||||
+ *
|
||||
+ * @author Severin Gehwolf
|
||||
+ *
|
||||
+ */
|
||||
+public class IPv6NameserverPlatformParsingTest {
|
||||
+
|
||||
+ private static boolean foundIPv6 = false;
|
||||
+
|
||||
+ public static void main(String[] args) {
|
||||
+ Hashtable<String, String> env = new Hashtable<>();
|
||||
+ env.put(Context.INITIAL_CONTEXT_FACTORY, com.sun.jndi.dns.DnsContextFactory.class.getName());
|
||||
+
|
||||
+ String[] servers;
|
||||
+ try {
|
||||
+ Context ctx = NamingManager.getInitialContext(env);
|
||||
+ if (!com.sun.jndi.dns.DnsContextFactory.platformServersAvailable()) {
|
||||
+ throw new RuntimeException("FAIL: no platform servers available, test does not make sense");
|
||||
+ }
|
||||
+ DnsContext context = (DnsContext)ctx;
|
||||
+ servers = getServersFromContext(context);
|
||||
+ } catch (NamingException e) {
|
||||
+ throw new RuntimeException(e);
|
||||
+ }
|
||||
+ for (String server: servers) {
|
||||
+ System.out.println("DEBUG: 'nameserver = " + server + "'");
|
||||
+ if (server.indexOf(':') >= 0 && server.indexOf('.') < 0) {
|
||||
+ System.out.println("DEBUG: ==> Found IPv6 address in servers list: " + server);
|
||||
+ foundIPv6 = true;
|
||||
+ }
|
||||
+ }
|
||||
+ try {
|
||||
+ new com.sun.jndi.dns.DnsClient(servers, 100, 1);
|
||||
+ } catch (NumberFormatException e) {
|
||||
+ throw new RuntimeException("FAIL: Tried to parse non-[]-encapsulated IPv6 address.", e);
|
||||
+ } catch (Exception e) {
|
||||
+ throw new RuntimeException("ERROR: Something unexpected happened.");
|
||||
+ }
|
||||
+ if (!foundIPv6) {
|
||||
+ // This is a manual test, since it requires changing /etc/resolv.conf on Linux/Unix
|
||||
+ // platforms. See comment as to how to run this test.
|
||||
+ throw new RuntimeException("ERROR: No IPv6 address returned from platform.");
|
||||
+ }
|
||||
+ System.out.println("PASS: Found IPv6 address and DnsClient parsed it correctly.");
|
||||
+ }
|
||||
+
|
||||
+ private static String[] getServersFromContext(DnsContext context) {
|
||||
+ try {
|
||||
+ Field serversField = DnsContext.class.getDeclaredField("servers");
|
||||
+ serversField.setAccessible(true);
|
||||
+ return (String[])serversField.get(context);
|
||||
+ } catch (Exception e) {
|
||||
+ throw new RuntimeException(e);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+}
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
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) {
|
||||
@ -17,32 +17,6 @@
|
||||
program_prefix=${target_alias}-
|
||||
|
||||
# Figure out the build and target systems. # Note that in autoconf terminology, "build" is obvious, but "target"
|
||||
@@ -6816,6 +6817,12 @@
|
||||
VAR_CPU=arm
|
||||
VAR_CPU_ARCH=arm
|
||||
VAR_CPU_BITS=32
|
||||
+ VAR_CPU_ENDIAN=little
|
||||
+ ;;
|
||||
+ aarch64)
|
||||
+ VAR_CPU=aarch64
|
||||
+ VAR_CPU_ARCH=aarch64
|
||||
+ VAR_CPU_BITS=64
|
||||
VAR_CPU_ENDIAN=little
|
||||
;;
|
||||
powerpc)
|
||||
@@ -6949,6 +6956,12 @@
|
||||
VAR_CPU_BITS=32
|
||||
VAR_CPU_ENDIAN=little
|
||||
;;
|
||||
+ aarch64)
|
||||
+ VAR_CPU=aarch64
|
||||
+ VAR_CPU_ARCH=aarch64
|
||||
+ VAR_CPU_BITS=64
|
||||
+ VAR_CPU_ENDIAN=little
|
||||
+ ;;
|
||||
powerpc)
|
||||
VAR_CPU=ppc
|
||||
VAR_CPU_ARCH=ppc
|
||||
@@ -7950,6 +7963,9 @@
|
||||
if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
|
||||
INCLUDE_SA=false
|
||||
@ -86,7 +60,7 @@
|
||||
+ if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
|
||||
INCLUDE_SA=false
|
||||
fi
|
||||
AC_SUBST(INCLUDE_SA)
|
||||
if test "x$OPENJDK_TARGET_CPU" = xaarch64; then
|
||||
@@ -460,12 +458,6 @@
|
||||
AC_MSG_ERROR([Update version must have a value])
|
||||
elif test "x$with_update_version" != x; then
|
||||
@ -100,21 +74,6 @@
|
||||
fi
|
||||
|
||||
AC_ARG_WITH(user-release-suffix, [AS_HELP_STRING([--with-user-release-suffix],
|
||||
--- jdk8/common/autoconf/platform.m4
|
||||
+++ jdk8/common/autoconf/platform.m4
|
||||
@@ -46,6 +46,12 @@
|
||||
VAR_CPU=arm
|
||||
VAR_CPU_ARCH=arm
|
||||
VAR_CPU_BITS=32
|
||||
+ VAR_CPU_ENDIAN=little
|
||||
+ ;;
|
||||
+ aarch64)
|
||||
+ VAR_CPU=aarch64
|
||||
+ VAR_CPU_ARCH=aarch64
|
||||
+ VAR_CPU_BITS=64
|
||||
VAR_CPU_ENDIAN=little
|
||||
;;
|
||||
powerpc)
|
||||
--- jdk8/common/autoconf/toolchain.m4
|
||||
+++ jdk8/common/autoconf/toolchain.m4
|
||||
@@ -1158,6 +1158,9 @@
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/common/autoconf/platform.m4 b/common/autoconf/platform.m4
|
||||
--- jdk8/common/autoconf/platform.m4
|
||||
+++ jdk8/common/autoconf/platform.m4
|
||||
@@ -367,7 +367,8 @@
|
||||
|
||||
# ZERO_ARCHDEF is used to enable architecture-specific code
|
||||
case "${OPENJDK_TARGET_CPU}" in
|
||||
- ppc*) ZERO_ARCHDEF=PPC ;;
|
||||
+ ppc) ZERO_ARCHDEF=PPC32 ;;
|
||||
+ ppc64) ZERO_ARCHDEF=PPC64 ;;
|
||||
s390*) ZERO_ARCHDEF=S390 ;;
|
||||
sparc*) ZERO_ARCHDEF=SPARC ;;
|
||||
x86_64*) ZERO_ARCHDEF=AMD64 ;;
|
||||
@ -116,8 +116,8 @@
|
||||
|
||||
# Standard JPackage naming and versioning defines.
|
||||
%global origin openjdk
|
||||
%global updatever 45
|
||||
%global buildver b14
|
||||
%global updatever 60
|
||||
%global buildver b16
|
||||
%global aarch64_updatever 45
|
||||
%global aarch64_buildver b13
|
||||
%global aarch64_changesetid aarch64-jdk8u45-b13
|
||||
@ -641,7 +641,7 @@ Obsoletes: java-1.7.0-openjdk-accessibility%1
|
||||
|
||||
Name: java-%{javaver}-%{origin}
|
||||
Version: %{javaver}.%{updatever}
|
||||
Release: 38.%{buildver}%{?dist}
|
||||
Release: 1.%{buildver}%{?dist}
|
||||
# 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
|
||||
@ -662,7 +662,7 @@ 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: jdk8u45-jdk8u%{updatever}-%{buildver}.tar.xz
|
||||
Source0: jdk8u-jdk8u%{updatever}-%{buildver}.tar.xz
|
||||
Source1: jdk8-jdk8u%{aarch64_updatever}-%{aarch64_buildver}-%{aarch64_changesetid}.tar.xz
|
||||
|
||||
# Custom README for -src subpackage
|
||||
@ -722,28 +722,13 @@ Patch102: %{name}-size_t.patch
|
||||
Patch201: system-libjpeg.patch
|
||||
Patch202: system-libpng.patch
|
||||
Patch203: system-lcms.patch
|
||||
Patch204: zero-interpreter-fix.patch
|
||||
|
||||
Patch300: jstack-pr1845.patch
|
||||
|
||||
# Fixed upstream. Can be removed with u60. See upstream bug:
|
||||
# https://bugs.openjdk.java.net/browse/JDK-8064815
|
||||
Patch400: ppc_stack_overflow_fix.patch
|
||||
# Fixed upstream. Can be removed with u60. See upstream bug:
|
||||
# https://bugs.openjdk.java.net/browse/JDK-8067330
|
||||
Patch401: fix_ZERO_ARCHDEF_ppc.patch
|
||||
# Fixed upstream. Can be removed with u60. 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
|
||||
|
||||
#both upstreamed, will fly away in u60 (bug IDs are Red Hat bug IDs)
|
||||
Patch501: 1182011_JavaPrintApiDoesNotPrintUmlautCharsWithPostscriptOutputCorrectly.patch
|
||||
Patch502: 1182694_javaApplicationMenuMisbehave.patch
|
||||
Patch503: d318d83c4e74.patch
|
||||
# Patch for upstream JDK-6991580 (RHBZ#1210739). Can be removed with u60
|
||||
Patch504: 1210739_dns_naming_ipv6_addresses.patch
|
||||
# Patch for upstream JDK-8078666 (RHBZ#1208369)
|
||||
Patch505: 1208369_memory_leak_gcc5.patch
|
||||
|
||||
@ -1009,7 +994,6 @@ sh %{SOURCE12}
|
||||
%patch202
|
||||
%patch203
|
||||
%ifnarch %{aarch64}
|
||||
%patch204
|
||||
%endif
|
||||
|
||||
%patch1
|
||||
@ -1027,9 +1011,6 @@ sh %{SOURCE12}
|
||||
%endif
|
||||
|
||||
# Zero PPC fixes.
|
||||
%patch400
|
||||
%patch401
|
||||
%patch402
|
||||
%patch403
|
||||
|
||||
# Extract systemtap tapsets
|
||||
@ -1039,10 +1020,7 @@ tar xzf %{SOURCE8}
|
||||
|
||||
%patch300
|
||||
|
||||
%patch501
|
||||
%patch502
|
||||
%patch503
|
||||
%patch504
|
||||
%patch505
|
||||
|
||||
%if %{include_debug_build}
|
||||
@ -1724,6 +1702,17 @@ end
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon May 25 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.60-1.b16
|
||||
- updated to u60b16
|
||||
- deleted upstreamed patches:
|
||||
patch501 1182011_JavaPrintApiDoesNotPrintUmlautCharsWithPostscriptOutputCorrectly.patch
|
||||
patch502 1182694_javaApplicationMenuMisbehave.patch
|
||||
patch504 1210739_dns_naming_ipv6_addresses.patch
|
||||
patch402 atomic_linux_zero.inline.hpp.patch
|
||||
patch401 fix_ZERO_ARCHDEF_ppc.patch
|
||||
patch400 ppc_stack_overflow_fix.patch
|
||||
patch204 zero-interpreter-fix.patch
|
||||
|
||||
* Wed May 13 2015 Jiri Vanek <jvanek@redhat.com> - 1:1.8.0.45-38.b14
|
||||
- updated to 8u45-b14 with hope to fix rhbz#1123870
|
||||
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
diff --git a/src/cpu/zero/vm/stack_zero.hpp b/src/cpu/zero/vm/stack_zero.hpp
|
||||
--- jdk8/hotspot/src/cpu/zero/vm/stack_zero.hpp
|
||||
+++ jdk8/hotspot/src/cpu/zero/vm/stack_zero.hpp
|
||||
@@ -99,7 +99,7 @@
|
||||
int shadow_pages_size() const {
|
||||
return _shadow_pages_size;
|
||||
}
|
||||
- int abi_stack_available(Thread *thread) const;
|
||||
+ ssize_t abi_stack_available(Thread *thread) const;
|
||||
|
||||
public:
|
||||
void overflow_check(int required_words, TRAPS);
|
||||
diff --git a/src/cpu/zero/vm/stack_zero.inline.hpp b/src/cpu/zero/vm/stack_zero.inline.hpp
|
||||
--- jdk8/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
|
||||
+++ jdk8/hotspot/src/cpu/zero/vm/stack_zero.inline.hpp
|
||||
@@ -47,10 +47,11 @@
|
||||
// This method returns the amount of ABI stack available for us
|
||||
// to use under normal circumstances. Note that the returned
|
||||
// value can be negative.
|
||||
-inline int ZeroStack::abi_stack_available(Thread *thread) const {
|
||||
- int stack_used = thread->stack_base() - (address) &stack_used;
|
||||
- int stack_free = thread->stack_size() - stack_used;
|
||||
- return stack_free - shadow_pages_size();
|
||||
+inline ssize_t ZeroStack::abi_stack_available(Thread *thread) const {
|
||||
+ ssize_t stack_used = thread->stack_base() - (address) &stack_used
|
||||
+ + (StackYellowPages+StackRedPages+StackShadowPages) * os::vm_page_size();
|
||||
+ ssize_t stack_free = thread->stack_size() - stack_used;
|
||||
+ return stack_free;
|
||||
}
|
||||
|
||||
#endif // CPU_ZERO_VM_STACK_ZERO_INLINE_HPP
|
||||
diff --git a/src/os/linux/vm/os_linux.cpp b/src/os/linux/vm/os_linux.cpp
|
||||
--- jdk8/hotspot/src/os/linux/vm/os_linux.cpp
|
||||
+++ jdk8/hotspot/src/os/linux/vm/os_linux.cpp
|
||||
@@ -4700,6 +4700,13 @@
|
||||
os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
|
||||
(size_t)(StackYellowPages+StackRedPages+StackShadowPages) * Linux::page_size() +
|
||||
(2*BytesPerWord COMPILER2_PRESENT(+1)) * Linux::vm_default_page_size());
|
||||
+#ifdef ZERO
|
||||
+ // If this is Zero, allow at the very minimum one page each for the
|
||||
+ // Zero stack and the native stack. This won't make any difference
|
||||
+ // for 4k pages, but is significant for large pages.
|
||||
+ os::Linux::min_stack_allowed = MAX2(os::Linux::min_stack_allowed,
|
||||
+ (size_t)(StackYellowPages+StackRedPages+StackShadowPages+2) * Linux::page_size());
|
||||
+#endif
|
||||
|
||||
size_t threadStackSizeInBytes = ThreadStackSize * K;
|
||||
if (threadStackSizeInBytes != 0 &&
|
||||
@ -25,5 +25,5 @@
|
||||
#
|
||||
# Example:
|
||||
# jdk.tls.disabledAlgorithms=MD5, SSLv3, DSA, RSA keySize < 2048
|
||||
-jdk.tls.disabledAlgorithms=SSLv3
|
||||
+jdk.tls.disabledAlgorithms=SSLv3,EC,ECDHE,ECDH
|
||||
-jdk.tls.disabledAlgorithms=SSLv3, RC4
|
||||
+jdk.tls.disabledAlgorithms=SSLv3,RC4,EC,ECDHE,ECDH
|
||||
|
||||
2
sources
2
sources
@ -1,3 +1,3 @@
|
||||
94ca5a45c3cb3b85c4577d0891166007 systemtap-tapset.tar.gz
|
||||
753feced879e36b1250fb37aa45cea75 jdk8-jdk8u45-b13-aarch64-jdk8u45-b13.tar.xz
|
||||
7e90698699505d3879401534bc544395 jdk8u45-jdk8u45-b14.tar.xz
|
||||
033b0b67913cdd1981910a0ee19cfc74 jdk8u-jdk8u60-b16.tar.xz
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
# 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…
Reference in New Issue
Block a user