Date: Tue, 21 Aug 2012 04:56:41 +0000 (UTC) From: Greg Lewis <glewis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r302840 - in head/java/openjdk7: . files Message-ID: <201208210456.q7L4ufP5063587@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glewis Date: Tue Aug 21 04:56:41 2012 New Revision: 302840 URL: http://svn.freebsd.org/changeset/ports/302840 Log: . Update to 7u6. . Enlist openjdk7 users as testers of ant 1.8.4. Deleted: head/java/openjdk7/files/patch-src-os-bsd-vm-attachListener_bsd.cpp head/java/openjdk7/files/patch-src-solaris-native-java-net-NetworkInterface.c head/java/openjdk7/files/patch-u5 Modified: head/java/openjdk7/Makefile head/java/openjdk7/distinfo (contents, props changed) head/java/openjdk7/files/patch-set (contents, props changed) Modified: head/java/openjdk7/Makefile ============================================================================== --- head/java/openjdk7/Makefile Tue Aug 21 03:48:27 2012 (r302839) +++ head/java/openjdk7/Makefile Tue Aug 21 04:56:41 2012 (r302840) @@ -17,9 +17,6 @@ MASTER_SITES= http://download.java.net/o http://icedtea.classpath.org/download/drops/:jaf \ ${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,} DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ - ${JAXPFILE}:jaxp \ - ${JAXWSFILE}:jaxws \ - ${JAFFILE}:jaf \ ${ANT_DISTFILE}${EXTRACT_SUFX}:ant EXTRACT_ONLY= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \ ${ANT_DISTFILE}${EXTRACT_SUFX} @@ -37,16 +34,16 @@ MAKE_JOBS_UNSAFE= YES OPTIONS= POLICY "Install the Unlimited Strength Policy Files" on \ TZUPDATE "Update the time zone data" on -PORT_MINOR_VERSION= 5 -PORT_BUILD_NUMBER= 06 +PORT_MINOR_VERSION= ${JDK_MINOR_VERSION} +PORT_BUILD_NUMBER= ${JDK_BUILD_NUMBER} JDK_MAJOR_VERSION= 7 -JDK_MINOR_VERSION= 4 -JDK_BUILD_NUMBER= 22 -JDK_BUILD_DATE= 02_may_2012 +JDK_MINOR_VERSION= 6 +JDK_BUILD_NUMBER= 24 +JDK_BUILD_DATE= 09_aug_2012 JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}u${JDK_MINOR_VERSION}-fcs-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE} # Use our own version of ant to avoid circular dependencies -ANT_VERSION= 1.8.3 +ANT_VERSION= 1.8.4 ANT_DISTFILE= apache-ant-${ANT_VERSION}-bin LATEST_LINK= openjdk7 @@ -56,10 +53,6 @@ USE_ICONV= YES USE_XORG+= x11 xext xi xrender xt xtst MAKE_JOBS_UNSAFE= yes -JAXPFILE= jaxp145_01.zip -JAXWSFILE= jdk7-jaxws2_2_4-b04-2011_06_01.zip -JAFFILE= jdk7-jaf-2010_08_19.zip - LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 \ asound.2:${PORTSDIR}/audio/alsa-lib BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ @@ -88,7 +81,6 @@ MAKE_ENV+= LANG="C" \ ALT_X11_PATH="${LOCALBASE}" \ ALT_PKG_PATH="${LOCALBASE}" \ ALT_PACKAGE_PATH="${LOCALBASE}" \ - ALT_DROPS_DIR="${DISTDIR}" \ ANT_HOME="${WRKDIR}/apache-ant-${ANT_VERSION}" \ X11DIR="${LOCALBASE}" \ LOCALDIR="${LOCALBASE}" \ @@ -96,6 +88,8 @@ MAKE_ENV+= LANG="C" \ SKIP_COMPARE_IMAGES="true" \ SKIP_FASTDEBUG_BUILD="true" \ SKIP_DEBUG_BUILD="true" \ + ZIP_DEBUGINFO_FILES=0 \ + ENABLE_FULL_DEBUG_SYMBOLS=0 \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ MILESTONE="fcs" \ JDK_MICRO_VERSION="0_0${PORT_MINOR_VERSION}" \ Modified: head/java/openjdk7/distinfo ============================================================================== --- head/java/openjdk7/distinfo Tue Aug 21 03:48:27 2012 (r302839) +++ head/java/openjdk7/distinfo Tue Aug 21 04:56:41 2012 (r302840) @@ -1,10 +1,4 @@ -SHA256 (openjdk-7u4-fcs-src-b22-02_may_2012.zip) = ed89f8e21c18bf2ff6e6711a351d06b08961a22f3dae6f8c9b4d3683b172a1af -SIZE (openjdk-7u4-fcs-src-b22-02_may_2012.zip) = 97155994 -SHA256 (jaxp145_01.zip) = c5924c6188988e2e8397ee5143bd8eaa062569d052567afd2ac9326a54a848cb -SIZE (jaxp145_01.zip) = 6389175 -SHA256 (jdk7-jaxws2_2_4-b04-2011_06_01.zip) = 6a8734d37553103da47715ebd74077d5397cae4730775b09fa2ab679650aa824 -SIZE (jdk7-jaxws2_2_4-b04-2011_06_01.zip) = 6046342 -SHA256 (jdk7-jaf-2010_08_19.zip) = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e -SIZE (jdk7-jaf-2010_08_19.zip) = 70613 -SHA256 (apache-ant-1.8.3-bin.zip) = bfc608eb306fe743493930d126408ac1cd1df14d67776616289b2f6307b14a53 -SIZE (apache-ant-1.8.3-bin.zip) = 8093329 +SHA256 (openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 22aec9bcc660d2e6502c9d24e5fdac97da9c4d251dafd87f708bcf6dabbbb431 +SIZE (openjdk-7u6-fcs-src-b24-09_aug_2012.zip) = 103796914 +SHA256 (apache-ant-1.8.4-bin.zip) = d49d60bc0468279125e4a0db4d9b6637cab342a4bd736c90c0b71865b26c1479 +SIZE (apache-ant-1.8.4-bin.zip) = 8043520 Modified: head/java/openjdk7/files/patch-set ============================================================================== --- head/java/openjdk7/files/patch-set Tue Aug 21 03:48:27 2012 (r302839) +++ head/java/openjdk7/files/patch-set Tue Aug 21 04:56:41 2012 (r302840) @@ -1,5 +1,5 @@ ---- .hgtags 2012-05-26 23:29:10.000000000 -0700 -+++ .hgtags 2012-05-15 19:58:20.000000000 -0700 +--- .hgtags 2012-08-10 09:07:00.000000000 -0700 ++++ .hgtags 2012-08-19 11:38:54.000000000 -0700 @@ -123,6 +123,7 @@ 2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146 3ac30b3852876ccad6bd61697b5f9efa91ca7bc6 jdk7u1-b01 @@ -8,8 +8,15 @@ 34451dc0580d5c95d97b95a564e6198f36545d68 jdk7u1-b02 bf735d852f79bdbb3373c777eec3ff27e035e7ba jdk7u1-b03 f66a2bada589f4157789e6f66472954d2f1c114e jdk7u1-b04 ---- corba/.hgtags 2012-05-26 23:29:10.000000000 -0700 -+++ corba/.hgtags 2012-05-15 20:07:03.000000000 -0700 +@@ -197,5 +198,4 @@ + 29f6fb1833eb2a696b95e8985126f2d70f511a82 jdk7u6-b21 + 31cdab09d719fe60876c7f3a472386c1455d93e2 jdk7u6-b22 + d1c709f1196a73d1df10d04a221b10e30fd2eb48 jdk7u6-b23 +-1ab3edf5061fdde3a6f6510373a92444445af710 jdk7u8-b01 +-d7a94c8cbbbfadbd9e2f3e4737eb7deb572dedc9 jdk7u8-b02 ++e4def733cc8c58e83b7cefa7edd89a3e2b793520 jdk7u6-b24 +--- corba/.hgtags 2012-08-10 09:09:50.000000000 -0700 ++++ corba/.hgtags 2012-08-19 11:44:59.000000000 -0700 @@ -123,6 +123,7 @@ 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146 36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01 @@ -18,8 +25,35 @@ 9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02 dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03 eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04 ---- hotspot/.hgtags 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/.hgtags 2012-05-16 19:03:30.000000000 -0700 +@@ -197,5 +198,4 @@ + 353c15c4bc371f2f8258344c988d1403477cc140 jdk7u6-b21 + 793b80c0316fcafa18668bced26acb41af3be07d jdk7u6-b22 + 2a8376123fbb81bc4b2f643ff7cfaf7f87b21c35 jdk7u6-b23 +-353c15c4bc371f2f8258344c988d1403477cc140 jdk7u8-b01 +-d17ca8d088f7cc0dd42230472f534c8d1e415bcb jdk7u8-b02 ++02512f61591f55d84458d1ea4ce84eecb7324f89 jdk7u6-b24 +--- get_source.sh 2012-08-10 09:07:01.000000000 -0700 ++++ get_source.sh 2012-08-19 11:38:54.000000000 -0700 +@@ -1,7 +1,7 @@ + #!/bin/sh + + # +-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2010, 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 +@@ -26,7 +26,7 @@ + # + + # Get clones of all nested repositories +-sh ./make/scripts/hgforest.sh clone $* ++sh ./make/scripts/hgforest.sh clone + + # Update all existing repositories to the latest sources + sh ./make/scripts/hgforest.sh pull -u +--- hotspot/.hgtags 2012-08-10 09:20:36.000000000 -0700 ++++ hotspot/.hgtags 2012-08-19 12:11:03.000000000 -0700 @@ -182,6 +182,7 @@ 38fa55e5e79232d48f1bb8cf27d88bc094c9375a hs21-b16 81d815b05abb564aa1f4100ae13491c949b9a07e jdk7-b147 @@ -28,8 +62,15 @@ 9b0ca45cd756d538c4c30afab280a91868eee1a5 jdk7u2-b01 0cc8a70952c368e06de2adab1f2649a408f5e577 jdk8-b01 31e253c1da429124bb87570ab095d9bc89850d0a jdk8-b02 ---- hotspot/agent/src/os/bsd/symtab.c 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/agent/src/os/bsd/symtab.c 2012-05-16 19:16:01.000000000 -0700 +@@ -318,5 +319,4 @@ + 02a6c89432d724119565f9ba25672829b136fc5f jdk7u6-b21 + a79d86eef6ac995a1fc35554f082f3a61abe9ae0 jdk7u6-b22 + df57f6208cb76b4e8d1a0bd0eea3d2ad577cb79b jdk7u6-b23 +-02a6c89432d724119565f9ba25672829b136fc5f jdk7u8-b01 +-528502f930967f70c320472a002418f1e38029e0 jdk7u8-b02 ++b03c2687fb16514652e79261ad68d2c601dcee62 jdk7u6-b24 +--- hotspot/agent/src/os/bsd/symtab.c 2012-08-10 09:21:04.000000000 -0700 ++++ hotspot/agent/src/os/bsd/symtab.c 2012-08-19 12:11:03.000000000 -0700 @@ -94,7 +94,7 @@ if (cursct->sh_type == SHT_SYMTAB || cursct->sh_type == SHT_STRTAB || @@ -39,8 +80,8 @@ goto quit; } } ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-05-16 19:03:30.000000000 -0700 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-08-10 09:21:14.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2012-08-19 12:11:03.000000000 -0700 @@ -33,6 +33,7 @@ import sun.jvm.hotspot.debugger.remote.*; import sun.jvm.hotspot.debugger.windbg.*; @@ -49,8 +90,8 @@ import sun.jvm.hotspot.memory.*; import sun.jvm.hotspot.oops.*; import sun.jvm.hotspot.runtime.*; ---- hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-05-16 19:03:30.000000000 -0700 +--- hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-08-10 09:21:38.000000000 -0700 ++++ hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2012-08-19 12:11:03.000000000 -0700 @@ -35,6 +35,7 @@ import sun.jvm.hotspot.debugger.windbg.*; import sun.jvm.hotspot.debugger.linux.*; @@ -59,8 +100,361 @@ import sun.jvm.hotspot.debugger.remote.*; import sun.jvm.hotspot.livejvm.*; import sun.jvm.hotspot.memory.*; ---- hotspot/make/bsd/makefiles/launcher.make 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/make/bsd/makefiles/launcher.make 2012-05-16 20:03:48.000000000 -0700 +--- hotspot/make/bsd/Makefile 2012-08-10 09:22:55.000000000 -0700 ++++ hotspot/make/bsd/Makefile 2012-08-19 12:11:04.000000000 -0700 +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 1999, 2012, 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 +@@ -211,6 +211,8 @@ + BUILDTREE_VARS = GAMMADIR=$(GAMMADIR) OS_FAMILY=$(OSNAME) SRCARCH=$(SRCARCH) BUILDARCH=$(BUILDARCH) LIBARCH=$(LIBARCH) LIBRARY_SUFFIX=$(LIBRARY_SUFFIX) + BUILDTREE_VARS += HOTSPOT_RELEASE_VERSION=$(HOTSPOT_RELEASE_VERSION) HOTSPOT_BUILD_VERSION=$(HOTSPOT_BUILD_VERSION) JRE_RELEASE_VERSION=$(JRE_RELEASE_VERSION) + ++BUILDTREE_VARS += ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS) OBJCOPY=$(OBJCOPY) STRIP_POLICY=$(STRIP_POLICY) ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES) ZIPEXE=$(ZIPEXE) ++ + BUILDTREE = $(MAKE) -f $(BUILDTREE_MAKE) $(BUILDTREE_VARS) + + #------------------------------------------------------------------------------- +@@ -337,9 +339,11 @@ + + # Doc target. This is the same for all build options. + # Hence create a docs directory beside ...$(ARCH)_[...] ++# We specify 'BUILD_FLAVOR=product' so that the proper ++# ENABLE_FULL_DEBUG_SYMBOLS value is used. + docs: checks + $(QUIETLY) mkdir -p $(SUBDIR_DOCS) +- $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) jvmtidocs ++ $(MAKE) -f $(GAMMADIR)/make/$(OSNAME)/makefiles/jvmti.make $(MFLAGS) $(BUILDTREE_VARS) JvmtiOutDir=$(SUBDIR_DOCS) BUILD_FLAVOR=product jvmtidocs + + # Synonyms for win32-like targets. + compiler2: jvmg product +--- hotspot/make/bsd/makefiles/buildtree.make 2012-08-10 09:22:57.000000000 -0700 ++++ hotspot/make/bsd/makefiles/buildtree.make 2012-08-19 12:11:04.000000000 -0700 +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 2005, 2012, 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 +@@ -242,6 +242,16 @@ + echo "$(call gamma-path,commonsrc,os/posix/vm)"; \ + [ -n "$(CFLAGS_BROWSE)" ] && \ + echo && echo "CFLAGS_BROWSE = $(CFLAGS_BROWSE)"; \ ++ [ -n "$(ENABLE_FULL_DEBUG_SYMBOLS)" ] && \ ++ echo && echo "ENABLE_FULL_DEBUG_SYMBOLS = $(ENABLE_FULL_DEBUG_SYMBOLS)"; \ ++ [ -n "$(OBJCOPY)" ] && \ ++ echo && echo "OBJCOPY = $(OBJCOPY)"; \ ++ [ -n "$(STRIP_POLICY)" ] && \ ++ echo && echo "STRIP_POLICY = $(STRIP_POLICY)"; \ ++ [ -n "$(ZIP_DEBUGINFO_FILES)" ] && \ ++ echo && echo "ZIP_DEBUGINFO_FILES = $(ZIP_DEBUGINFO_FILES)"; \ ++ [ -n "$(ZIPEXE)" ] && \ ++ echo && echo "ZIPEXE = $(ZIPEXE)"; \ + [ -n "$(HOTSPOT_EXTRA_SYSDEFS)" ] && \ + echo && \ + echo "HOTSPOT_EXTRA_SYSDEFS\$$(HOTSPOT_EXTRA_SYSDEFS) = $(HOTSPOT_EXTRA_SYSDEFS)" && \ +@@ -359,7 +369,7 @@ + $(QUIETLY) ( \ + $(BUILDTREE_COMMENT); \ + echo "JDK=${JAVA_HOME}"; \ +- ) > $@ ++ ) > $@ + + .dbxrc: $(BUILDTREE_MAKE) + @echo Creating $@ ... +--- hotspot/make/bsd/makefiles/defs.make 2012-08-10 09:22:57.000000000 -0700 ++++ hotspot/make/bsd/makefiles/defs.make 2012-08-19 12:11:04.000000000 -0700 +@@ -86,7 +86,7 @@ + VM_PLATFORM = bsd_i486 + HS_ARCH = x86 + # We have to reset ARCH to i386 since SRCARCH relies on it +- ARCH = i386 ++ ARCH = i386 + endif + endif + +@@ -124,6 +124,107 @@ + HS_ARCH = ppc + endif + ++# determine if HotSpot is being built in JDK6 or earlier version ++JDK6_OR_EARLIER=0 ++ifeq "$(shell expr \( '$(JDK_MAJOR_VERSION)' != '' \& '$(JDK_MINOR_VERSION)' != '' \& '$(JDK_MICRO_VERSION)' != '' \))" "1" ++ # if the longer variable names (newer build style) are set, then check those ++ ifeq "$(shell expr \( $(JDK_MAJOR_VERSION) = 1 \& $(JDK_MINOR_VERSION) \< 7 \))" "1" ++ JDK6_OR_EARLIER=1 ++ endif ++else ++ # the longer variables aren't set so check the shorter variable names ++ ifeq "$(shell expr \( '$(JDK_MAJOR_VER)' = 1 \& '$(JDK_MINOR_VER)' \< 7 \))" "1" ++ JDK6_OR_EARLIER=1 ++ endif ++endif ++ ++ifeq ($(JDK6_OR_EARLIER),0) ++ # Full Debug Symbols is supported on JDK7 or newer. ++ # The Full Debug Symbols (FDS) default for BUILD_FLAVOR == product ++ # builds is enabled with debug info files ZIP'ed to save space. For ++ # BUILD_FLAVOR != product builds, FDS is always enabled, after all a ++ # debug build without debug info isn't very useful. ++ # The ZIP_DEBUGINFO_FILES option only has meaning when FDS is enabled. ++ # ++ # If you invoke a build with FULL_DEBUG_SYMBOLS=0, then FDS will be ++ # disabled for a BUILD_FLAVOR == product build. ++ # ++ # Note: Use of a different variable name for the FDS override option ++ # versus the FDS enabled check is intentional (FULL_DEBUG_SYMBOLS ++ # versus ENABLE_FULL_DEBUG_SYMBOLS). For auto build systems that pass ++ # in options via environment variables, use of distinct variables ++ # prevents strange behaviours. For example, in a BUILD_FLAVOR != ++ # product build, the FULL_DEBUG_SYMBOLS environment variable will be ++ # 0, but the ENABLE_FULL_DEBUG_SYMBOLS make variable will be 1. If ++ # the same variable name is used, then different values can be picked ++ # up by different parts of the build. Just to be clear, we only need ++ # two variable names because the incoming option value can be ++ # overridden in some situations, e.g., a BUILD_FLAVOR != product ++ # build. ++ ++ ifeq ($(BUILD_FLAVOR), product) ++ FULL_DEBUG_SYMBOLS ?= 1 ++ ENABLE_FULL_DEBUG_SYMBOLS = $(FULL_DEBUG_SYMBOLS) ++ else ++ # debug variants always get Full Debug Symbols (if available) ++ ENABLE_FULL_DEBUG_SYMBOLS = 1 ++ endif ++ _JUNK_ := $(shell \ ++ echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") ++ # since objcopy is optional, we set ZIP_DEBUGINFO_FILES later ++ ++ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ # Default OBJCOPY comes from GNU Binutils on Linux: ++ DEF_OBJCOPY=/usr/bin/objcopy ++ ifdef CROSS_COMPILE_ARCH ++ # don't try to generate .debuginfo files when cross compiling ++ _JUNK_ := $(shell \ ++ echo >&2 "INFO: cross compiling for ARCH $(CROSS_COMPILE_ARCH)," \ ++ "skipping .debuginfo generation.") ++ OBJCOPY= ++ else ++ OBJCOPY=$(shell test -x $(DEF_OBJCOPY) && echo $(DEF_OBJCOPY)) ++ ifneq ($(ALT_OBJCOPY),) ++ _JUNK_ := $(shell echo >&2 "INFO: ALT_OBJCOPY=$(ALT_OBJCOPY)") ++ OBJCOPY=$(shell test -x $(ALT_OBJCOPY) && echo $(ALT_OBJCOPY)) ++ endif ++ endif ++ else ++ OBJCOPY= ++ endif ++ ++ ifeq ($(OBJCOPY),) ++ _JUNK_ := $(shell \ ++ echo >&2 "INFO: no objcopy cmd found so cannot create .debuginfo files.") ++ ENABLE_FULL_DEBUG_SYMBOLS=0 ++ _JUNK_ := $(shell \ ++ echo >&2 "INFO: ENABLE_FULL_DEBUG_SYMBOLS=$(ENABLE_FULL_DEBUG_SYMBOLS)") ++ else ++ _JUNK_ := $(shell \ ++ echo >&2 "INFO: $(OBJCOPY) cmd found so will create .debuginfo files.") ++ ++ # Library stripping policies for .debuginfo configs: ++ # all_strip - strips everything from the library ++ # min_strip - strips most stuff from the library; leaves minimum symbols ++ # no_strip - does not strip the library at all ++ # ++ # Oracle security policy requires "all_strip". A waiver was granted on ++ # 2011.09.01 that permits using "min_strip" in the Java JDK and Java JRE. ++ # ++ # Currently, STRIP_POLICY is only used when Full Debug Symbols is enabled. ++ # ++ STRIP_POLICY ?= min_strip ++ ++ _JUNK_ := $(shell \ ++ echo >&2 "INFO: STRIP_POLICY=$(STRIP_POLICY)") ++ ++ ZIP_DEBUGINFO_FILES ?= 1 ++ ++ _JUNK_ := $(shell \ ++ echo >&2 "INFO: ZIP_DEBUGINFO_FILES=$(ZIP_DEBUGINFO_FILES)") ++ endif ++endif ++ + JDK_INCLUDE_SUBDIR=bsd + + # Library suffix +@@ -141,18 +242,39 @@ + + # client and server subdirectories have symbolic links to ../libjsig.so + EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.$(LIBRARY_SUFFIX) ++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ ifeq ($(ZIP_DEBUGINFO_FILES),1) ++ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.diz ++ else ++ EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libjsig.debuginfo ++ endif ++endif + EXPORT_SERVER_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/server + EXPORT_CLIENT_DIR = $(EXPORT_JRE_LIB_ARCH_DIR)/client + + ifndef BUILD_CLIENT_ONLY + EXPORT_LIST += $(EXPORT_SERVER_DIR)/Xusage.txt + EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.$(LIBRARY_SUFFIX) ++ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ ifeq ($(ZIP_DEBUGINFO_FILES),1) ++ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.diz ++ else ++ EXPORT_LIST += $(EXPORT_SERVER_DIR)/libjvm.debuginfo ++ endif ++ endif + endif + + ifneq ($(ZERO_BUILD), true) + ifeq ($(ARCH_DATA_MODEL), 32) + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt + EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.$(LIBRARY_SUFFIX) ++ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ ifeq ($(ZIP_DEBUGINFO_FILES),1) ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.diz ++ else ++ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm.debuginfo ++ endif ++ endif + endif + endif + +@@ -164,6 +286,15 @@ + $(EXPORT_LIB_DIR)/sa-jdi.jar + ADD_SA_BINARIES/universal = $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX) \ + $(EXPORT_LIB_DIR)/sa-jdi.jar ++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ ifeq ($(ZIP_DEBUGINFO_FILES),1) ++ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz ++ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.diz ++ else ++ ADD_SA_BINARIES/x86 += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo ++ ADD_SA_BINARIES/sparc += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.debuginfo ++ endif ++endif + ADD_SA_BINARIES/ppc = + ADD_SA_BINARIES/ia64 = + ADD_SA_BINARIES/arm = +--- hotspot/make/bsd/makefiles/gcc.make 2012-08-10 09:22:57.000000000 -0700 ++++ hotspot/make/bsd/makefiles/gcc.make 2012-08-19 12:11:04.000000000 -0700 +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 1999, 2012, 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 +@@ -124,7 +124,11 @@ + ARCHFLAG/ia64 = + ARCHFLAG/sparc = -m32 -mcpu=v9 + ARCHFLAG/sparcv9 = -m64 -mcpu=v9 ++ARCHFLAG/arm = -fsigned-char + ARCHFLAG/zero = $(ZERO_ARCHFLAG) ++ifndef E500V2 ++ARCHFLAG/ppc = -mcpu=powerpc ++endif + + # Darwin-specific build flags + ifeq ($(OS_VENDOR), Darwin) +@@ -285,6 +289,26 @@ + DEBUG_CFLAGS += -gstabs + endif + ++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ FASTDEBUG_CFLAGS/ia64 = -g ++ FASTDEBUG_CFLAGS/amd64 = -g ++ FASTDEBUG_CFLAGS/arm = -g ++ FASTDEBUG_CFLAGS/ppc = -g ++ FASTDEBUG_CFLAGS += $(DEBUG_CFLAGS/$(BUILDARCH)) ++ ifeq ($(FASTDEBUG_CFLAGS/$(BUILDARCH)),) ++ FASTDEBUG_CFLAGS += -gstabs ++ endif ++ ++ OPT_CFLAGS/ia64 = -g ++ OPT_CFLAGS/amd64 = -g ++ OPT_CFLAGS/arm = -g ++ OPT_CFLAGS/ppc = -g ++ OPT_CFLAGS += $(OPT_CFLAGS/$(BUILDARCH)) ++ ifeq ($(OPT_CFLAGS/$(BUILDARCH)),) ++ OPT_CFLAGS += -gstabs ++ endif ++endif ++ + # DEBUG_BINARIES overrides everything, use full -g debug information + ifeq ($(DEBUG_BINARIES), true) + DEBUG_CFLAGS = -g +@@ -302,3 +326,9 @@ + ifdef MINIMIZE_RAM_USAGE + CFLAGS += -DMINIMIZE_RAM_USAGE + endif ++ ++ifdef CROSS_COMPILE_ARCH ++ STRIP = $(ALT_COMPILER_PATH)/strip ++else ++ STRIP = strip ++endif +--- hotspot/make/bsd/makefiles/jsig.make 2012-08-10 09:22:58.000000000 -0700 ++++ hotspot/make/bsd/makefiles/jsig.make 2012-08-19 12:11:04.000000000 -0700 +@@ -36,9 +36,16 @@ + LIBJSIG_G = lib$(JSIG_G).so + endif + ++LIBJSIG_DEBUGINFO = lib$(JSIG).debuginfo ++LIBJSIG_DIZ = lib$(JSIG).diz ++LIBJSIG_G_DEBUGINFO = lib$(JSIG_G).debuginfo ++LIBJSIG_G_DIZ = lib$(JSIG_G).diz ++ + JSIGSRCDIR = $(GAMMADIR)/src/os/$(Platform_os_family)/vm + + DEST_JSIG = $(JDK_LIBDIR)/$(LIBJSIG) ++DEST_JSIG_DEBUGINFO = $(JDK_LIBDIR)/$(LIBJSIG_DEBUGINFO) ++DEST_JSIG_DIZ = $(JDK_LIBDIR)/$(LIBJSIG_DIZ) + + LIBJSIG_MAPFILE = $(MAKEFILES_DIR)/mapfile-vers-jsig + +@@ -57,11 +64,33 @@ + $(LIBJSIG): $(JSIGSRCDIR)/jsig.c $(LIBJSIG_MAPFILE) + @echo Making signal interposition lib... + $(QUIETLY) $(CC) $(SYMFLAG) $(ARCHFLAG) $(SHARED_FLAG) $(PICFLAG) \ +- $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< ++ $(LFLAGS_JSIG) $(JSIG_DEBUG_CFLAGS) -o $@ $< + $(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); } ++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJSIG_DEBUGINFO) ++ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJSIG_DEBUGINFO) $@ ++ ifeq ($(STRIP_POLICY),all_strip) ++ $(QUIETLY) $(STRIP) $@ ++ else ++ ifeq ($(STRIP_POLICY),min_strip) ++ $(QUIETLY) $(STRIP) -S $@ ++ # implied else here is no stripping at all ++ endif ++ endif ++ [ -f $(LIBJSIG_G_DEBUGINFO) ] || { ln -s $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO); } ++ ifeq ($(ZIP_DEBUGINFO_FILES),1) ++ $(ZIPEXE) -q -y $(LIBJSIG_DIZ) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO) ++ $(RM) $(LIBJSIG_DEBUGINFO) $(LIBJSIG_G_DEBUGINFO) ++ [ -f $(LIBJSIG_G_DIZ) ] || { ln -s $(LIBJSIG_DIZ) $(LIBJSIG_G_DIZ); } ++ endif ++endif + + install_jsig: $(LIBJSIG) + @echo "Copying $(LIBJSIG) to $(DEST_JSIG)" ++ $(QUIETLY) test -f $(LIBJSIG_DEBUGINFO) && \ ++ cp -f $(LIBJSIG_DEBUGINFO) $(DEST_JSIG_DEBUGINFO) ++ $(QUIETLY) test -f $(LIBJSIG_DIZ) && \ ++ cp -f $(LIBJSIG_DIZ) $(DEST_JSIG_DIZ) + $(QUIETLY) cp -f $(LIBJSIG) $(DEST_JSIG) && echo "Done" + + .PHONY: install_jsig +--- hotspot/make/bsd/makefiles/launcher.make 2012-08-10 09:22:58.000000000 -0700 ++++ hotspot/make/bsd/makefiles/launcher.make 2012-08-19 12:11:04.000000000 -0700 @@ -50,7 +50,7 @@ LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS) else @@ -70,8 +464,8 @@ # The gamma launcher runs the JDK from $JAVA_HOME, overriding the JVM with a # freshly built JVM at ./libjvm.{so|dylib}. This is accomplished by setting ---- hotspot/make/bsd/makefiles/mapfile-vers-debug 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/make/bsd/makefiles/mapfile-vers-debug 2012-05-19 10:35:54.000000000 -0700 +--- hotspot/make/bsd/makefiles/mapfile-vers-debug 2012-08-10 09:22:58.000000000 -0700 ++++ hotspot/make/bsd/makefiles/mapfile-vers-debug 2012-08-19 12:11:04.000000000 -0700 @@ -221,6 +221,7 @@ JVM_SetArrayElement; JVM_SetClassSigners; @@ -105,8 +499,8 @@ # debug JVM JVM_AccessVMBooleanFlag; JVM_AccessVMIntFlag; ---- hotspot/make/bsd/makefiles/mapfile-vers-product 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/make/bsd/makefiles/mapfile-vers-product 2012-05-19 10:36:22.000000000 -0700 +--- hotspot/make/bsd/makefiles/mapfile-vers-product 2012-08-10 09:22:58.000000000 -0700 ++++ hotspot/make/bsd/makefiles/mapfile-vers-product 2012-08-19 12:11:04.000000000 -0700 @@ -221,6 +221,7 @@ JVM_SetArrayElement; JVM_SetClassSigners; @@ -140,9 +534,184 @@ # miscellaneous functions jio_fprintf; jio_printf; ---- hotspot/make/solaris/makefiles/defs.make 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/make/solaris/makefiles/defs.make 2012-05-17 14:53:53.000000000 -0700 -@@ -164,8 +164,8 @@ +--- hotspot/make/bsd/makefiles/ppc.make 2012-08-10 09:22:58.000000000 -0700 ++++ hotspot/make/bsd/makefiles/ppc.make 2012-08-19 12:11:04.000000000 -0700 +@@ -28,3 +28,6 @@ + # Must also specify if CPU is big endian + CFLAGS += -DVM_BIG_ENDIAN + ++ifdef E500V2 ++ASFLAGS += -Wa,-mspe -Wa,--defsym -Wa,E500V2=1 ++endif +--- hotspot/make/bsd/makefiles/saproc.make 2012-08-10 09:22:59.000000000 -0700 ++++ hotspot/make/bsd/makefiles/saproc.make 2012-08-19 12:11:04.000000000 -0700 +@@ -36,6 +36,11 @@ + LIBSAPROC_G = lib$(SAPROC_G).so + endif + ++LIBSAPROC_DEBUGINFO = lib$(SAPROC).debuginfo ++LIBSAPROC_DIZ = lib$(SAPROC).diz ++LIBSAPROC_G_DEBUGINFO = lib$(SAPROC_G).debuginfo ++LIBSAPROC_G_DIZ = lib$(SAPROC_G).diz ++ + AGENT_DIR = $(GAMMADIR)/agent + + SASRCDIR = $(AGENT_DIR)/src/os/$(Platform_os_family) +@@ -66,7 +71,9 @@ + + SAMAPFILE = $(SASRCDIR)/mapfile + +-DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC) ++DEST_SAPROC = $(JDK_LIBDIR)/$(LIBSAPROC) ++DEST_SAPROC_DEBUGINFO = $(JDK_LIBDIR)/$(LIBSAPROC_DEBUGINFO) ++DEST_SAPROC_DIZ = $(JDK_LIBDIR)/$(LIBSAPROC_DIZ) + + # DEBUG_BINARIES overrides everything, use full -g debug information + ifeq ($(DEBUG_BINARIES), true) +@@ -114,10 +121,32 @@ + -o $@ \ + $(SALIBS) + $(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); } ++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBSAPROC_DEBUGINFO) ++ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBSAPROC_DEBUGINFO) $@ ++ ifeq ($(STRIP_POLICY),all_strip) ++ $(QUIETLY) $(STRIP) $@ ++ else ++ ifeq ($(STRIP_POLICY),min_strip) ++ $(QUIETLY) $(STRIP) -S $@ ++ # implied else here is no stripping at all ++ endif ++ endif ++ [ -f $(LIBSAPROC_G_DEBUGINFO) ] || { ln -s $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO); } ++ ifeq ($(ZIP_DEBUGINFO_FILES),1) ++ $(ZIPEXE) -q -y $(LIBSAPROC_DIZ) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO) ++ $(RM) $(LIBSAPROC_DEBUGINFO) $(LIBSAPROC_G_DEBUGINFO) ++ [ -f $(LIBSAPROC_G_DIZ) ] || { ln -s $(LIBSAPROC_DIZ) $(LIBSAPROC_G_DIZ); } ++ endif ++endif + + install_saproc: $(BUILDLIBSAPROC) + $(QUIETLY) if [ -e $(LIBSAPROC) ] ; then \ + echo "Copying $(LIBSAPROC) to $(DEST_SAPROC)"; \ ++ test -f $(LIBSAPROC_DEBUGINFO) && \ ++ cp -f $(LIBSAPROC_DEBUGINFO) $(DEST_SAPROC_DEBUGINFO); \ ++ test -f $(LIBSAPROC_DIZ) && \ ++ cp -f $(LIBSAPROC_DIZ) $(DEST_SAPROC_DIZ); \ + cp -f $(LIBSAPROC) $(DEST_SAPROC) && echo "Done"; \ + fi + +--- hotspot/make/bsd/makefiles/vm.make 2012-08-10 09:22:59.000000000 -0700 ++++ hotspot/make/bsd/makefiles/vm.make 2012-08-19 12:11:04.000000000 -0700 +@@ -1,5 +1,5 @@ + # +-# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved. ++# Copyright (c) 1999, 2012, 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 +@@ -60,10 +60,16 @@ + # The order is important for the precompiled headers to work. + INCLUDES += $(PRECOMPILED_HEADER_DIR:%=-I%) $(Src_Dirs_I:%=-I%) + +-ifeq (${VERSION}, debug) ++# SYMFLAG is used by {jsig,saproc}.make ++ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ # always build with debug info when we can create .debuginfo files + SYMFLAG = -g + else +- SYMFLAG = ++ ifeq (${VERSION}, debug) ++ SYMFLAG = -g ++ else ++ SYMFLAG = ++ endif + endif + + # HOTSPOT_RELEASE_VERSION and HOTSPOT_BUILD_VERSION are defined +@@ -100,9 +106,11 @@ + CXXFLAGS += -DDEFAULT_LIBPATH="\"$(DEFAULT_LIBPATH)\"" + endif + +-ifndef JAVASE_EMBEDDED ++ifndef JAVASE_EMBEDDED ++ifneq (${ARCH},arm) + CFLAGS += -DINCLUDE_TRACE + endif ++endif + + # CFLAGS_WARN holds compiler options to suppress/enable warnings. + CFLAGS += $(CFLAGS_WARN/BYFILE) +@@ -145,6 +153,11 @@ + LIBJVM_G = lib$(JVM)$(G_SUFFIX).so + endif + ++LIBJVM_DEBUGINFO = lib$(JVM).debuginfo ++LIBJVM_DIZ = lib$(JVM).diz ++LIBJVM_G_DEBUGINFO = lib$(JVM)$(G_SUFFIX).debuginfo ++LIBJVM_G_DIZ = lib$(JVM)$(G_SUFFIX).diz ++ + SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt + + SOURCE_PATHS=\ +@@ -155,11 +168,13 @@ + SOURCE_PATHS+=$(HS_COMMON_SRC)/cpu/$(Platform_arch)/vm + SOURCE_PATHS+=$(HS_COMMON_SRC)/os_cpu/$(Platform_os_arch)/vm + +-ifndef JAVASE_EMBEDDED ++ifndef JAVASE_EMBEDDED ++ifneq (${ARCH},arm) + SOURCE_PATHS+=$(shell if [ -d $(HS_ALT_SRC)/share/vm/jfr ]; then \ + find $(HS_ALT_SRC)/share/vm/jfr -type d; \ + fi) + endif ++endif + + CORE_PATHS=$(foreach path,$(SOURCE_PATHS),$(call altsrc,$(path)) $(path)) + CORE_PATHS+=$(GENERATED)/jvmtifiles +@@ -316,11 +331,38 @@ + rm -f $@.1; ln -s $@ $@.1; \ + [ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \ + } ++ifeq ($(CROSS_COMPILE_ARCH),) ++ ifeq ($(ENABLE_FULL_DEBUG_SYMBOLS),1) ++ $(QUIETLY) $(OBJCOPY) --only-keep-debug $@ $(LIBJVM_DEBUGINFO) ++ $(QUIETLY) $(OBJCOPY) --add-gnu-debuglink=$(LIBJVM_DEBUGINFO) $@ ++ ifeq ($(STRIP_POLICY),all_strip) ++ $(QUIETLY) $(STRIP) $@ ++ else ++ ifeq ($(STRIP_POLICY),min_strip) ++ $(QUIETLY) $(STRIP) -S $@ ++ # implied else here is no stripping at all ++ endif ++ endif ++ $(QUIETLY) [ -f $(LIBJVM_G_DEBUGINFO) ] || ln -s $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) ++ ifeq ($(ZIP_DEBUGINFO_FILES),1) ++ $(ZIPEXE) -q -y $(LIBJVM_DIZ) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) ++ $(RM) $(LIBJVM_DEBUGINFO) $(LIBJVM_G_DEBUGINFO) ++ [ -f $(LIBJVM_G_DIZ) ] || { ln -s $(LIBJVM_DIZ) $(LIBJVM_G_DIZ); } ++ endif ++ endif ++endif + +-DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM) ++DEST_SUBDIR = $(JDK_LIBDIR)/$(VM_SUBDIR) ++DEST_JVM = $(DEST_SUBDIR)/$(LIBJVM) ++DEST_JVM_DEBUGINFO = $(DEST_SUBDIR)/$(LIBJVM_DEBUGINFO) ++DEST_JVM_DIZ = $(DEST_SUBDIR)/$(LIBJVM_DIZ) + + install_jvm: $(LIBJVM) + @echo "Copying $(LIBJVM) to $(DEST_JVM)" ++ $(QUIETLY) test -f $(LIBJVM_DEBUGINFO) && \ ++ cp -f $(LIBJVM_DEBUGINFO) $(DEST_JVM_DEBUGINFO) ++ $(QUIETLY) test -f $(LIBJVM_DIZ) && \ ++ cp -f $(LIBJVM_DIZ) $(DEST_JVM_DIZ) + $(QUIETLY) cp -f $(LIBJVM) $(DEST_JVM) && echo "Done" + + #---------------------------------------------------------------------- +--- hotspot/make/solaris/makefiles/defs.make 2012-08-10 09:23:12.000000000 -0700 ++++ hotspot/make/solaris/makefiles/defs.make 2012-08-19 12:11:04.000000000 -0700 +@@ -194,8 +194,8 @@ endif ifeq ($(ARCH_DATA_MODEL), 32) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/Xusage.txt @@ -153,8 +722,8 @@ EXPORT_LIST += $(EXPORT_CLIENT_DIR)/libjvm_dtrace.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_db.$(LIBRARY_SUFFIX) EXPORT_LIST += $(EXPORT_CLIENT_DIR)/64/libjvm_dtrace.$(LIBRARY_SUFFIX) ---- hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2012-05-16 19:03:31.000000000 -0700 +--- hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2012-08-10 09:23:56.000000000 -0700 ++++ hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2012-08-19 12:11:04.000000000 -0700 @@ -71,7 +71,11 @@ define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteFrequentPairs, true); @@ -167,8 +736,22 @@ // GC Ergo Flags define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread +--- hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2012-08-10 09:24:15.000000000 -0700 ++++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2012-08-19 12:11:05.000000000 -0700 +@@ -212,7 +212,10 @@ + // (this is the default on linux, but not on mac os) + RESTARTABLE(::chown(initial_path, geteuid(), getegid()), res); + if (res == 0) { +- res = ::rename(initial_path, path); ++ RESTARTABLE(::chown(initial_path, geteuid(), getegid()), res); ++ if (res == 0) { ++ res = ::rename(initial_path, path); ++ } + } + } + } --- hotspot/src/os/bsd/vm/decoder_bsd.cpp 1969-12-31 16:00:00.000000000 -0800 -+++ hotspot/src/os/bsd/vm/decoder_bsd.cpp 2012-05-25 00:08:53.000000000 -0700 ++++ hotspot/src/os/bsd/vm/decoder_bsd.cpp 2012-08-19 12:11:05.000000000 -0700 @@ -0,0 +1,46 @@ +/* + * Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. @@ -216,9 +799,68 @@ + return false; +} + ---- hotspot/src/os/bsd/vm/os_bsd.cpp 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/src/os/bsd/vm/os_bsd.cpp 2012-05-19 10:38:46.000000000 -0700 -@@ -2589,6 +2589,25 @@ +--- hotspot/src/os/bsd/vm/os_bsd.cpp 2012-08-10 09:24:18.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.cpp 2012-08-19 12:11:05.000000000 -0700 +@@ -2341,14 +2341,14 @@ + } + + void os::print_os_info_brief(outputStream* st) { +- st->print("Bsd"); ++ st->print("BSD"); + + os::Posix::print_uname_info(st); + } + + void os::print_os_info(outputStream* st) { + st->print("OS:"); +- st->print("Bsd"); ++ st->print("BSD"); + + os::Posix::print_uname_info(st); + +@@ -2357,10 +2357,6 @@ + os::Posix::print_load_average(st); + } + +-void os::pd_print_cpu_info(outputStream* st) { +- // Nothing to do for now. +-} +- + void os::print_memory_info(outputStream* st) { + + st->print("Memory:"); +@@ -2377,6 +2373,7 @@ + st->print("(" UINT64_FORMAT "k free)", + os::available_memory() >> 10); + #ifndef _ALLBSD_SOURCE ++ // FIXME: Make this work for *BSD + st->print(", swap " UINT64_FORMAT "k", + ((jlong)si.totalswap * si.mem_unit) >> 10); + st->print("(" UINT64_FORMAT "k free)", +@@ -2384,12 +2381,22 @@ + #endif + st->cr(); + ++ // FIXME: Make this work for *BSD + // meminfo + st->print("\n/proc/meminfo:\n"); + _print_ascii_file("/proc/meminfo", st); + st->cr(); + } + ++void os::pd_print_cpu_info(outputStream* st) { ++ // FIXME: Make this work for *BSD ++ st->print("\n/proc/cpuinfo:\n"); ++ if (!_print_ascii_file("/proc/cpuinfo", st)) { ++ st->print(" <Not Available>"); ++ } ++ st->cr(); ++} ++ + // Taken from /usr/include/bits/siginfo.h Supposed to be architecture specific + // but they're the same for all the bsd arch that we support + // and they're the same for solaris but there's no common place to put this. +@@ -2532,6 +2539,25 @@ len = strlen(buf); jrelib_p = buf + len; @@ -244,7 +886,7 @@ // Add the appropriate library subdir snprintf(jrelib_p, buflen-len, "/jre/lib"); if (0 != access(buf, F_OK)) { -@@ -2618,6 +2637,7 @@ +@@ -2561,6 +2587,7 @@ if (rp == NULL) return; } @@ -252,7 +894,7 @@ } } } -@@ -2874,7 +2894,11 @@ +@@ -2817,7 +2844,11 @@ } void os::free_memory(char *addr, size_t bytes, size_t alignment_hint) { @@ -264,8 +906,23 @@ } void os::numa_make_global(char *addr, size_t bytes) { ---- hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-05-17 15:05:10.000000000 -0700 +--- hotspot/src/os/bsd/vm/os_bsd.hpp 2012-08-10 09:24:18.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.hpp 2012-08-19 12:11:05.000000000 -0700 +@@ -103,6 +103,12 @@ + + static bool hugetlbfs_sanity_check(bool warn, size_t page_size); + ++ static void print_full_memory_info(outputStream* st); ++#ifndef _ALLBSD_SOURCE ++ static void print_distro_info(outputStream* st); ++ static void print_libversion_info(outputStream* st); ++#endif ++ + public: + + static void init_thread_fpu_state(); +--- hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-08-10 09:24:18.000000000 -0700 ++++ hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2012-08-19 12:11:05.000000000 -0700 @@ -31,10 +31,22 @@ # include "atomic_bsd_x86.inline.hpp" # include "orderAccess_bsd_x86.inline.hpp" @@ -289,8 +946,8 @@ // System includes ---- hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2012-05-17 15:05:32.000000000 -0700 +--- hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2012-08-10 09:24:18.000000000 -0700 ++++ hotspot/src/os/bsd/vm/thread_bsd.inline.hpp 2012-08-19 12:11:05.000000000 -0700 @@ -34,11 +34,26 @@ # include "orderAccess_bsd_x86.inline.hpp" # include "prefetch_bsd_x86.inline.hpp" @@ -318,8 +975,19 @@ // Contains inlined functions for class Thread and ThreadLocalStorage ---- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-05-17 16:05:49.000000000 -0700 +--- hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2012-08-10 09:24:32.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2012-08-19 12:11:05.000000000 -0700 +@@ -52,7 +52,7 @@ + /* Posix Thread IDs */ \ + /**********************/ \ + \ +- declare_unsigned_integer_type(thread_t) \ ++ declare_unsigned_integer_type(OS_THREAD_ID_TYPE) \ + declare_unsigned_integer_type(pthread_t) \ + \ + /* This must be the last entry, and must be present */ \ +--- hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-08-10 09:24:33.000000000 -0700 ++++ hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2012-08-19 12:11:05.000000000 -0700 @@ -24,7 +24,7 @@ */ @@ -329,8 +997,8 @@ # include <pthread_np.h> /* For pthread_attr_get_np */ #endif ---- hotspot/src/share/vm/runtime/atomic.cpp 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/src/share/vm/runtime/atomic.cpp 2012-05-16 19:03:34.000000000 -0700 +--- hotspot/src/share/vm/runtime/atomic.cpp 2012-08-10 09:27:53.000000000 -0700 ++++ hotspot/src/share/vm/runtime/atomic.cpp 2012-08-19 12:11:07.000000000 -0700 @@ -54,6 +54,12 @@ #ifdef TARGET_OS_ARCH_windows_x86 # include "atomic_windows_x86.inline.hpp" @@ -344,8 +1012,8 @@ #ifdef TARGET_OS_ARCH_linux_arm # include "atomic_linux_arm.inline.hpp" #endif ---- hotspot/src/share/vm/runtime/os.hpp 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/src/share/vm/runtime/os.hpp 2012-05-16 19:03:34.000000000 -0700 +--- hotspot/src/share/vm/runtime/os.hpp 2012-08-10 09:28:05.000000000 -0700 ++++ hotspot/src/share/vm/runtime/os.hpp 2012-08-19 12:11:07.000000000 -0700 @@ -30,6 +30,9 @@ #include "runtime/extendedPC.hpp" #include "runtime/handles.hpp" @@ -356,8 +1024,18 @@ #ifdef TARGET_OS_FAMILY_linux # include "jvm_linux.h" #endif ---- hotspot/test/compiler/5091921/Test7005594.sh 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/test/compiler/5091921/Test7005594.sh 2012-03-03 22:34:03.000000000 -0800 +@@ -694,8 +697,8 @@ + # include "os_windows.hpp" + #endif + #ifdef TARGET_OS_FAMILY_bsd +-# include "os_posix.hpp" + # include "os_bsd.hpp" ++# include "os_posix.hpp" + #endif + #ifdef TARGET_OS_ARCH_linux_x86 + # include "os_linux_x86.hpp" +--- hotspot/test/compiler/5091921/Test7005594.sh 2012-08-10 09:28:58.000000000 -0700 ++++ hotspot/test/compiler/5091921/Test7005594.sh 2012-08-19 12:11:07.000000000 -0700 @@ -71,6 +71,9 @@ # Windows/MKS MEM=`"$ROOTDIR/mksnt/sysinf" memory -v | grep "Total Physical Memory: " | sed 's/Total Physical Memory: *//g'` @@ -368,8 +1046,8 @@ else echo "Unable to determine amount of physical memory on the machine" fi ---- hotspot/test/gc/6941923/test6941923.sh 2012-05-26 23:29:10.000000000 -0700 -+++ hotspot/test/gc/6941923/test6941923.sh 2012-03-03 22:35:30.000000000 -0800 +--- hotspot/test/gc/6941923/test6941923.sh 2012-08-10 09:29:15.000000000 -0700 ++++ hotspot/test/gc/6941923/test6941923.sh 2012-08-19 12:11:08.000000000 -0700 @@ -9,7 +9,7 @@ ## skip on windows OS=`uname -s` @@ -379,8 +1057,8 @@ NULL=/dev/null *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208210456.q7L4ufP5063587>