/hg/release/icedtea7-forest-2.3/corba: 5 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Fri Mar 21 19:38:47 UTC 2014
changeset ed7f12eb2661 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=ed7f12eb2661
author: coffeys
date: Mon Nov 11 15:52:11 2013 +0000
8027837: JDK-8021257 causes CORBA build failure on emdedded platforms
Reviewed-by: dholmes
changeset c73c14092b63 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=c73c14092b63
author: mchung
date: Thu Nov 07 20:48:38 2013 -0800
8027943: serial version of com.sun.corba.se.spi.orbutil.proxy.CompositeInvocationHandlerImpl changed in 7u45
Reviewed-by: msheppar, alanb, lancea
changeset 3a85dfaf63d8 in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=3a85dfaf63d8
author: msheppar
date: Sun Nov 24 13:09:01 2013 +0000
8028215: ORB.init fails with SecurityException if properties select the JDK default ORB
Summary: check for default ORBImpl and ORBSingleton set via properties or System properties
Reviewed-by: alanb, coffeys, mchung
changeset b181263f727f in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=b181263f727f
author: andrew
date: Thu Jan 23 22:40:30 2014 +0000
PR1653: Support ppc64le via Zero
changeset c7d0b72f704f in /hg/release/icedtea7-forest-2.3/corba
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/corba?cmd=changeset;node=c7d0b72f704f
author: andrew
date: Thu Jan 23 23:19:18 2014 +0000
PR1654: ppc32 needs a larger ThreadStackSize to build
diffstat:
make/Makefile | 2 +-
make/common/shared/Defs-java.gmk | 6 ++++-
make/common/shared/Platform.gmk | 2 +-
src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java | 2 +
src/share/classes/org/omg/CORBA/ORB.java | 11 ++++++---
5 files changed, 16 insertions(+), 7 deletions(-)
diffs (90 lines):
diff -r f12e1c039846 -r c7d0b72f704f make/Makefile
--- a/make/Makefile Tue Jan 14 20:24:44 2014 -0500
+++ b/make/Makefile Thu Jan 23 23:19:18 2014 +0000
@@ -160,7 +160,7 @@
#
# CORBA
#
-SUBDIRS = tools javax org sun com
+SUBDIRS = tools sun/rmi javax org sun com
build:
$(SUBDIRS-loop)
diff -r f12e1c039846 -r c7d0b72f704f make/common/shared/Defs-java.gmk
--- a/make/common/shared/Defs-java.gmk Tue Jan 14 20:24:44 2014 -0500
+++ b/make/common/shared/Defs-java.gmk Thu Jan 23 23:19:18 2014 +0000
@@ -79,7 +79,11 @@
# 64-bit builds require a larger thread stack size.
ifeq ($(ARCH_DATA_MODEL), 32)
- JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ ifeq ($(ARCH), ppc)
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1152
+ else
+ JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=768
+ endif
else
JAVAC_JVM_FLAGS += -J-XX:ThreadStackSize=1664
endif
diff -r f12e1c039846 -r c7d0b72f704f make/common/shared/Platform.gmk
--- a/make/common/shared/Platform.gmk Tue Jan 14 20:24:44 2014 -0500
+++ b/make/common/shared/Platform.gmk Thu Jan 23 23:19:18 2014 +0000
@@ -154,7 +154,7 @@
# Arch and OS name/version
mach := $(shell uname -m)
ifneq (,$(wildcard /usr/bin/dpkg-architecture))
- mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/')
+ mach := $(shell (dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null || echo $(mach)) | sed 's/arm64/aarch64/;s/powerpc$$/ppc/;s/hppa/parisc/;s/ppc64el/ppc64le/')
endif
archExpr = case "$(mach)" in \
i[3-9]86) \
diff -r f12e1c039846 -r c7d0b72f704f src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java
--- a/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java Tue Jan 14 20:24:44 2014 -0500
+++ b/src/share/classes/com/sun/corba/se/spi/orbutil/proxy/CompositeInvocationHandlerImpl.java Thu Jan 23 23:19:18 2014 +0000
@@ -89,4 +89,6 @@
sm.checkPermission(perm);
}
}
+
+ private static final long serialVersionUID = 4571178305984833743L;
}
diff -r f12e1c039846 -r c7d0b72f704f src/share/classes/org/omg/CORBA/ORB.java
--- a/src/share/classes/org/omg/CORBA/ORB.java Tue Jan 14 20:24:44 2014 -0500
+++ b/src/share/classes/org/omg/CORBA/ORB.java Thu Jan 23 23:19:18 2014 +0000
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1995, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1995, 2013, 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
@@ -285,7 +285,8 @@
String className = getSystemProperty(ORBSingletonClassKey);
if (className == null)
className = getPropertyFromFile(ORBSingletonClassKey);
- if (className == null) {
+ if ((className == null) ||
+ (className.equals("com.sun.corba.se.impl.orb.ORBSingleton"))) {
singleton = new com.sun.corba.se.impl.orb.ORBSingleton();
} else {
singleton = create_impl(className);
@@ -339,7 +340,8 @@
className = getSystemProperty(ORBClassKey);
if (className == null)
className = getPropertyFromFile(ORBClassKey);
- if (className == null) {
+ if ((className == null) ||
+ (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
orb = new com.sun.corba.se.impl.orb.ORBImpl();
} else {
orb = create_impl(className);
@@ -369,7 +371,8 @@
className = getSystemProperty(ORBClassKey);
if (className == null)
className = getPropertyFromFile(ORBClassKey);
- if (className == null) {
+ if ((className == null) ||
+ (className.equals("com.sun.corba.se.impl.orb.ORBImpl"))) {
orb = new com.sun.corba.se.impl.orb.ORBImpl();
} else {
orb = create_impl(className);
More information about the distro-pkg-dev
mailing list