diff --git a/jdk/.hgtags b/jdk/.hgtags
index 5ab0b72ea45..dbeb53c93e0 100644
--- a/jdk/.hgtags
+++ b/jdk/.hgtags
@@ -33,3 +33,4 @@ d1c43d1f5676a24ba86221ac7cad5694f3a9afda jdk7-b54
7fd3bc37afe36f8f6165ba679db1229716db822a jdk7-b56
d5a1223e961891564de25c39fba6f2442d0fb045 jdk7-b57
9ba256e2e5c161b89e638390f998baa175ec9abe jdk7-b58
+2a5a1b269e89f27ebe419ef4cf6e66a3face0df1 jdk7-b59
diff --git a/jdk/make/common/Defs-linux.gmk b/jdk/make/common/Defs-linux.gmk
index 591b6ccae31..672affde32b 100644
--- a/jdk/make/common/Defs-linux.gmk
+++ b/jdk/make/common/Defs-linux.gmk
@@ -165,6 +165,12 @@ ifeq ($(FASTDEBUG), true)
endif
endif
+# DEBUG_BINARIES overrides everything, use full -g debug information
+ifeq ($(DEBUG_BINARIES), true)
+ DEBUG_FLAG = -g
+ CFLAGS_REQUIRED += $(DEBUG_FLAG)
+endif
+
CFLAGS_OPT = $(CC_OPT)
CFLAGS_DBG = $(DEBUG_FLAG)
CFLAGS_COMMON += $(CFLAGS_REQUIRED)
@@ -240,8 +246,11 @@ AUTOMATIC_PCH_OPTION =
#
ifeq ($(VARIANT), OPT)
ifneq ($(NO_STRIP), true)
- # Debug 'strip -g' leaves local function Elf symbols (better stack traces)
- POST_STRIP_PROCESS = $(STRIP) -g
+ ifneq ($(DEBUG_BINARIES), true)
+ # Debug 'strip -g' leaves local function Elf symbols (better stack
+ # traces)
+ POST_STRIP_PROCESS = $(STRIP) -g
+ endif
endif
endif
diff --git a/jdk/make/common/shared/Defs-windows.gmk b/jdk/make/common/shared/Defs-windows.gmk
index abaa6a1807e..ceaa61e665e 100644
--- a/jdk/make/common/shared/Defs-windows.gmk
+++ b/jdk/make/common/shared/Defs-windows.gmk
@@ -277,9 +277,9 @@ ifeq ($(ARCH_DATA_MODEL), 32)
# Assume PlatformSDK is in VS71 (will be empty if VS90)
_ms_sdk :=$(call FullPath,$(_msvc_dir)/PlatformSDK)
# Assume VS90, then VS80, then VS71
- _redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v3.5/Bin)
+ _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC90.CRT)
ifeq ($(_redist_sdk),)
- _redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v2.0/Bin)
+ _redist_sdk :=$(call FullPath,$(_msvc_dir)/redist/x86/Microsoft.VC80.CRT)
ifeq ($(_redist_sdk),)
_redist_sdk :=$(call FullPath,$(_msvc_dir)/../SDK/v1.1/Bin)
endif
diff --git a/jdk/make/common/shared/Sanity.gmk b/jdk/make/common/shared/Sanity.gmk
index 84d5e2201a0..9c6a81ff3d9 100644
--- a/jdk/make/common/shared/Sanity.gmk
+++ b/jdk/make/common/shared/Sanity.gmk
@@ -1502,6 +1502,9 @@ endif
# JIBX_LIBS_PATH must be valid
######################################################
sane-jibx:
+ifdef DISABLE_NIMBUS
+ $(call SanityWarning,Disabling Nimbus will remove public API in javax.swing.plaf.nimbus.)
+else
@if [ ! -r $(subst \,/,$(JIBX_LIBS_PATH))/jibx-run.jar ]; then \
$(ECHO) "ERROR: You do not have access to valid JIBX library files. \n" \
" Please check your access to \n" \
@@ -1509,6 +1512,7 @@ sane-jibx:
" and/or check your value of ALT_JDK_DEVTOOLS_DIR, ALT_JIBX_LIBS_PATH \n" \
"" >> $(ERROR_FILE) ; \
fi
+endif
######################################################
# MOZILLA_HEADERS_PATH must be valid
diff --git a/jdk/make/docs/Makefile b/jdk/make/docs/Makefile
index 301acde0826..d20b9774a1b 100644
--- a/jdk/make/docs/Makefile
+++ b/jdk/make/docs/Makefile
@@ -323,6 +323,30 @@ HTTPSERVER_DOCTITLE = "Java$(TRADEMARK) HTTP Server"
HTTPSERVER_JAVADOCHEADER = "Java HTTP Server"
# HTTPSERVER_PKGS is located in NON_CORE_PKGS.gmk
+#
+# Variables used by sctp target
+#
+
+SCTPAPI_SOURCEPATH = $(TOPDIR)/src/share/classes
+SCTPAPI_DOCDIR = $(DOCSDIR)/jre/api/nio/sctp/spec
+
+SCTPAPI_JAVADOCFLAGS = $(COMMON_JAVADOCFLAGS) \
+ -encoding ascii \
+ -nodeprecatedlist \
+ -d $(SCTPAPI_DOCDIR) \
+ -sourcepath $(SCTPAPI_SOURCEPATH) \
+ -windowtitle $(SCTPAPI_WINDOWTITLE) \
+ -doctitle $(SCTPAPI_DOCTITLE) \
+ -header $(SCTPAPI_JAVADOCHEADER) \
+ -bottom $(SCTPAPI_JAVADOCBOTTOM) \
+ -linkoffline ../../../../../api $(DOCSDIR)/api/
+
+SCTPAPI_WINDOWTITLE = "SCTP API"
+SCTPAPI_DOCTITLE = "SCTP API"
+SCTPAPI_JAVADOCHEADER = "SCTP API"
+SCTPAPI_JAVADOCBOTTOM = 'Report a bug or request a feature.
Copyright $(THIS_YEAR) Sun Microsystems, Inc. All Rights Reserved. Use is subject to license terms.'
+# SCTPAPI_PKGS is located in NON_CORE_PKGS.gmk
+
#
# Variables used by jvmti target
#
@@ -451,6 +475,7 @@ ALL_OTHER_TARGETS = \
smartcardiodocs \
tracingdocs \
httpserverdocs \
+ sctpdocs \
mgmtdocs \
attachdocs \
jconsoledocs \
@@ -631,6 +656,14 @@ httpserverdocs:
$(JAVADOC_CMD) $(HTTPSERVER_JAVADOCFLAGS) \
$(HTTPSERVER_PKGS)
+.PHONY: sctpdocs
+sctpdocs:
+ @# ######## api-sctp #######################
+ $(RM) -r $(SCTPAPI_DOCDIR)
+ $(MKDIR) -p $(SCTPAPI_DOCDIR)
+ $(JAVADOC_CMD) $(SCTPAPI_JAVADOCFLAGS) \
+ $(SCTPAPI_PKGS)
+
.PHONY: mgmtdocs
mgmtdocs: $(COPY-MIB-TARGET)
@# ######## api-management ############################
diff --git a/jdk/make/javax/swing/plaf/Makefile b/jdk/make/javax/swing/plaf/Makefile
index aea88f2f7ff..cf3bf0aa274 100644
--- a/jdk/make/javax/swing/plaf/Makefile
+++ b/jdk/make/javax/swing/plaf/Makefile
@@ -34,7 +34,9 @@ include $(BUILDDIR)/common/Defs.gmk
#
include FILES.gmk
AUTO_FILES_JAVA_DIRS = javax/swing/plaf sun/swing com/sun/java/swing/plaf
-SUBDIRS = nimbus
+ifndef DISABLE_NIMBUS
+ SUBDIRS = nimbus
+endif
# Nimbus is handled in its own directory
AUTO_JAVA_PRUNE = nimbus
diff --git a/jdk/make/jprt.properties b/jdk/make/jprt.properties
index 5e21dba1408..9535e7361e6 100644
--- a/jdk/make/jprt.properties
+++ b/jdk/make/jprt.properties
@@ -53,19 +53,19 @@ jprt.solaris_x64.build.platform.match32=solaris_i586_5.10
# Standard list of jprt test targets for this workspace
jprt.test.targets=*-*-*-jvm98
-jprt.regression.test.targets= \
- *-*-*-java/lang, \
- *-*-*-java/security, \
- *-*-*-java/text, \
- *-*-*-java/util
+jprt.regression.test.targets= \
+ *-product-*-java/lang, \
+ *-product-*-java/security, \
+ *-product-*-java/text, \
+ *-product-*-java/util
#jprt.regression.test.targets= \
-# *-*-*-java/awt, \
-# *-*-*-java/beans, \
-# *-*-*-java/io, \
-# *-*-*-java/net, \
-# *-*-*-java/nio, \
-# *-*-*-java/rmi, \
+# *-product-*-java/awt, \
+# *-product-*-java/beans, \
+# *-product-*-java/io, \
+# *-product-*-java/net, \
+# *-product-*-java/nio, \
+# *-product-*-java/rmi, \
# Directories needed to build
jprt.bundle.exclude.src.dirs=build
diff --git a/jdk/make/sun/awt/mawt.gmk b/jdk/make/sun/awt/mawt.gmk
index c7d1b41d02b..d7c251a052e 100644
--- a/jdk/make/sun/awt/mawt.gmk
+++ b/jdk/make/sun/awt/mawt.gmk
@@ -108,7 +108,9 @@ vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/robot_child
#
-#CFLAGS += -g
+ifeq ($(DEBUG_BINARIES), true)
+ CFLAGS += -g
+endif
ifeq ($(HEADLESS),true)
CFLAGS += -DHEADLESS=$(HEADLESS)
CPPFLAGS += -DHEADLESS=$(HEADLESS)
diff --git a/jdk/make/tools/Makefile b/jdk/make/tools/Makefile
index a927209f330..badfa687a31 100644
--- a/jdk/make/tools/Makefile
+++ b/jdk/make/tools/Makefile
@@ -51,9 +51,12 @@ SUBDIRS = \
makeclasslist \
strip_properties \
spp \
- swing-nimbus \
CharsetMapping
+ifndef DISABLE_NIMBUS
+ SUBDIRS += swing-nimbus
+endif
+
all build clean clobber::
$(SUBDIRS-loop)
diff --git a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
index 42a5cc23f30..3478e2ed081 100644
--- a/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
+++ b/jdk/src/share/native/sun/java2d/cmm/lcms/LCMS.c
@@ -610,14 +610,19 @@ LCMSBOOL _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
return FALSE;
}
- if (!Icc->Grow(Icc, delta)) {
- free(ptr);
- if(isNew) {
- Icc->TagCount--;
+ /* We change the size of Icc here only if we know it'll actually
+ * grow: if Icc is about to shrink we must wait until we've read
+ * the previous data. */
+ if (delta > 0) {
+ if (!Icc->Grow(Icc, delta)) {
+ free(ptr);
+ if(isNew) {
+ Icc->TagCount--;
+ }
+ J2dRlsTraceLn(J2D_TRACE_ERROR,
+ "_cmsModifyTagData: Icc->Grow() == FALSE");
+ return FALSE;
}
- J2dRlsTraceLn(J2D_TRACE_ERROR,
- "_cmsModifyTagData: Icc->Grow() == FALSE");
- return FALSE;
}
/* Compute size of tag data before/after the modified tag */
@@ -680,6 +685,18 @@ LCMSBOOL _cmsModifyTagData(cmsHPROFILE hProfile, icTagSignature sig,
temp = TransportValue32(profileSize);
Icc->Write(Icc, sizeof(icUInt32Number), &temp);
+ /* Shrink Icc, if needed. */
+ if (delta < 0) {
+ if (!Icc->Grow(Icc, delta)) {
+ free(ptr);
+ if(isNew) {
+ Icc->TagCount--;
+ }
+ J2dRlsTraceLn(J2D_TRACE_ERROR,
+ "_cmsModifyTagData: Icc->Grow() == FALSE");
+ return FALSE;
+ }
+ }
/* Adjust tag offsets: if the tag is new, we must account
for the new tag table entry; otherwise, only those tags after
diff --git a/jdk/src/windows/native/sun/windows/awt_Window.cpp b/jdk/src/windows/native/sun/windows/awt_Window.cpp
index 3b0b1d3c260..7bd7888949e 100644
--- a/jdk/src/windows/native/sun/windows/awt_Window.cpp
+++ b/jdk/src/windows/native/sun/windows/awt_Window.cpp
@@ -464,7 +464,8 @@ void AwtWindow::CreateHWnd(JNIEnv *env, LPCWSTR title,
size_t length = env->GetStringLength(javaWarningString) + 1;
warningString = new WCHAR[length];
env->GetStringRegion(javaWarningString, 0,
- static_cast(length - 1), warningString);
+ static_cast(length - 1),
+ reinterpret_cast(warningString));
warningString[length-1] = L'\0';
env->DeleteLocalRef(javaWarningString);
diff --git a/jdk/test/Makefile b/jdk/test/Makefile
index 775e7cbc913..418a824d2b3 100644
--- a/jdk/test/Makefile
+++ b/jdk/test/Makefile
@@ -189,6 +189,7 @@ jtreg_tests: prep $(JT_HOME) $(PRODUCT_HOME) $(JTREG)
$(shell $(GETMIXEDPATH) "$(JTREG)") \
-a -v:fail,error \
-ignore:quiet \
+ -timeoutFactor:2 \
$(EXTRA_JTREG_OPTIONS) \
-r:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTreport \
-w:$(shell $(GETMIXEDPATH) "$(ABS_TEST_OUTPUT_DIR)")/JTwork \
diff --git a/jdk/test/java/lang/ThreadGroup/NullThreadName.java b/jdk/test/java/lang/ThreadGroup/NullThreadName.java
index 844fd93e2d8..fe498371852 100644
--- a/jdk/test/java/lang/ThreadGroup/NullThreadName.java
+++ b/jdk/test/java/lang/ThreadGroup/NullThreadName.java
@@ -24,6 +24,7 @@
/*
* @test
* @bug 6576763
+ * @ignore until hotspot 6776144 bug is resolved
* @summary (thread) Thread constructors throw undocumented NPE for null name
*/
diff --git a/jdk/test/java/util/ResourceBundle/RestrictedBundleTest.java b/jdk/test/java/util/ResourceBundle/RestrictedBundleTest.java
index dc8244f7c4e..4cd3763e821 100644
--- a/jdk/test/java/util/ResourceBundle/RestrictedBundleTest.java
+++ b/jdk/test/java/util/ResourceBundle/RestrictedBundleTest.java
@@ -23,6 +23,7 @@
/**
* @test
* @bug 4126805
+ * @ignore until 6842022 is resolved
* @run applet RestrictedBundleTest.html
* @summary I was able to reproduce this bug with 1.2b2, but not with the current 1.2
* build. It appears that it was fixed by changes to the class-loading mechanism,
diff --git a/jdk/test/java/util/WeakHashMap/GCDuringIteration.java b/jdk/test/java/util/WeakHashMap/GCDuringIteration.java
index c5597c43137..a52bc313fa1 100644
--- a/jdk/test/java/util/WeakHashMap/GCDuringIteration.java
+++ b/jdk/test/java/util/WeakHashMap/GCDuringIteration.java
@@ -24,6 +24,7 @@
/*
* @test
* @bug 6499848
+ * @ignore until 6842353 is resolved
* @summary Check that iterators work properly in the presence of
* concurrent finalization and removal of elements.
*/