Date: Tue, 9 Oct 2012 20:59:37 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305604 - in head/java/openjdk6: . files Message-ID: <201210092059.q99Kxbth080670@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Tue Oct 9 20:59:37 2012 New Revision: 305604 URL: http://svn.freebsd.org/changeset/ports/305604 Log: Update to build 26. Deleted: head/java/openjdk6/files/patch-security Modified: head/java/openjdk6/Makefile head/java/openjdk6/distinfo head/java/openjdk6/files/patch-set Modified: head/java/openjdk6/Makefile ============================================================================== --- head/java/openjdk6/Makefile Tue Oct 9 20:41:30 2012 (r305603) +++ head/java/openjdk6/Makefile Tue Oct 9 20:59:37 2012 (r305604) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= openjdk6 -PORTVERSION= b25 -PORTREVISION?= 4 +PORTVERSION= b26 +PORTREVISION?= 0 CATEGORIES= java devel MASTER_SITES= http://download.java.net/openjdk/jdk6/promoted/${PORTVERSION}/ \ http://download.java.net/jaxp/openjdk/jdk6/:jaxp \ @@ -37,7 +37,7 @@ LIB_DEPENDS= freetype:${PORTSDIR}/print/ RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \ ${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu -OPENJDK_BUILDDATE= 01_may_2012 +OPENJDK_BUILDDATE= 21_sep_2012 OPTIONS_DEFINE= ICEDTEA IPV6 POLICY SOUND TZUPDATE OPTIONS_DEFAULT=ICEDTEA TZUPDATE @@ -63,7 +63,7 @@ USE_MOTIF= yes USE_XORG= x11 xext xi xt xtst MAKE_JOBS_UNSAFE= yes -JAXP_BUILD= 144_03 +JAXP_BUILD= 144_04 JAXPFILE= jaxp${JAXP_BUILD}.zip JAXWS_BUILD= 2_1_6-2011_06_13 JAXWSFILE= jdk6-jaxws${JAXWS_BUILD}.zip Modified: head/java/openjdk6/distinfo ============================================================================== --- head/java/openjdk6/distinfo Tue Oct 9 20:41:30 2012 (r305603) +++ head/java/openjdk6/distinfo Tue Oct 9 20:59:37 2012 (r305604) @@ -1,7 +1,7 @@ -SHA256 (openjdk-6-src-b25-01_may_2012.tar.gz) = 42db988b436593017e29d6543ac09168a901027817e41dc1be5c795b85d53b05 -SIZE (openjdk-6-src-b25-01_may_2012.tar.gz) = 45761297 -SHA256 (jaxp144_03.zip) = c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012 -SIZE (jaxp144_03.zip) = 5964999 +SHA256 (openjdk-6-src-b26-21_sep_2012.tar.gz) = 9635d8563b9ba811f1d6e333861f235a2d8835c623451abc44791891d40d8b09 +SIZE (openjdk-6-src-b26-21_sep_2012.tar.gz) = 45775426 +SHA256 (jaxp144_04.zip) = 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c +SIZE (jaxp144_04.zip) = 5976385 SHA256 (jdk6-jaxws2_1_6-2011_06_13.zip) = 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 SIZE (jdk6-jaxws2_1_6-2011_06_13.zip) = 5512710 SHA256 (jdk6-jaf-b20.zip) = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 Modified: head/java/openjdk6/files/patch-set ============================================================================== --- head/java/openjdk6/files/patch-set Tue Oct 9 20:41:30 2012 (r305603) +++ head/java/openjdk6/files/patch-set Tue Oct 9 20:59:37 2012 (r305604) @@ -1,5 +1,5 @@ ---- Makefile 2011-07-05 14:29:12.000000000 -0400 -+++ Makefile 2011-07-07 19:17:02.000000000 -0400 +--- Makefile ++++ Makefile @@ -236,6 +236,18 @@ clean: clobber @@ -19,8 +19,8 @@ # # Dev builds # ---- corba/make/common/Defs-bsd.gmk 2011-07-07 19:16:00.000000000 -0400 -+++ corba/make/common/Defs-bsd.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/Defs-bsd.gmk ++++ corba/make/common/Defs-bsd.gmk @@ -40,18 +40,12 @@ # Get shared JDK settings include $(BUILDDIR)/common/shared/Defs.gmk @@ -142,8 +142,8 @@ override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER override SUN_CMM_SUBDIR = override THREADS_FLAG = native ---- corba/make/common/Defs-linux.gmk 2011-07-05 14:29:22.000000000 -0400 -+++ corba/make/common/Defs-linux.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/Defs-linux.gmk ++++ corba/make/common/Defs-linux.gmk @@ -290,7 +290,7 @@ override LIBTHREAD = override MOOT_PRIORITIES = true @@ -153,8 +153,8 @@ ifeq ($(ARCH), amd64) override OPENWIN_LIB = $(OPENWIN_HOME)/lib64 else ---- corba/make/common/Defs.gmk 2011-07-05 14:29:22.000000000 -0400 -+++ corba/make/common/Defs.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/Defs.gmk ++++ corba/make/common/Defs.gmk @@ -53,6 +53,24 @@ _OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH) @@ -190,8 +190,8 @@ endif # PROGRAM LDLIBS_COMMON += $(EXTRA_LIBS) ---- corba/make/common/Mapfile-vers.gmk 2011-07-05 14:29:22.000000000 -0400 -+++ corba/make/common/Mapfile-vers.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/Mapfile-vers.gmk ++++ corba/make/common/Mapfile-vers.gmk @@ -77,7 +77,7 @@ endif # PLATFORM @@ -201,8 +201,8 @@ ifeq ($(VARIANT), OPT) # OPT build MUST have a mapfile? ---- corba/make/common/shared/Compiler-gcc.gmk 2012-05-01 17:14:04.000000000 -0400 -+++ corba/make/common/shared/Compiler-gcc.gmk 2012-09-11 18:17:45.000000000 -0400 +--- corba/make/common/shared/Compiler-gcc.gmk ++++ corba/make/common/shared/Compiler-gcc.gmk @@ -100,6 +100,24 @@ endif @@ -228,8 +228,8 @@ ifeq ($(PLATFORM), solaris) # Settings specific to Solaris ---- corba/make/common/shared/Compiler.gmk 2011-07-05 14:29:22.000000000 -0400 -+++ corba/make/common/shared/Compiler.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/shared/Compiler.gmk ++++ corba/make/common/shared/Compiler.gmk @@ -42,6 +42,11 @@ override CC_VERSION = gcc endif @@ -242,8 +242,8 @@ # Get the compiler specific settings include $(BUILDDIR)/common/shared/Compiler-$(CC_VERSION).gmk ---- corba/make/common/shared/Defs-bsd.gmk 2011-07-07 19:16:00.000000000 -0400 -+++ corba/make/common/shared/Defs-bsd.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/shared/Defs-bsd.gmk ++++ corba/make/common/shared/Defs-bsd.gmk @@ -54,7 +54,7 @@ endef @@ -262,8 +262,8 @@ endif # _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK. ---- corba/make/common/shared/Defs-java.gmk 2011-07-05 14:29:22.000000000 -0400 -+++ corba/make/common/shared/Defs-java.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/shared/Defs-java.gmk ++++ corba/make/common/shared/Defs-java.gmk @@ -38,7 +38,7 @@ # Suspect this may not be needed anymore. JAVA_MEM_FLAGS += -Xms$(MAX_VM_MEMORY)m -XX:-Inline @@ -273,8 +273,8 @@ endif # ---- corba/make/common/shared/Defs-utils.gmk 2011-07-05 14:29:22.000000000 -0400 -+++ corba/make/common/shared/Defs-utils.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/shared/Defs-utils.gmk ++++ corba/make/common/shared/Defs-utils.gmk @@ -53,6 +53,13 @@ UTILS_DEVTOOL_PATH=$(USRBIN_PATH) endif @@ -322,8 +322,8 @@ + TAR = $(UTILS_USR_BIN_PATH)tar + endif +endif ---- corba/make/common/shared/Platform.gmk 2011-07-05 14:29:22.000000000 -0400 -+++ corba/make/common/shared/Platform.gmk 2011-07-07 19:17:02.000000000 -0400 +--- corba/make/common/shared/Platform.gmk ++++ corba/make/common/shared/Platform.gmk @@ -261,6 +261,76 @@ MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2) endif @@ -401,7 +401,7 @@ # Windows with and without CYGWIN will be slightly different ifeq ($(SYSTEM_UNAME), Windows_NT) PLATFORM = windows -@@ -375,7 +445,14 @@ +@@ -408,7 +478,14 @@ # build machines and adjustments will be made to prevent excessing # system swapping during the build. # If we don't know, assume 512. Subtract 128 from MB for VM MAX. @@ -417,7 +417,7 @@ ifneq ($(MB_OF_MEMORY),) LOW_MEMORY_MACHINE := $(shell \ if [ $(MB_OF_MEMORY) -le 512 ] ; then \ -@@ -387,7 +464,7 @@ +@@ -420,7 +497,7 @@ if [ $(MB_OF_MEMORY) -le 1024 ] ; then \ expr $(MB_OF_MEMORY) '-' 128 ; \ else \ @@ -426,8 +426,8 @@ fi) MIN_VM_MEMORY := $(shell \ if [ $(MAX_VM_MEMORY) -le 128 ] ; then \ ---- hotspot/agent/make/Makefile 2011-07-05 14:30:51.000000000 -0400 -+++ hotspot/agent/make/Makefile 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/make/Makefile ++++ hotspot/agent/make/Makefile @@ -52,6 +52,9 @@ sun.jvm.hotspot.compiler \ sun.jvm.hotspot.debugger \ @@ -468,8 +468,8 @@ sun/jvm/hotspot/runtime/ia64/*.java \ sun/jvm/hotspot/runtime/linux/*.java \ sun/jvm/hotspot/runtime/linux_amd64/*.java \ ---- hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/BsdDebuggerLocal.c ++++ hotspot/agent/src/os/bsd/BsdDebuggerLocal.c @@ -22,6 +22,7 @@ * */ @@ -609,8 +609,8 @@ #endif /* amd64 */ ---- hotspot/agent/src/os/bsd/Makefile 2012-05-01 17:15:02.000000000 -0400 -+++ hotspot/agent/src/os/bsd/Makefile 2012-09-18 17:50:06.000000000 -0400 +--- hotspot/agent/src/os/bsd/Makefile ++++ hotspot/agent/src/os/bsd/Makefile @@ -22,8 +22,8 @@ # # @@ -686,8 +686,8 @@ + rm -f test.o + -rmdir $(ARCH) ---- hotspot/agent/src/os/bsd/elfmacros.h 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/elfmacros.h 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/elfmacros.h ++++ hotspot/agent/src/os/bsd/elfmacros.h @@ -25,16 +25,19 @@ #ifndef _ELFMACROS_H_ #define _ELFMACROS_H_ @@ -723,8 +723,8 @@ #endif ---- hotspot/agent/src/os/bsd/libproc.h 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/libproc.h 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/libproc.h ++++ hotspot/agent/src/os/bsd/libproc.h @@ -27,7 +27,8 @@ #include <unistd.h> @@ -785,8 +785,8 @@ // get number of shared objects int get_num_libs(struct ps_prochandle* ph); ---- hotspot/agent/src/os/bsd/libproc_impl.c 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/libproc_impl.c 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/libproc_impl.c ++++ hotspot/agent/src/os/bsd/libproc_impl.c @@ -174,10 +174,13 @@ return NULL; } @@ -929,8 +929,8 @@ + print_debug("ps_pcontinue not implemented\n"); return PS_OK; } ---- hotspot/agent/src/os/bsd/libproc_impl.h 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/libproc_impl.h 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/libproc_impl.h ++++ hotspot/agent/src/os/bsd/libproc_impl.h @@ -47,7 +47,7 @@ typedef struct thread_info { lwpid_t lwp_id; @@ -984,8 +984,8 @@ // a test for ELF signature without using libelf bool is_elf_file(int fd); ---- hotspot/agent/src/os/bsd/mapfile 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/mapfile 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/mapfile ++++ hotspot/agent/src/os/bsd/mapfile @@ -43,13 +43,17 @@ # proc_service.h functions - to be used by libthread_db ps_getpid; @@ -1007,8 +1007,8 @@ # used by attach test program init_libproc; ---- hotspot/agent/src/os/bsd/proc_service.h 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/proc_service.h 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/proc_service.h ++++ hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 19:00:00.000000000 -0500 @@ -1,76 +0,0 @@ -/* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. @@ -1086,8 +1086,8 @@ -ps_err_e ps_get_thread_area(); - -#endif /* _PROC_SERVICE_H_ */ ---- hotspot/agent/src/os/bsd/ps_core.c 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/ps_core.c 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/ps_core.c ++++ hotspot/agent/src/os/bsd/ps_core.c @@ -142,6 +142,7 @@ map->next = ph->core->class_share_maps; @@ -1409,8 +1409,8 @@ struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle)); if (ph == NULL) { ---- hotspot/agent/src/os/bsd/ps_proc.c 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/ps_proc.c 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/ps_proc.c ++++ hotspot/agent/src/os/bsd/ps_proc.c @@ -22,20 +22,22 @@ * */ @@ -1982,8 +1982,8 @@ - } return ph; } ---- hotspot/agent/src/os/bsd/salibelf.c 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/salibelf.c 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/salibelf.c ++++ hotspot/agent/src/os/bsd/salibelf.c @@ -25,6 +25,7 @@ #include "salibelf.h" #include <stdlib.h> @@ -1992,8 +1992,8 @@ extern void print_debug(const char*,...); ---- hotspot/agent/src/os/bsd/symtab.c 2012-01-12 17:22:08.000000000 -0500 -+++ hotspot/agent/src/os/bsd/symtab.c 2012-01-12 16:54:45.000000000 -0500 +--- hotspot/agent/src/os/bsd/symtab.c ++++ hotspot/agent/src/os/bsd/symtab.c @@ -23,10 +23,11 @@ */ @@ -2538,8 +2538,8 @@ } return NULL; } ---- hotspot/agent/src/os/bsd/symtab.h 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/symtab.h 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/symtab.h ++++ hotspot/agent/src/os/bsd/symtab.h @@ -32,7 +32,7 @@ struct symtab; @@ -2549,8 +2549,8 @@ // destroy the symbol table void destroy_symtab(struct symtab* symtab); ---- hotspot/agent/src/os/bsd/test.c 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/agent/src/os/bsd/test.c 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/os/bsd/test.c ++++ hotspot/agent/src/os/bsd/test.c @@ -44,7 +44,7 @@ } @@ -2560,8 +2560,8 @@ return 1; } } ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-07-05 14:30:52.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java @@ -28,6 +28,7 @@ import java.net.*; import java.rmi.*; @@ -2631,8 +2631,8 @@ /** Convenience routine which should be called by per-platform debugger setup. Should not be called when startupMode is REMOTE_MODE. */ ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-07-05 14:30:53.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java @@ -29,6 +29,7 @@ import java.rmi.*; import sun.jvm.hotspot.*; @@ -2704,8 +2704,8 @@ /** Convenience routine which should be called by per-platform debugger setup. Should not be called when startupMode is REMOTE_MODE. */ ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java @@ -30,10 +30,8 @@ import sun.jvm.hotspot.debugger.cdbg.*; import sun.jvm.hotspot.debugger.x86.*; @@ -2731,8 +2731,8 @@ } else { throw new DebuggerException(cpu + " is not yet supported"); } ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java @@ -26,9 +26,7 @@ import sun.jvm.hotspot.debugger.*; @@ -2754,8 +2754,8 @@ } else { throw new RuntimeException("cpu " + cpu + " is not yet supported"); } ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java 2011-07-05 14:30:54.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/ConnectorImpl.java @@ -217,7 +217,7 @@ } @@ -2765,8 +2765,8 @@ // link "saproc" - SA native library on SunOS and Linux? sm.checkLink("saproc"); } else if (os.startsWith("Windows")) { ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/SAPIDAttachingConnector.java 2011-07-05 14:30:54.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/SAPIDAttachingConnector.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/SAPIDAttachingConnector.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/jdi/SAPIDAttachingConnector.java @@ -66,7 +66,7 @@ try { // Whether the caller can perform link against SA native library? @@ -2776,8 +2776,8 @@ // Whether the caller can read /proc/<pid> file? sm.checkRead("/proc/" + pid); } ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-07-05 14:30:55.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java @@ -37,6 +37,8 @@ import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess; import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess; @@ -2801,8 +2801,8 @@ } if (access == null) { ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java @@ -28,37 +28,36 @@ private static String[] signalNames = { "", /* No signal 0 */ @@ -2863,8 +2863,8 @@ }; public static String getSignalName(int sigNum) { ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java @@ -28,37 +28,36 @@ private static String[] signalNames = { "", /* No signal 0 */ @@ -2925,8 +2925,8 @@ }; public static String getSignalName(int sigNum) { ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-07-05 14:30:55.000000000 -0400 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java @@ -37,6 +37,14 @@ return "solaris"; } else if (os.equals("Linux")) { @@ -2942,8 +2942,8 @@ } else if (os.startsWith("Windows")) { return "win32"; } else { ---- hotspot/make/Makefile 2011-07-05 14:30:56.000000000 -0400 -+++ hotspot/make/Makefile 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/Makefile ++++ hotspot/make/Makefile @@ -321,28 +321,28 @@ ifneq ($(OSNAME),windows) ifeq ($(ZERO_BUILD), true) @@ -2983,8 +2983,8 @@ $(install-file) endif endif ---- hotspot/make/bsd/Makefile 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/Makefile 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/Makefile ++++ hotspot/make/bsd/Makefile @@ -39,11 +39,11 @@ # One can set ALT_BOOTDIR or BOOTDIR to point to a jdk that runs on # an architecture that differs from the target architecture, as long @@ -3017,14 +3017,14 @@ # Solaris 2.5.1, 2.6). # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok. --SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% -+#SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% +-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% ++#SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% +DISABLE_HOTSPOT_OS_VERSION_CHECK = ok OS_VERSION := $(shell uname -r) EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION)) ---- hotspot/make/bsd/makefiles/adlc.make 2012-05-01 17:15:06.000000000 -0400 -+++ hotspot/make/bsd/makefiles/adlc.make 2012-09-17 19:50:44.000000000 -0400 +--- hotspot/make/bsd/makefiles/adlc.make ++++ hotspot/make/bsd/makefiles/adlc.make @@ -60,7 +60,8 @@ # CFLAGS_WARN holds compiler options to suppress/enable warnings. @@ -3035,8 +3035,8 @@ CFLAGS += $(CFLAGS_WARN) OBJECTNAMES = \ ---- hotspot/make/bsd/makefiles/buildtree.make 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/makefiles/buildtree.make 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/makefiles/buildtree.make ++++ hotspot/make/bsd/makefiles/buildtree.make @@ -303,10 +303,11 @@ [ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \ { \ @@ -3050,8 +3050,8 @@ ) > $@ env.csh: env.sh ---- hotspot/make/bsd/makefiles/cscope.make 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/makefiles/cscope.make 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/makefiles/cscope.make ++++ hotspot/make/bsd/makefiles/cscope.make @@ -71,7 +71,7 @@ # OS-specific files for other systems are excluded by default. Use CS_OS=yes # to include platform-specific files for other platforms. @@ -3061,8 +3061,8 @@ CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS})) endif ---- hotspot/make/bsd/makefiles/defs.make 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/makefiles/defs.make 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/makefiles/defs.make ++++ hotspot/make/bsd/makefiles/defs.make @@ -72,8 +72,8 @@ HS_ARCH = sparc endif @@ -3169,8 +3169,8 @@ EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH)) - - ---- hotspot/make/bsd/makefiles/gcc.make 2012-05-01 17:15:06.000000000 -0400 -+++ hotspot/make/bsd/makefiles/gcc.make 2012-09-18 11:31:25.000000000 -0400 +--- hotspot/make/bsd/makefiles/gcc.make ++++ hotspot/make/bsd/makefiles/gcc.make @@ -22,20 +22,24 @@ # # @@ -3303,8 +3303,8 @@ #------------------------------------------------------------------------ # Debug flags ---- hotspot/make/bsd/makefiles/jsig.make 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/makefiles/jsig.make 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/makefiles/jsig.make ++++ hotspot/make/bsd/makefiles/jsig.make @@ -25,11 +25,16 @@ # Rules to build signal interposition library, used by vm.make @@ -3344,8 +3344,8 @@ $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } install_jsig: $(LIBJSIG) ---- hotspot/make/bsd/makefiles/launcher.make 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/makefiles/launcher.make 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/makefiles/launcher.make ++++ hotspot/make/bsd/makefiles/launcher.make @@ -50,7 +50,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -3355,8 +3355,8 @@ LIBS_LAUNCHER += -l$(JVM) $(LIBS) endif ---- hotspot/make/bsd/makefiles/sa.make 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/makefiles/sa.make 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/makefiles/sa.make ++++ hotspot/make/bsd/makefiles/sa.make @@ -45,8 +45,8 @@ # gnumake 3.78.1 does not accept the *s that @@ -3368,8 +3368,8 @@ AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list ---- hotspot/make/bsd/makefiles/saproc.make 2012-01-12 17:22:09.000000000 -0500 -+++ hotspot/make/bsd/makefiles/saproc.make 2012-01-12 16:55:29.000000000 -0500 +--- hotspot/make/bsd/makefiles/saproc.make ++++ hotspot/make/bsd/makefiles/saproc.make @@ -25,23 +25,33 @@ # Rules to build serviceability agent library, used by vm.make @@ -3436,8 +3436,8 @@ $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } install_saproc: $(BUILDLIBSAPROC) ---- hotspot/make/bsd/makefiles/vm.make 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/makefiles/vm.make 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/makefiles/vm.make ++++ hotspot/make/bsd/makefiles/vm.make @@ -91,6 +91,10 @@ ${JRE_VERSION} \ ${VM_DISTRO} @@ -3555,24 +3555,24 @@ } DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) ---- hotspot/make/bsd/platform_amd64 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/platform_amd64 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/platform_amd64 ++++ hotspot/make/bsd/platform_amd64 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DAMD64 +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64 ---- hotspot/make/bsd/platform_i486 2011-07-07 19:16:00.000000000 -0400 -+++ hotspot/make/bsd/platform_i486 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/bsd/platform_i486 ++++ hotspot/make/bsd/platform_i486 @@ -12,4 +12,4 @@ compiler = gcc -sysdefs = -DBSD -D_GNU_SOURCE -DIA32 +sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32 ---- hotspot/make/defs.make 2011-07-05 14:30:56.000000000 -0400 -+++ hotspot/make/defs.make 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/defs.make ++++ hotspot/make/defs.make @@ -118,13 +118,23 @@ # Windows should have OS predefined ifeq ($(OS),) @@ -3599,8 +3599,8 @@ else OSNAME=solaris endif ---- hotspot/make/sa.files 2011-07-05 14:30:56.000000000 -0400 -+++ hotspot/make/sa.files 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/make/sa.files ++++ hotspot/make/sa.files @@ -50,6 +50,9 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \ @@ -3621,8 +3621,8 @@ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/ia64/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux/*.java \ $(AGENT_SRC_DIR)/sun/jvm/hotspot/runtime/linux_amd64/*.java \ ---- hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/bytes_x86.hpp ++++ hotspot/src/cpu/x86/vm/bytes_x86.hpp @@ -81,6 +81,9 @@ #ifdef TARGET_OS_ARCH_windows_x86 # include "bytes_windows_x86.inline.hpp" @@ -3633,8 +3633,8 @@ #endif // CPU_X86_VM_BYTES_X86_HPP ---- hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp ++++ hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp @@ -481,8 +481,8 @@ // Fetch the exception from TLS and clear out exception related thread state __ get_thread(rsi); @@ -3646,8 +3646,8 @@ __ bind(_unwind_handler_entry); __ verify_not_null_oop(rax); ---- hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/copy_x86.hpp ++++ hotspot/src/cpu/x86/vm/copy_x86.hpp @@ -37,6 +37,9 @@ #ifdef TARGET_OS_ARCH_windows_x86 # include "copy_windows_x86.inline.hpp" @@ -3658,8 +3658,8 @@ static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) { ---- hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp ++++ hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp @@ -45,6 +45,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -3688,8 +3688,8 @@ // index is positive and so should have correct value if this code were // used on 64bits imulptr(index, reg2); ---- hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp ++++ hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp @@ -45,6 +45,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -3700,8 +3700,8 @@ // Implementation of InterpreterMacroAssembler ---- hotspot/src/cpu/x86/vm/jni_x86.h 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/jni_x86.h 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/jni_x86.h ++++ hotspot/src/cpu/x86/vm/jni_x86.h @@ -26,7 +26,7 @@ #ifndef _JAVASOFT_JNI_MD_H_ #define _JAVASOFT_JNI_MD_H_ @@ -3711,8 +3711,8 @@ #define JNIEXPORT #define JNIIMPORT #define JNICALL ---- hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp ++++ hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp @@ -47,6 +47,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -3723,8 +3723,8 @@ #ifdef COMPILER2 #include "opto/runtime.hpp" #endif ---- hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp ++++ hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp @@ -47,6 +47,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -3735,8 +3735,8 @@ #ifdef COMPILER2 #include "opto/runtime.hpp" #endif ---- hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp ++++ hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -3747,8 +3747,8 @@ // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. ---- hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp ++++ hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp @@ -35,6 +35,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "thread_windows.inline.hpp" @@ -3759,8 +3759,8 @@ // Implementation of the platform-specific part of StubRoutines - for // a description of how to extend it, see the stubRoutines.hpp file. ---- hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/x86/vm/vm_version_x86.cpp ++++ hotspot/src/cpu/x86/vm/vm_version_x86.cpp @@ -37,6 +37,9 @@ #ifdef TARGET_OS_FAMILY_windows # include "os_windows.inline.hpp" @@ -3771,8 +3771,8 @@ int VM_Version::_cpu; ---- hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-07-05 14:30:57.000000000 -0400 -+++ hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/zero/vm/bytes_zero.hpp ++++ hotspot/src/cpu/zero/vm/bytes_zero.hpp @@ -168,6 +168,9 @@ #ifdef TARGET_OS_ARCH_linux_zero # include "bytes_linux_zero.inline.hpp" @@ -3783,8 +3783,8 @@ #endif // VM_LITTLE_ENDIAN ---- hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-07-05 14:30:58.000000000 -0400 -+++ hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/zero/vm/interp_masm_zero.cpp ++++ hotspot/src/cpu/zero/vm/interp_masm_zero.cpp @@ -40,5 +40,8 @@ #ifdef TARGET_OS_FAMILY_linux # include "thread_linux.inline.hpp" @@ -3794,8 +3794,8 @@ +#endif // This file is intentionally empty ---- hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-07-05 14:30:58.000000000 -0400 -+++ hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp ++++ hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp @@ -43,6 +43,9 @@ #ifdef TARGET_OS_FAMILY_linux # include "thread_linux.inline.hpp" @@ -3806,8 +3806,8 @@ #ifdef COMPILER2 #include "opto/runtime.hpp" #endif ---- hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-07-05 14:30:58.000000000 -0400 -+++ hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp ++++ hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp @@ -30,6 +30,9 @@ #ifdef TARGET_OS_FAMILY_linux # include "thread_linux.inline.hpp" @@ -3818,8 +3818,8 @@ #ifdef IA32 address StubRoutines::x86::_call_stub_compiled_return = NULL; ---- hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-07-05 14:30:58.000000000 -0400 -+++ hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/cpu/zero/vm/vm_version_zero.cpp ++++ hotspot/src/cpu/zero/vm/vm_version_zero.cpp @@ -32,5 +32,8 @@ #ifdef TARGET_OS_FAMILY_linux # include "os_linux.inline.hpp" @@ -3829,8 +3829,8 @@ +#endif // This file is intentionally empty ---- hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp ++++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp @@ -170,53 +170,41 @@ // Initialization - create a listener socket and bind it to a file @@ -3954,8 +3954,8 @@ if (ret == 0) { // simple check to avoid starting the attach mechanism when // a bogus user creates the file ---- hotspot/src/os/bsd/vm/jsig.c 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/jsig.c 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/jsig.c ++++ hotspot/src/os/bsd/vm/jsig.c @@ -143,7 +143,8 @@ } @@ -3966,8 +3966,8 @@ } static int call_os_sigaction(int sig, const struct sigaction *act, ---- hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/jvm_bsd.cpp ++++ hotspot/src/os/bsd/vm/jvm_bsd.cpp @@ -146,38 +146,31 @@ "ILL", SIGILL, /* Illegal instruction (ANSI). */ "TRAP", SIGTRAP, /* Trace trap (POSIX). */ @@ -4017,8 +4017,8 @@ }; JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name)) ---- hotspot/src/os/bsd/vm/jvm_bsd.h 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/jvm_bsd.h 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/jvm_bsd.h ++++ hotspot/src/os/bsd/vm/jvm_bsd.h @@ -54,7 +54,11 @@ #define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"} @@ -4052,8 +4052,8 @@ #endif /* JVM_MD_H */ // Reconciliation History ---- hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/osThread_bsd.cpp ++++ hotspot/src/os/bsd/vm/osThread_bsd.cpp @@ -43,8 +43,12 @@ void OSThread::pd_initialize() { @@ -4068,8 +4068,8 @@ _siginfo = NULL; _ucontext = NULL; _expanding_stack = 0; ---- hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/osThread_bsd.hpp ++++ hotspot/src/os/bsd/vm/osThread_bsd.hpp @@ -39,6 +39,7 @@ private: @@ -4130,8 +4130,8 @@ pthread_t pthread_id() const { return _pthread_id; } ---- hotspot/src/os/bsd/vm/os_bsd.cpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/os_bsd.cpp ++++ hotspot/src/os/bsd/vm/os_bsd.cpp @@ -88,7 +88,6 @@ # include <sys/mman.h> # include <sys/stat.h> @@ -5661,8 +5661,8 @@ // execve failed _exit(-1); ---- hotspot/src/os/bsd/vm/os_bsd.hpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/os_bsd.hpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/os_bsd.hpp ++++ hotspot/src/os/bsd/vm/os_bsd.hpp @@ -30,6 +30,12 @@ /* pthread_getattr_np comes with BsdThreads-0.9-7 on RedHat 7.1 */ typedef int (*pthread_getattr_func_type) (pthread_t, pthread_attr_t *); @@ -5801,8 +5801,8 @@ // Stack repair handling ---- hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/bsd/vm/os_bsd.inline.hpp ++++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp @@ -86,7 +86,15 @@ inline bool os::allocate_stack_guard_pages() { @@ -5837,8 +5837,8 @@ } inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf) ---- hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-09-26 19:40:10.000000000 -0400 -+++ hotspot/src/os/bsd/vm/vmError_bsd.cpp 2012-09-26 19:43:30.000000000 -0400 +--- hotspot/src/os/bsd/vm/vmError_bsd.cpp ++++ hotspot/src/os/bsd/vm/vmError_bsd.cpp @@ -34,6 +34,12 @@ #include <unistd.h> #include <signal.h> @@ -5870,8 +5870,8 @@ os::current_process_id(), os::current_process_id()); os::fork_and_exec(buf); ---- hotspot/src/os/posix/launcher/java_md.c 2012-05-01 17:15:07.000000000 -0400 -+++ hotspot/src/os/posix/launcher/java_md.c 2012-09-26 17:49:02.000000000 -0400 +--- hotspot/src/os/posix/launcher/java_md.c ++++ hotspot/src/os/posix/launcher/java_md.c @@ -41,14 +41,21 @@ #include "version_comp.h" #endif @@ -6067,16 +6067,16 @@ pthread_t tid; pthread_attr_t attr; pthread_attr_init(&attr); ---- hotspot/src/os/posix/launcher/launcher.script 2011-07-05 14:30:58.000000000 -0400 -+++ hotspot/src/os/posix/launcher/launcher.script 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os/posix/launcher/launcher.script ++++ hotspot/src/os/posix/launcher/launcher.script @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ---- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2012-05-01 17:15:08.000000000 -0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2012-09-18 13:13:53.000000000 -0400 +--- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s ++++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s @@ -21,6 +21,17 @@ # questions. # @@ -6317,8 +6317,8 @@ movl 4(%esp), %eax # src fildll (%eax) movl 8(%esp), %eax # dest ---- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s ++++ hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s @@ -21,6 +21,14 @@ # questions. # @@ -6466,8 +6466,8 @@ cmpq %rdi,%rsi leaq -8(%rdi,%rdx,8),%rax # from + count*8 - 8 jbe acl_CopyRight ---- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp ++++ hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp @@ -25,7 +25,33 @@ #ifndef OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP #define OS_CPU_BSD_X86_VM_BYTES_BSD_X86_INLINE_HPP @@ -6502,8 +6502,8 @@ // Efficient swapping of data bytes from Java byte // ordering to native byte ordering and vice versa. ---- hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-07-07 19:15:59.000000000 -0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-07-07 19:17:02.000000000 -0400 +--- hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp ++++ hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp @@ -25,9 +25,10 @@ #ifndef OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP #define OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP @@ -6531,8 +6531,8 @@ // Only used on 64 bit Windows platforms define_pd_global(bool, UseVectoredExceptions, false); ---- hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 2012-05-01 17:15:08.000000000 -0400 -+++ hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp 2012-09-18 18:21:03.000000000 -0400 +--- hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp ++++ hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp @@ -93,7 +93,7 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210092059.q99Kxbth080670>