aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorGreg Lewis <glewis@FreeBSD.org>2011-05-29 19:41:52 +0000
committerGreg Lewis <glewis@FreeBSD.org>2011-05-29 19:41:52 +0000
commit443627224f7fae82ec90b9a4870faf160f0053e7 (patch)
tree87fc67d3e68e03b468bcf34948597f8373887755 /java
parenta5f48c2946f4c6ad78024b525cc3bb4b567e1f51 (diff)
downloadports-443627224f7fae82ec90b9a4870faf160f0053e7.tar.gz
ports-443627224f7fae82ec90b9a4870faf160f0053e7.zip
Notes
Diffstat (limited to 'java')
-rw-r--r--java/openjdk7/Makefile16
-rw-r--r--java/openjdk7/distinfo12
-rw-r--r--java/openjdk7/files/patch-FloatingDecimal.java11
-rw-r--r--java/openjdk7/files/patch-set14265
4 files changed, 7382 insertions, 6922 deletions
diff --git a/java/openjdk7/Makefile b/java/openjdk7/Makefile
index d02311e64509..5fb4fb33990d 100644
--- a/java/openjdk7/Makefile
+++ b/java/openjdk7/Makefile
@@ -7,14 +7,13 @@
PORTNAME= openjdk
PORTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_BUILD_NUMBER}
-PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= http://download.java.net/openjdk/jdk7/promoted/b${JDK_BUILD_NUMBER}/ \
- https://jaxp.dev.java.net/files/documents/913/152561/:jaxp \
+ http://download.java.net/jaxp/1.4.5/:jaxp \
http://icedtea.classpath.org/download/drops/:jaxp \
- https://jax-ws.dev.java.net/files/documents/4202/152532/:jaxws \
+ http://download.java.net/glassfish/components/jax-ws/openjdk/jdk7/:jaxws \
http://icedtea.classpath.org/download/drops/:jaxws \
- https://jax-ws.dev.java.net/files/documents/4202/152336/:jaf \
+ https://java.net/downloads/jax-ws/JDK7/:jaf \
http://icedtea.classpath.org/download/drops/:jaf \
${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:ant,}
DISTFILES= ${JDK_SRC_DISTFILE}${EXTRACT_SUFX} \
@@ -37,8 +36,8 @@ MAKE_JOBS_UNSAFE= YES
JDK_MAJOR_VERSION= 7
JDK_MINOR_VERSION= 0
-JDK_BUILD_NUMBER= 122
-JDK_BUILD_DATE= 16_dec_2010
+JDK_BUILD_NUMBER= 144
+JDK_BUILD_DATE= 26_may_2011
JDK_SRC_DISTFILE= ${PORTNAME}-${JDK_MAJOR_VERSION}-ea-src-b${JDK_BUILD_NUMBER}-${JDK_BUILD_DATE}
# Use our own version of ant to avoid circular dependencies
@@ -52,8 +51,8 @@ USE_ICONV= YES
USE_XORG+= x11 xext xi xrender xt xtst
MAKE_JOBS_UNSAFE= yes
-JAXPFILE= jaxp-1_4_4.zip
-JAXWSFILE= jdk7-jaxws2_2-2010_08_19.zip
+JAXPFILE= jaxp-1_4_5.zip
+JAXWSFILE= jdk7-jaxws2_2_4-b02-2011_05_09.zip
JAFFILE= jdk7-jaf-2010_08_19.zip
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
@@ -69,6 +68,7 @@ NOPRECIOUSMAKEVARS= yes
ONLY_FOR_ARCHS= i386 amd64
+FETCH_ARGS= -Fpr
MAKE_ENV+= LANG="C" \
LC_ALL="C" \
JAVA_HOME="" \
diff --git a/java/openjdk7/distinfo b/java/openjdk7/distinfo
index fc5b09a43a67..c790ebb87185 100644
--- a/java/openjdk7/distinfo
+++ b/java/openjdk7/distinfo
@@ -1,9 +1,9 @@
-SHA256 (openjdk-7-ea-src-b122-16_dec_2010.zip) = 1f61c6b83b0b0c15166bf0e486ba23d3202ca0eca1f865784d8801e671b0fb8e
-SIZE (openjdk-7-ea-src-b122-16_dec_2010.zip) = 85656129
-SHA256 (jaxp-1_4_4.zip) = 10b203bec5b7d3dd8f515a9e098f80abc316faf977bcc220b56efe3dc6e9e5e9
-SIZE (jaxp-1_4_4.zip) = 5972577
-SHA256 (jdk7-jaxws2_2-2010_08_19.zip) = b8877aafbb15a348babcaee4ee372fb3e2ea0282f8fe93d306272fd24d7847de
-SIZE (jdk7-jaxws2_2-2010_08_19.zip) = 5893692
+SHA256 (openjdk-7-ea-src-b144-26_may_2011.zip) = fbbc1a9a418bd7d1a2cd0ce2c0178bb3eb089bb60c27696239709a4aa8087bbf
+SIZE (openjdk-7-ea-src-b144-26_may_2011.zip) = 87025879
+SHA256 (jaxp-1_4_5.zip) = 8145a789a61d21d0ff9902e4dc1c7ba492bb407ee614187dc933321922249ddb
+SIZE (jaxp-1_4_5.zip) = 6429135
+SHA256 (jdk7-jaxws2_2_4-b02-2011_05_09.zip) = 2fd874aae97a4206c8f4cd93ee419c09f95c3f684349182b66b6ee9010c72f84
+SIZE (jdk7-jaxws2_2_4-b02-2011_05_09.zip) = 5881427
SHA256 (jdk7-jaf-2010_08_19.zip) = e6aefedfdbb4673e8019583d1344fb162b94e1b10382c362364dbbfd5889c09e
SIZE (jdk7-jaf-2010_08_19.zip) = 70613
SHA256 (apache-ant-1.8.1-bin.zip) = 3716d8e991dbaabbd81c9744a77754cc3264c4a61563c4b587a4c4aa03608fb1
diff --git a/java/openjdk7/files/patch-FloatingDecimal.java b/java/openjdk7/files/patch-FloatingDecimal.java
deleted file mode 100644
index 23656900f75c..000000000000
--- a/java/openjdk7/files/patch-FloatingDecimal.java
+++ /dev/null
@@ -1,11 +0,0 @@
---- jdk/src/share/classes/sun/misc/FloatingDecimal.java.orig 2010-06-21 14:15:30.000000000 -0700
-+++ jdk/src/share/classes/sun/misc/FloatingDecimal.java 2011-02-08 22:30:49.000000000 -0800
-@@ -1547,7 +1547,7 @@
- if ( (cmpResult = bigB.cmp( bigD ) ) > 0 ){
- overvalue = true; // our candidate is too big.
- diff = bigB.sub( bigD );
-- if ( (bigIntNBits == 1) && (bigIntExp > -expBias) ){
-+ if ( (bigIntNBits == 1) && (bigIntExp > -expBias+1) ){
- // candidate is a normalized exact power of 2 and
- // is too big. We will be subtracting.
- // For our purposes, ulp is the ulp of the
diff --git a/java/openjdk7/files/patch-set b/java/openjdk7/files/patch-set
index 5aff016feadd..7e47b52c086c 100644
--- a/java/openjdk7/files/patch-set
+++ b/java/openjdk7/files/patch-set
@@ -1,29 +1,27 @@
-$FreeBSD$
-
---- ./.hgtags 2010-12-16 13:48:11.000000000 -0800
-+++ ./.hgtags 2010-12-17 23:32:51.000000000 -0800
-@@ -96,3 +96,4 @@
- 661360bef6ccad6c119f067f5829b207de80c936 jdk7-b119
- 366ff0b6d2151595629806b033e2e1497e3a55d4 jdk7-b120
- 2c2d4f88637b488014c37e1a2eb401f68bca8838 jdk7-b121
-+f1591eed71f64f6eba79fb7426f5616cc4dfea73 jdk7-b122
---- ./.jcheck/conf 2010-12-16 13:48:11.000000000 -0800
+--- ./.hgtags 2011-05-26 17:05:27.000000000 -0700
++++ ./.hgtags 2011-05-27 00:00:33.000000000 -0700
+@@ -118,3 +118,4 @@
+ c6569c5585851dfd39b8de8e021c3c312f51af12 jdk7-b141
+ cfbbdb77eac0397b03eb99ee2e07ea00e0a7b81e jdk7-b142
+ 14b8e7eee1058fd4ed5a2700a2ce14b3616278f1 jdk7-b143
++7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
+--- ./.jcheck/conf 2011-05-26 17:05:28.000000000 -0700
+++ ./.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/.hgtags 2010-12-16 13:48:46.000000000 -0800
-+++ ./corba/.hgtags 2010-12-17 23:32:54.000000000 -0800
-@@ -96,3 +96,4 @@
- 39829414ae31a0080578a49b751899edd518cd7d jdk7-b119
- cff5a173ec1e89013359e804a3e31736ef6fb462 jdk7-b120
- 2cc9f32992101732b23730b737740e64ebc5fa89 jdk7-b121
-+1523a060032c8a5b7840198da8911abeff88118f jdk7-b122
---- ./corba/.jcheck/conf 2010-12-16 13:48:46.000000000 -0800
+--- ./corba/.hgtags 2011-05-26 17:08:44.000000000 -0700
++++ ./corba/.hgtags 2011-05-27 00:00:37.000000000 -0700
+@@ -118,3 +118,4 @@
+ a58635cdd921bafef353f4864184a0481353197b jdk7-b141
+ a2f340a048c88d10cbedc0504f5cf03d39925a40 jdk7-b142
+ 51ed32f6f4de56f16e910ac54ba6c6f6606f4f17 jdk7-b143
++7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
+--- ./corba/.jcheck/conf 2011-05-26 17:08:44.000000000 -0700
+++ ./corba/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./corba/make/common/Defs-bsd.gmk 2010-12-18 00:00:04.000000000 -0800
-+++ ./corba/make/common/Defs-bsd.gmk 2010-10-31 14:11:33.000000000 -0700
+--- ./corba/make/common/Defs-bsd.gmk 2011-05-29 11:28:25.000000000 -0700
++++ ./corba/make/common/Defs-bsd.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -25,9 +25,18 @@
#
@@ -44,8 +42,8 @@ $FreeBSD$
# Get shared JDK settings
include $(BUILDDIR)/common/shared/Defs.gmk
---- ./corba/make/common/Defs.gmk 2010-12-16 13:48:49.000000000 -0800
-+++ ./corba/make/common/Defs.gmk 2010-10-31 14:08:26.000000000 -0700
+--- ./corba/make/common/Defs.gmk 2011-05-26 17:09:01.000000000 -0700
++++ ./corba/make/common/Defs.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -53,6 +53,28 @@
_OUTPUTDIR=$(TOPDIR)/build/$(PLATFORM)-$(ARCH)
@@ -75,8 +73,8 @@ $FreeBSD$
#
# Get platform definitions
#
---- ./corba/make/common/shared/Defs-bsd.gmk 2010-12-18 00:00:04.000000000 -0800
-+++ ./corba/make/common/shared/Defs-bsd.gmk 2010-10-31 14:10:12.000000000 -0700
+--- ./corba/make/common/shared/Defs-bsd.gmk 2011-05-29 11:28:25.000000000 -0700
++++ ./corba/make/common/shared/Defs-bsd.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -95,8 +93,8 @@ $FreeBSD$
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
---- ./corba/make/common/shared/Defs-utils.gmk 2010-12-16 13:48:50.000000000 -0800
-+++ ./corba/make/common/shared/Defs-utils.gmk 2010-10-31 13:48:36.000000000 -0700
+--- ./corba/make/common/shared/Defs-utils.gmk 2011-05-26 17:09:02.000000000 -0700
++++ ./corba/make/common/shared/Defs-utils.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -53,6 +53,13 @@
UTILS_DEVTOOL_PATH=$(USRBIN_PATH)
endif
@@ -146,8 +144,8 @@ $FreeBSD$
+ TAR = $(UTILS_USR_BIN_PATH)tar
+ endif
+endif
---- ./corba/make/common/shared/Platform.gmk 2010-12-16 13:48:50.000000000 -0800
-+++ ./corba/make/common/shared/Platform.gmk 2010-10-31 14:05:41.000000000 -0700
+--- ./corba/make/common/shared/Platform.gmk 2011-05-26 17:09:03.000000000 -0700
++++ ./corba/make/common/shared/Platform.gmk 2011-04-22 22:20:45.000000000 -0700
@@ -231,6 +231,101 @@
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | sed -e 's@\ \ *@ @g' | cut -d' ' -f2)
endif
@@ -268,20 +266,20 @@ $FreeBSD$
+
REQUIRED_ZIP_VER = 2.2
REQUIRED_UNZIP_VER = 5.12
- REQUIRED_MAKE_VER = 3.78
---- ./hotspot/.hgtags 2010-12-16 13:50:59.000000000 -0800
-+++ ./hotspot/.hgtags 2010-12-17 23:32:57.000000000 -0800
-@@ -134,3 +134,4 @@
- 5484e7c53fa7da5e869902437ee08a9ae10c1c69 jdk7-b119
- f5603a6e50422046ebc0d2f1671d55cb8f1bf1e9 jdk7-b120
- 3f3653ab7af8dc1ddb9fa75dad56bf94f89e81a8 jdk7-b121
-+3a548dc9cb456110ca8fc1514441a8c3bda0014d jdk7-b122
---- ./hotspot/.jcheck/conf 2010-12-16 13:50:59.000000000 -0800
+ REQUIRED_MAKE_VER = 3.81
+--- ./hotspot/.hgtags 2011-05-26 17:23:54.000000000 -0700
++++ ./hotspot/.hgtags 2011-05-27 00:00:43.000000000 -0700
+@@ -174,3 +174,4 @@
+ 9ad1548c6b63d596c411afc35147ffd5254426d9 hs21-b12
+ c149193c768b8b7233da4c3a3fdc0756b975848e hs21-b13
+ c149193c768b8b7233da4c3a3fdc0756b975848e jdk7-b143
++fe189d4a44e9e8f0c7d78fcbd1c63701745752ca jdk7-b144
+--- ./hotspot/.jcheck/conf 2011-05-26 17:23:54.000000000 -0700
+++ ./hotspot/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./hotspot/agent/make/Makefile 2010-12-16 13:50:59.000000000 -0800
-+++ ./hotspot/agent/make/Makefile 2010-06-15 22:03:11.000000000 -0700
+--- ./hotspot/agent/make/Makefile 2011-05-26 17:23:57.000000000 -0700
++++ ./hotspot/agent/make/Makefile 2011-05-12 20:54:44.000000000 -0700
@@ -52,6 +52,9 @@
sun.jvm.hotspot.compiler \
sun.jvm.hotspot.debugger \
@@ -311,8 +309,8 @@ $FreeBSD$
sun/jvm/hotspot/debugger/cdbg/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/*.java \
sun/jvm/hotspot/debugger/cdbg/basic/amd64/*.java \
---- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2010-07-04 09:30:36.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/BsdDebuggerLocal.c 2011-04-22 22:28:31.000000000 -0700
@@ -22,6 +22,7 @@
*
*/
@@ -452,8 +450,8 @@ $FreeBSD$
#endif /* amd64 */
---- ./hotspot/agent/src/os/bsd/Makefile 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/Makefile 2010-07-04 09:45:58.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/Makefile 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/Makefile 2011-04-22 22:28:31.000000000 -0700
@@ -22,7 +22,7 @@
#
#
@@ -529,7 +527,7 @@ $FreeBSD$
+ -rmdir $(ARCH)
--- ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2009-06-06 16:53:52.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/StubDebuggerLocal.c 2011-04-22 22:28:31.000000000 -0700
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2002-2007 Sun Microsystems, Inc. All Rights Reserved.
@@ -651,8 +649,8 @@ $FreeBSD$
+ (JNIEnv *env, jobject this_obj, jint lwp_id) {
+ return 0;
+}
---- ./hotspot/agent/src/os/bsd/elfmacros.h 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/elfmacros.h 2010-07-04 09:30:36.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/elfmacros.h 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/elfmacros.h 2011-04-22 22:28:31.000000000 -0700
@@ -25,16 +25,19 @@
#ifndef _ELFMACROS_H_
#define _ELFMACROS_H_
@@ -689,7 +687,7 @@ $FreeBSD$
#endif
--- ./hotspot/agent/src/os/bsd/hsearch_r.c 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2009-06-06 16:53:52.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/hsearch_r.c 2011-04-22 22:28:31.000000000 -0700
@@ -0,0 +1,217 @@
+/* Copyright (C) 1993,1995-1997,2002,2005,2007,2008
+ Free Software Foundation, Inc.
@@ -909,7 +907,7 @@ $FreeBSD$
+ return 0;
+}
--- ./hotspot/agent/src/os/bsd/hsearch_r.h 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2009-06-06 16:53:52.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/hsearch_r.h 2011-04-22 22:28:31.000000000 -0700
@@ -0,0 +1,42 @@
+/* Declarations for System V style searching functions.
+ Copyright (C) 1995-1999, 2000 Free Software Foundation, Inc.
@@ -953,8 +951,8 @@ $FreeBSD$
+extern void hdestroy_r (struct hsearch_data *__htab);
+
+#endif /* _HSEARCH_R_H_ */
---- ./hotspot/agent/src/os/bsd/libproc.h 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/libproc.h 2010-07-04 09:30:36.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc.h 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/libproc.h 2011-04-22 22:28:31.000000000 -0700
@@ -27,7 +27,8 @@
#include <unistd.h>
@@ -1015,8 +1013,8 @@ $FreeBSD$
// get number of shared objects
int get_num_libs(struct ps_prochandle* ph);
---- ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2010-07-04 09:30:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc_impl.c 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/libproc_impl.c 2011-04-22 22:28:31.000000000 -0700
@@ -174,10 +174,13 @@
return NULL;
}
@@ -1116,8 +1114,8 @@ $FreeBSD$
+ print_debug("ps_pcontinue not implemented\n");
return PS_OK;
}
---- ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2010-07-04 09:30:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/libproc_impl.h 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/libproc_impl.h 2011-04-22 22:28:31.000000000 -0700
@@ -47,7 +47,7 @@
typedef struct thread_info {
lwpid_t lwp_id;
@@ -1147,8 +1145,8 @@ $FreeBSD$
// part of the class sharing workaround
int classes_jsa_fd; // file descriptor of class share archive
uintptr_t dynamic_addr; // address of dynamic section of a.out
---- ./hotspot/agent/src/os/bsd/mapfile 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/mapfile 2010-07-04 09:30:37.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/mapfile 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/mapfile 2011-04-22 22:28:31.000000000 -0700
@@ -43,13 +43,17 @@
# proc_service.h functions - to be used by libthread_db
ps_getpid;
@@ -1170,7 +1168,7 @@ $FreeBSD$
# used by attach test program
init_libproc;
---- ./hotspot/agent/src/os/bsd/proc_service.h 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/agent/src/os/bsd/proc_service.h 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/agent/src/os/bsd/proc_service.h 1969-12-31 16:00:00.000000000 -0800
@@ -1,76 +0,0 @@
-/*
@@ -1249,8 +1247,8 @@ $FreeBSD$
-ps_err_e ps_get_thread_area();
-
-#endif /* _PROC_SERVICE_H_ */
---- ./hotspot/agent/src/os/bsd/ps_core.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/ps_core.c 2010-07-04 09:30:46.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/ps_core.c 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/ps_core.c 2011-04-22 22:28:31.000000000 -0700
@@ -142,6 +142,7 @@
map->next = ph->core->class_share_maps;
@@ -1562,8 +1560,8 @@ $FreeBSD$
struct ps_prochandle* ph = (struct ps_prochandle*) calloc(1, sizeof(struct ps_prochandle));
if (ph == NULL) {
---- ./hotspot/agent/src/os/bsd/ps_proc.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/ps_proc.c 2010-10-31 14:26:55.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/ps_proc.c 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/ps_proc.c 2011-04-22 22:28:31.000000000 -0700
@@ -22,20 +22,22 @@
*
*/
@@ -1595,7 +1593,7 @@ $FreeBSD$
// This file has the libproc implementation specific to live process
// For core files, refer to ps_core.c
-@@ -50,255 +52,359 @@
+@@ -50,253 +52,359 @@
// read "size" bytes of data from "addr" within the target process.
// unlike the standard ptrace() function, process_read_data() can handle
@@ -1690,15 +1688,13 @@ $FreeBSD$
-#define ptrace_getregs(request, pid, addr, data) ptrace(request, pid, data, addr)
-#endif
-
--#ifdef _LP64
--#ifdef PTRACE_GETREGS64
+-#if defined(_LP64) && defined(PTRACE_GETREGS64)
-#define PTRACE_GETREGS_REQ PTRACE_GETREGS64
--#endif
--#else
--#if defined(PTRACE_GETREGS) || defined(PT_GETREGS)
+-#elif defined(PTRACE_GETREGS)
-#define PTRACE_GETREGS_REQ PTRACE_GETREGS
+-#elif defined(PT_GETREGS)
+-#define PTRACE_GETREGS_REQ PT_GETREGS
-#endif
--#endif /* _LP64 */
-
-#ifdef PTRACE_GETREGS_REQ
- if (ptrace_getregs(PTRACE_GETREGS_REQ, pid, user, NULL) < 0) {
@@ -2007,7 +2003,7 @@ $FreeBSD$
+
+ free(freep);
+
-+ return true;
+ return true;
+#else
+ char *l_name;
+ struct link_map *lmap;
@@ -2063,7 +2059,7 @@ $FreeBSD$
+ free (l_name);
+ free (lmap);
+
- return true;
++ return true;
+#endif
}
@@ -2103,7 +2099,7 @@ $FreeBSD$
};
// attach to the process. One and only one exposed stuff
-@@ -325,21 +431,14 @@
+@@ -323,21 +431,14 @@
// read library info and symbol tables, must do this before attaching threads,
// as the symbols in the pthread library will be used to figure out
// the list of threads within the same process.
@@ -2131,8 +2127,8 @@ $FreeBSD$
- }
return ph;
}
---- ./hotspot/agent/src/os/bsd/salibelf.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/salibelf.c 2010-07-04 09:30:46.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/salibelf.c 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/salibelf.c 2011-04-22 22:28:31.000000000 -0700
@@ -25,6 +25,7 @@
#include "salibelf.h"
#include <stdlib.h>
@@ -2141,8 +2137,8 @@ $FreeBSD$
extern void print_debug(const char*,...);
---- ./hotspot/agent/src/os/bsd/symtab.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/symtab.c 2010-07-04 09:30:46.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/symtab.c 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/symtab.c 2011-04-22 22:28:31.000000000 -0700
@@ -23,10 +23,10 @@
*/
@@ -2542,8 +2538,8 @@ $FreeBSD$
void destroy_symtab(struct symtab* symtab) {
if (!symtab) return;
if (symtab->strs) free(symtab->strs);
---- ./hotspot/agent/src/os/bsd/symtab.h 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/symtab.h 2010-07-04 09:30:46.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/symtab.h 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/symtab.h 2011-04-22 22:28:31.000000000 -0700
@@ -32,7 +32,7 @@
struct symtab;
@@ -2553,8 +2549,8 @@ $FreeBSD$
// destroy the symbol table
void destroy_symtab(struct symtab* symtab);
---- ./hotspot/agent/src/os/bsd/test.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/os/bsd/test.c 2010-07-04 09:30:46.000000000 -0700
+--- ./hotspot/agent/src/os/bsd/test.c 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/os/bsd/test.c 2011-04-22 22:28:31.000000000 -0700
@@ -44,7 +44,7 @@
}
@@ -2564,8 +2560,8 @@ $FreeBSD$
return 1;
}
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-12-16 13:51:18.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2010-06-15 22:03:12.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-05-26 17:24:32.000000000 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2011-04-22 22:28:31.000000000 -0700
@@ -28,6 +28,7 @@
import java.net.*;
import java.rmi.*;
@@ -2635,8 +2631,8 @@ $FreeBSD$
/** 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 2010-12-16 13:51:37.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2010-06-15 22:03:14.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-05-26 17:25:12.000000000 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2011-04-22 22:28:31.000000000 -0700
@@ -29,6 +29,7 @@
import java.rmi.*;
import sun.jvm.hotspot.*;
@@ -2708,8 +2704,8 @@ $FreeBSD$
/** 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 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2010-07-04 09:30:46.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdCDebugger.java 2011-04-22 22:28:32.000000000 -0700
@@ -30,10 +30,8 @@
import sun.jvm.hotspot.debugger.cdbg.*;
import sun.jvm.hotspot.debugger.x86.*;
@@ -2735,8 +2731,8 @@ $FreeBSD$
} else {
throw new DebuggerException(cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2010-07-04 09:30:46.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/BsdThreadContextFactory.java 2011-04-22 22:28:32.000000000 -0700
@@ -26,9 +26,7 @@
import sun.jvm.hotspot.debugger.*;
@@ -2758,7 +2754,7 @@ $FreeBSD$
} else {
throw new RuntimeException("cpu " + cpu + " is not yet supported");
}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/ia64/BsdIA64ThreadContext.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -2807,7 +2803,7 @@ $FreeBSD$
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCCFrame.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,81 +0,0 @@
-/*
@@ -2891,7 +2887,7 @@ $FreeBSD$
- private Address sp;
- private BsdDebugger dbg;
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/bsd/sparc/BsdSPARCThreadContext.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,46 +0,0 @@
-/*
@@ -2940,8 +2936,8 @@ $FreeBSD$
- return debugger.newAddress(getRegister(index));
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-12-16 13:51:59.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2010-06-15 22:03:17.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-05-26 17:26:46.000000000 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2011-04-22 22:28:32.000000000 -0700
@@ -37,6 +37,8 @@
import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess;
import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess;
@@ -2965,8 +2961,8 @@ $FreeBSD$
}
if (access == null) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2010-07-04 09:31:12.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd/BsdSignals.java 2011-04-22 22:28:32.000000000 -0700
@@ -28,37 +28,36 @@
private static String[] signalNames = {
"", /* No signal 0 */
@@ -3027,7 +3023,7 @@ $FreeBSD$
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_ia64/BsdIA64JavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,137 +0,0 @@
-/*
@@ -3167,7 +3163,7 @@ $FreeBSD$
- return debugger.getThreadForIdentifierAddress(pthreadIdAddr);
- }
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_sparc/BsdSPARCJavaThreadPDAccess.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,165 +0,0 @@
-/*
@@ -3335,8 +3331,8 @@ $FreeBSD$
-
-
-}
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2010-07-04 09:31:25.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/bsd_x86/BsdSignals.java 2011-04-22 22:28:32.000000000 -0700
@@ -28,37 +28,36 @@
private static String[] signalNames = {
"", /* No signal 0 */
@@ -3397,8 +3393,8 @@ $FreeBSD$
};
public static String getSignalName(int sigNum) {
---- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-12-16 13:52:03.000000000 -0800
-+++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2010-06-15 22:03:18.000000000 -0700
+--- ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-05-26 17:27:16.000000000 -0700
++++ ./hotspot/agent/src/share/classes/sun/jvm/hotspot/utilities/PlatformInfo.java 2011-04-22 22:28:33.000000000 -0700
@@ -37,6 +37,14 @@
return "solaris";
} else if (os.equals("Linux")) {
@@ -3414,9 +3410,9 @@ $FreeBSD$
} else if (os.startsWith("Windows")) {
return "win32";
} else {
---- ./hotspot/make/Makefile 2010-12-16 13:52:06.000000000 -0800
-+++ ./hotspot/make/Makefile 2010-10-31 14:22:38.000000000 -0700
-@@ -321,28 +321,28 @@
+--- ./hotspot/make/Makefile 2011-05-26 17:27:30.000000000 -0700
++++ ./hotspot/make/Makefile 2011-04-22 22:28:33.000000000 -0700
+@@ -323,28 +323,28 @@
ifneq ($(OSNAME),windows)
ifeq ($(ZERO_BUILD), true)
ifeq ($(SHARK_BUILD), true)
@@ -3455,8 +3451,8 @@ $FreeBSD$
$(install-file)
endif
endif
---- ./hotspot/make/bsd/Makefile 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/Makefile 2010-12-04 08:30:56.000000000 -0800
+--- ./hotspot/make/bsd/Makefile 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/Makefile 2011-05-07 21:53:43.000000000 -0700
@@ -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
@@ -3495,9 +3491,9 @@ $FreeBSD$
OS_VERSION := $(shell uname -r)
EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
---- ./hotspot/make/bsd/makefiles/buildtree.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/buildtree.make 2010-10-31 14:26:55.000000000 -0700
-@@ -287,10 +287,11 @@
+--- ./hotspot/make/bsd/makefiles/buildtree.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/buildtree.make 2011-04-22 22:28:33.000000000 -0700
+@@ -321,10 +321,11 @@
[ -n "$$JAVA_HOME" ] && { echo ": \$${JAVA_HOME:=$${JAVA_HOME}}"; }; \
{ \
echo "LD_LIBRARY_PATH=.:$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}\$${JAVA_HOME}/jre/lib/${LIBARCH}/native_threads:\$${JAVA_HOME}/jre/lib/${LIBARCH}:${GCC_LIB}"; \
@@ -3510,19 +3506,179 @@ $FreeBSD$
) > $@
env.csh: env.sh
---- ./hotspot/make/bsd/makefiles/cscope.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/cscope.make 2010-07-04 09:31:25.000000000 -0700
-@@ -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.
- ifndef CS_OS
--CS_OS = bsd macos solaris win32
+@@ -389,6 +390,7 @@
+ echo '#!/bin/sh'; \
+ $(BUILDTREE_COMMENT); \
+ echo '. ./env.sh'; \
++ echo "exit 0;"; \
+ echo "if [ \"$(CROSS_COMPILE_ARCH)\" != \"\" ]; then { $(CROSS_COMPILING_MSG); exit 0; }; fi"; \
+ echo "if [ -z \$$JAVA_HOME ]; then { $(NO_JAVA_HOME_MSG); exit 0; }; fi"; \
+ echo "if ! \$${JAVA_HOME}/bin/java $(JAVA_FLAG) -fullversion 2>&1 > /dev/null"; \
+--- ./hotspot/make/bsd/makefiles/cscope.make 1969-12-31 16:00:00.000000000 -0800
++++ ./hotspot/make/bsd/makefiles/cscope.make 2011-04-22 22:28:33.000000000 -0700
+@@ -0,0 +1,160 @@
++#
++# Copyright (c) 2005, 2008, Oracle and/or its affiliates. All rights reserved.
++# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
++#
++# This code is free software; you can redistribute it and/or modify it
++# under the terms of the GNU General Public License version 2 only, as
++# published by the Free Software Foundation.
++#
++# This code is distributed in the hope that it will be useful, but WITHOUT
++# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
++# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
++# version 2 for more details (a copy is included in the LICENSE file that
++# accompanied this code).
++#
++# You should have received a copy of the GNU General Public License version
++# 2 along with this work; if not, write to the Free Software Foundation,
++# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
++#
++# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++# or visit www.oracle.com if you need additional information or have any
++# questions.
++#
++#
++
++#
++# The cscope.out file is made in the current directory and spans the entire
++# source tree.
++#
++# Things to note:
++# 1. We use relative names for cscope.
++# 2. We *don't* remove the old cscope.out file, because cscope is smart
++# enough to only build what has changed. It can be confused, however,
++# if files are renamed or removed, so it may be necessary to manually
++# remove cscope.out if a lot of reorganization has occurred.
++#
++
++include $(GAMMADIR)/make/scm.make
++
++NAWK = awk
++RM = rm -f
++HG = hg
++CS_TOP = ../..
++
++CSDIRS = $(CS_TOP)/src $(CS_TOP)/build
++CSINCS = $(CSDIRS:%=-I%)
++
++CSCOPE = cscope
++CSCOPE_FLAGS = -b
++
++# Allow .java files to be added from the environment (CSCLASSES=yes).
++ifdef CSCLASSES
++ADDCLASSES= -o -name '*.java'
++endif
++
++# Adding CClassHeaders also pushes the file count of a full workspace up about
++# 200 files (these files also don't exist in a new workspace, and thus will
++# cause the recreation of the database as they get created, which might seem
++# a little confusing). Thus allow these files to be added from the environment
++# (CSHEADERS=yes).
++ifndef CSHEADERS
++RMCCHEADERS= -o -name CClassHeaders
++endif
++
++# Use CS_GENERATED=x to include auto-generated files in the build directories.
++ifdef CS_GENERATED
++CS_ADD_GENERATED = -o -name '*.incl'
++else
++CS_PRUNE_GENERATED = -o -name '${OS}_*_core' -o -name '${OS}_*_compiler?'
++endif
++
++# OS-specific files for other systems are excluded by default. Use CS_OS=yes
++# to include platform-specific files for other platforms.
++ifndef CS_OS
+CS_OS = linux macos solaris win32 bsd
- CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
- endif
-
---- ./hotspot/make/bsd/makefiles/defs.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/defs.make 2010-10-31 14:48:17.000000000 -0700
++CS_PRUNE_OS = $(patsubst %,-o -name '*%*',$(filter-out ${OS},${CS_OS}))
++endif
++
++# Processor-specific files for other processors are excluded by default. Use
++# CS_CPU=x to include platform-specific files for other platforms.
++ifndef CS_CPU
++CS_CPU = i486 sparc amd64 ia64
++CS_PRUNE_CPU = $(patsubst %,-o -name '*%*',$(filter-out ${SRCARCH},${CS_CPU}))
++endif
++
++# What files should we include? A simple rule might be just those files under
++# SCCS control, however this would miss files we create like the opcodes and
++# CClassHeaders. The following attempts to find everything that is *useful*.
++# (.del files are created by sccsrm, demo directories contain many .java files
++# that probably aren't useful for development, and the pkgarchive may contain
++# duplicates of files within the source hierarchy).
++
++# Directories to exclude.
++CS_PRUNE_STD = $(SCM_DIRS) \
++ -o -name '.del-*' \
++ -o -name '*demo' \
++ -o -name pkgarchive
++
++CS_PRUNE = $(CS_PRUNE_STD) \
++ $(CS_PRUNE_OS) \
++ $(CS_PRUNE_CPU) \
++ $(CS_PRUNE_GENERATED) \
++ $(RMCCHEADERS)
++
++# File names to include.
++CSFILENAMES = -name '*.[ch]pp' \
++ -o -name '*.[Ccshlxy]' \
++ $(CS_ADD_GENERATED) \
++ -o -name '*.il' \
++ -o -name '*.cc' \
++ -o -name '*[Mm]akefile*' \
++ -o -name '*.gmk' \
++ -o -name '*.make' \
++ -o -name '*.ad' \
++ $(ADDCLASSES)
++
++.PRECIOUS: cscope.out
++
++cscope cscope.out: cscope.files FORCE
++ $(CSCOPE) $(CSCOPE_FLAGS)
++
++# The .raw file is reordered here in an attempt to make cscope display the most
++# relevant files first.
++cscope.files: .cscope.files.raw
++ echo "$(CSINCS)" > $@
++ -egrep -v "\.java|\/make\/" $< >> $@
++ -fgrep ".java" $< >> $@
++ -fgrep "/make/" $< >> $@
++
++.cscope.files.raw: .nametable.files
++ -find $(CSDIRS) -type d \( $(CS_PRUNE) \) -prune -o \
++ -type f \( $(CSFILENAMES) \) -print > $@
++
++cscope.clean: nametable.clean
++ -$(RM) cscope.out cscope.files .cscope.files.raw
++
++TAGS: cscope.files FORCE
++ egrep -v '^-|^$$' $< | etags --members -
++
++TAGS.clean: nametable.clean
++ -$(RM) TAGS
++
++# .nametable.files and .nametable.files.tmp are used to determine if any files
++# were added to/deleted from/renamed in the workspace. If not, then there's
++# normally no need to rebuild the cscope database. To force a rebuild of
++# the cscope database: gmake nametable.clean.
++.nametable.files: .nametable.files.tmp
++ ( cmp -s $@ $< ) || ( cp $< $@ )
++ -$(RM) $<
++
++# `hg status' is slightly faster than `hg fstatus'. Both are
++# quite a bit slower on an NFS mounted file system, so this is
++# really geared towards repos on local file systems.
++.nametable.files.tmp:
++ -$(HG) fstatus -acmn > $@
++nametable.clean:
++ -$(RM) .nametable.files .nametable.files.tmp
++
++FORCE:
++
++.PHONY: cscope cscope.clean TAGS.clean nametable.clean FORCE
+--- ./hotspot/make/bsd/makefiles/defs.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -72,8 +72,8 @@
HS_ARCH = sparc
endif
@@ -3629,9 +3785,9 @@ $FreeBSD$
EXPORT_LIST += $(ADD_SA_BINARIES/$(HS_ARCH))
-
-
---- ./hotspot/make/bsd/makefiles/gcc.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/gcc.make 2010-10-31 15:24:40.000000000 -0700
-@@ -22,18 +22,22 @@
+--- ./hotspot/make/bsd/makefiles/gcc.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/gcc.make 2011-05-12 21:07:19.000000000 -0700
+@@ -22,24 +22,28 @@
#
#
@@ -3640,16 +3796,23 @@ $FreeBSD$
#------------------------------------------------------------------------
# CC, CPP & AS
- ifdef ALT_COMPILER_PATH
+ # When cross-compiling the ALT_COMPILER_PATH points
+ # to the cross-compilation toolset
+ ifdef CROSS_COMPILE_ARCH
+CXX = $(ALT_COMPILER_PATH)/g++
CPP = $(ALT_COMPILER_PATH)/g++
CC = $(ALT_COMPILER_PATH)/gcc
+ HOSTCPP = g++
+ HOSTCC = gcc
else
-CPP = g++
-CC = gcc
+CXX ?= g++
+CPP = $(CXX)
+CC ?= gcc
+ HOSTCPP = $(CPP)
+-HOSTCC = $(CC)
++HOSTCC = $(CPP)
endif
-AS = $(CC) -c
@@ -3657,16 +3820,16 @@ $FreeBSD$
# -dumpversion in gcc-2.91 shows "egcs-2.91.66". In later version, it only
# prints the numbers (e.g. "2.95", "3.2.1")
-@@ -67,7 +71,7 @@
+@@ -77,7 +81,7 @@
CFLAGS += $(VM_PICFLAG)
CFLAGS += -fno-rtti
CFLAGS += -fno-exceptions
-CFLAGS += -D_REENTRANT
+CFLAGS += -pthread
CFLAGS += -fcheck-new
-
- ARCHFLAG = $(ARCHFLAG/$(BUILDARCH))
-@@ -76,10 +80,12 @@
+ # version 4 and above support fvisibility=hidden (matches jni_x86.h file)
+ # except 4.1.2 gives pointless warnings that can't be disabled (afaik)
+@@ -91,10 +95,12 @@
ARCHFLAG/ia64 =
ARCHFLAG/sparc = -m32 -mcpu=v9
ARCHFLAG/sparcv9 = -m64 -mcpu=v9
@@ -3682,7 +3845,7 @@ $FreeBSD$
endif
CFLAGS += $(ARCHFLAG)
-@@ -124,6 +130,11 @@
+@@ -139,6 +145,11 @@
CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
# Special cases
CFLAGS_WARN/BYFILE = $(CFLAGS_WARN/$@)$(CFLAGS_WARN/DEFAULT$(CFLAGS_WARN/$@))
@@ -3694,7 +3857,7 @@ $FreeBSD$
# The flags to use for an Optimized g++ build
OPT_CFLAGS += -O3
-@@ -159,28 +170,40 @@
+@@ -184,28 +195,40 @@
LFLAGS += -Wl,-relax
endif
@@ -3733,7 +3896,7 @@ $FreeBSD$
-# Build shared library
-SHARED_FLAG = -shared
+ # Keep symbols even they are not used
-+ #AOUT_FLAGS += -export-dynamic
++ #AOUT_FLAGS += -Xlinker -export-dynamic
+else
+ # Enable linker optimization
+ LFLAGS += -Xlinker -O1
@@ -3742,18 +3905,18 @@ $FreeBSD$
+ SONAMEFLAG = -Xlinker -soname=SONAME
-# Keep symbols even they are not used
--AOUT_FLAGS += -export-dynamic
+-AOUT_FLAGS += -Xlinker -export-dynamic
+ # Build shared library
+ SHARED_FLAG = -shared $(VM_PICFLAG)
+
+ # Keep symbols even they are not used
-+ AOUT_FLAGS += -export-dynamic
++ AOUT_FLAGS += -Xlinker -export-dynamic
+endif
#------------------------------------------------------------------------
# Debug flags
---- ./hotspot/make/bsd/makefiles/jsig.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/jsig.make 2010-07-04 09:31:25.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/jsig.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/jsig.make 2011-04-22 22:28:33.000000000 -0700
@@ -25,11 +25,16 @@
# Rules to build signal interposition library, used by vm.make
@@ -3793,9 +3956,9 @@ $FreeBSD$
$(QUIETLY) [ -f $(LIBJSIG_G) ] || { ln -s $@ $(LIBJSIG_G); }
install_jsig: $(LIBJSIG)
---- ./hotspot/make/bsd/makefiles/launcher.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/launcher.make 2010-07-04 09:31:25.000000000 -0700
-@@ -46,7 +46,7 @@
+--- ./hotspot/make/bsd/makefiles/launcher.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/launcher.make 2011-04-22 22:28:33.000000000 -0700
+@@ -50,7 +50,7 @@
LIBS_LAUNCHER += $(STATIC_STDCXX) $(LIBS)
else
LAUNCHER.o = launcher.o
@@ -3804,8 +3967,8 @@ $FreeBSD$
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
endif
---- ./hotspot/make/bsd/makefiles/sa.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/sa.make 2010-10-31 14:26:55.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/sa.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/sa.make 2011-04-23 12:15:44.000000000 -0700
@@ -45,8 +45,8 @@
# gnumake 3.78.1 does not accept the *s that
@@ -3817,8 +3980,8 @@ $FreeBSD$
AGENT_FILES1_LIST := $(GENERATED)/agent1.classes.list
AGENT_FILES2_LIST := $(GENERATED)/agent2.classes.list
---- ./hotspot/make/bsd/makefiles/saproc.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/saproc.make 2010-10-31 14:26:55.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/saproc.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/saproc.make 2011-04-22 22:28:33.000000000 -0700
@@ -25,23 +25,34 @@
# Rules to build serviceability agent library, used by vm.make
@@ -3859,9 +4022,9 @@ $FreeBSD$
SAMAPFILE = $(SASRCDIR)/mapfile
-@@ -60,7 +71,10 @@
- $(MAKE) -f vm.make $(LIBSAPROC); \
- fi
+@@ -62,7 +73,10 @@
+ endif
+
-SA_LFLAGS = $(MAPFLAG:FILENAME=$(SAMAPFILE)) $(LDFLAGS_HASH_STYLE)
+ifneq ($(OS_VENDOR), Darwin)
@@ -3871,7 +4034,7 @@ $FreeBSD$
$(LIBSAPROC): $(SASRCFILES) $(SAMAPFILE)
$(QUIETLY) if [ "$(BOOT_JAVA_HOME)" = "" ]; then \
-@@ -73,12 +87,12 @@
+@@ -75,12 +89,12 @@
-I$(SASRCDIR) \
-I$(GENERATED) \
-I$(BOOT_JAVA_HOME)/include \
@@ -3885,10 +4048,10 @@ $FreeBSD$
+ $(SALIBS)
$(QUIETLY) [ -f $(LIBSAPROC_G) ] || { ln -s $@ $(LIBSAPROC_G); }
- install_saproc: checkAndBuildSA
---- ./hotspot/make/bsd/makefiles/vm.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/vm.make 2010-10-31 14:26:55.000000000 -0700
-@@ -90,6 +90,10 @@
+ install_saproc: $(BUILDLIBSAPROC)
+--- ./hotspot/make/bsd/makefiles/vm.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/vm.make 2011-05-14 23:15:36.000000000 -0700
+@@ -92,6 +92,10 @@
${JRE_VERSION} \
${VM_DISTRO}
@@ -3899,16 +4062,20 @@ $FreeBSD$
# CFLAGS_WARN holds compiler options to suppress/enable warnings.
CFLAGS += $(CFLAGS_WARN/BYFILE)
-@@ -100,7 +104,7 @@
- CFLAGS += $(EXTRA_CFLAGS)
- LFLAGS += $(EXTRA_CFLAGS)
+@@ -104,9 +108,11 @@
+
+ # Don't set excutable bit on stack segment
+ # the same could be done by separate execstack command
++ifneq ($(OS_VENDOR), Darwin)
+ LFLAGS += -Xlinker -z -Xlinker noexecstack
++endif
-LIBS += -lm -ldl -lpthread
+LIBS += -lm -pthread
# By default, link the *.o into the library, not the executable.
LINK_INTO$(LINK_INTO) = LIBJVM
-@@ -114,9 +118,15 @@
+@@ -120,9 +126,15 @@
#----------------------------------------------------------------------
# JVM
@@ -3925,9 +4092,9 @@ $FreeBSD$
+ LIBJVM_G = lib$(JVM)$(G_SUFFIX).so
+endif
- JVM_OBJ_FILES = $(Obj_Files)
+ SPECIAL_PATHS:=adlc c1 gc_implementation opto shark libadt
-@@ -137,15 +147,7 @@
+@@ -213,15 +225,7 @@
vm.def: $(Res_Files) $(Obj_Files)
sh $(GAMMADIR)/make/bsd/makefiles/build_vm_def.sh *.o > $@
@@ -3944,7 +4111,7 @@ $FreeBSD$
ifeq ($(LINK_INTO),AOUT)
LIBJVM.o =
-@@ -157,14 +159,21 @@
+@@ -233,14 +237,21 @@
LFLAGS_VM$(LDNOMAP) += $(MAPFLAG:FILENAME=$(LIBJVM_MAPFILE))
LFLAGS_VM += $(SONAMEFLAG:SONAME=$(LIBJVM))
@@ -3967,15 +4134,15 @@ $FreeBSD$
endif
LIBS_VM += $(LIBS)
-@@ -177,7 +186,6 @@
+@@ -253,7 +264,6 @@
LIBS_VM += $(LLVM_LIBS)
endif
-LINK_VM = $(LINK_LIB.c)
# rule for building precompiled header
- $(PRECOMPILED_HEADER): $(Precompiled_Files)
-@@ -205,11 +213,6 @@
+ $(PRECOMPILED_HEADER):
+@@ -281,11 +291,6 @@
LD_SCRIPT_FLAG = -Wl,-T,$(LD_SCRIPT)
endif
@@ -3987,7 +4154,7 @@ $FreeBSD$
$(LIBJVM): $(LIBJVM.o) $(LIBJVM_MAPFILE) $(LD_SCRIPT)
$(QUIETLY) { \
echo Linking vm...; \
-@@ -219,17 +222,6 @@
+@@ -295,17 +300,6 @@
$(LINK_LIB.CC/POST_HOOK) \
rm -f $@.1; ln -s $@ $@.1; \
[ -f $(LIBJVM_G) ] || { ln -s $@ $(LIBJVM_G); ln -s $@.1 $(LIBJVM_G).1; }; \
@@ -4005,8 +4172,8 @@ $FreeBSD$
}
DEST_JVM = $(JDK_LIBDIR)/$(VM_SUBDIR)/$(LIBJVM)
---- ./hotspot/make/bsd/makefiles/zeroshark.make 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/makefiles/zeroshark.make 2010-07-04 09:31:26.000000000 -0700
+--- ./hotspot/make/bsd/makefiles/zeroshark.make 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/makefiles/zeroshark.make 2011-04-22 22:28:33.000000000 -0700
@@ -40,4 +40,23 @@
CFLAGS += -D_LP64=1
endif
@@ -4031,40 +4198,60 @@ $FreeBSD$
+LIBS += -L$(PACKAGE_PATH)/lib -lffi
+
OPT_CFLAGS/compactingPermGenGen.o = -O1
---- ./hotspot/make/bsd/platform_amd64 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/platform_amd64 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/platform_amd64 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_amd64 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
compiler = gcc
-sysdefs = -DBSD -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_amd64.suncc 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/platform_amd64.suncc 2010-01-17 15:46:11.000000000 -0800
+--- ./hotspot/make/bsd/platform_amd64.suncc 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_amd64.suncc 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
gnu_dis_arch = amd64
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DAMD64
---- ./hotspot/make/bsd/platform_i486 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/platform_i486 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/platform_arm 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_arm 1969-12-31 16:00:00.000000000 -0800
+@@ -1,17 +0,0 @@
+-os_family = bsd
+-
+-arch = arm
+-
+-arch_model = arm
+-
+-os_arch = bsd_arm
+-
+-os_arch_model = bsd_arm
+-
+-lib_arch = arm
+-
+-compiler = gcc
+-
+-gnu_dis_arch = arm
+-
+-sysdefs = -DBSD -D_GNU_SOURCE -DARM
+--- ./hotspot/make/bsd/platform_i486 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_i486 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
compiler = gcc
-sysdefs = -DBSD -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_i486.suncc 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/platform_i486.suncc 2010-01-17 15:46:11.000000000 -0800
+--- ./hotspot/make/bsd/platform_i486.suncc 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_i486.suncc 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
gnu_dis_arch = i386
-sysdefs = -DBSD -DSPARC_WORKS -D_GNU_SOURCE -DIA32
+sysdefs = -D_ALLBSD_SOURCE -DSPARC_WORKS -D_GNU_SOURCE -DIA32
---- ./hotspot/make/bsd/platform_ia64 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/platform_ia64 2010-01-17 15:46:11.000000000 -0800
+--- ./hotspot/make/bsd/platform_ia64 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_ia64 2011-04-22 22:28:33.000000000 -0700
@@ -10,6 +10,6 @@
gnu_dis_arch = ia64
@@ -4073,33 +4260,64 @@ $FreeBSD$
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DIA64 -DCC_INTERP
mark_style = alignment
---- ./hotspot/make/bsd/platform_sparc 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/platform_sparc 2009-06-06 16:53:58.000000000 -0700
+--- ./hotspot/make/bsd/platform_ppc 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_ppc 1969-12-31 16:00:00.000000000 -0800
+@@ -1,17 +0,0 @@
+-os_family = bsd
+-
+-arch = ppc
+-
+-arch_model = ppc
+-
+-os_arch = bsd_ppc
+-
+-os_arch_model = bsd_ppc
+-
+-lib_arch = ppc
+-
+-compiler = gcc
+-
+-gnu_dis_arch = ppc
+-
+-sysdefs = -DBSD -D_GNU_SOURCE -DPPC
+--- ./hotspot/make/bsd/platform_sparc 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_sparc 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
compiler = gcc
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_sparcv9 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/platform_sparcv9 2010-01-17 15:46:11.000000000 -0800
+--- ./hotspot/make/bsd/platform_sparcv9 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_sparcv9 2011-04-22 22:28:33.000000000 -0700
@@ -12,4 +12,4 @@
compiler = gcc
-sysdefs = -DBSD -D_GNU_SOURCE -DSPARC
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DSPARC
---- ./hotspot/make/bsd/platform_zero.in 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/make/bsd/platform_zero.in 2009-11-04 19:52:29.000000000 -0800
+--- ./hotspot/make/bsd/platform_zero.in 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/make/bsd/platform_zero.in 2011-04-22 22:28:33.000000000 -0700
@@ -14,4 +14,4 @@
gnu_dis_arch = zero
-sysdefs = -DBSD -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
+sysdefs = -D_ALLBSD_SOURCE -D_GNU_SOURCE -DCC_INTERP -DZERO -D@ZERO_ARCHDEF@ -DZERO_LIBARCH=\"@ZERO_LIBARCH@\"
---- ./hotspot/make/defs.make 2010-12-16 13:52:06.000000000 -0800
-+++ ./hotspot/make/defs.make 2010-10-31 14:03:01.000000000 -0700
-@@ -119,13 +119,23 @@
+--- ./hotspot/make/cscope.make 2011-05-26 17:27:31.000000000 -0700
++++ ./hotspot/make/cscope.make 2011-05-07 23:28:29.000000000 -0700
+@@ -63,7 +63,7 @@
+ # space-separated list of identifiers to include only those systems.
+ ifdef CS_OS
+ CS_PRUNE_OS = $(patsubst %,-o -name '*%*',\
+- $(filter-out ${CS_OS},linux macos solaris windows))
++ $(filter-out ${CS_OS},bsd linux macos solaris windows))
+ endif
+
+ # CPU-specific files for all processors are included by default. Set CS_CPU
+--- ./hotspot/make/defs.make 2011-05-26 17:27:31.000000000 -0700
++++ ./hotspot/make/defs.make 2011-04-22 22:28:33.000000000 -0700
+@@ -118,13 +118,23 @@
# Windows should have OS predefined
ifeq ($(OS),)
OS := $(shell uname -s)
@@ -4125,8 +4343,8 @@ $FreeBSD$
else
OSNAME=solaris
endif
---- ./hotspot/make/linux/makefiles/defs.make 2010-12-16 13:52:07.000000000 -0800
-+++ ./hotspot/make/linux/makefiles/defs.make 2010-10-31 14:24:05.000000000 -0700
+--- ./hotspot/make/linux/makefiles/defs.make 2011-05-26 17:27:34.000000000 -0700
++++ ./hotspot/make/linux/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -116,33 +116,36 @@
JDK_INCLUDE_SUBDIR=linux
@@ -4169,8 +4387,8 @@ $FreeBSD$
$(EXPORT_LIB_DIR)/sa-jdi.jar
ADD_SA_BINARIES/ppc =
ADD_SA_BINARIES/ia64 =
---- ./hotspot/make/sa.files 2010-12-16 13:52:08.000000000 -0800
-+++ ./hotspot/make/sa.files 2010-06-15 22:03:19.000000000 -0700
+--- ./hotspot/make/sa.files 2011-05-26 17:27:40.000000000 -0700
++++ ./hotspot/make/sa.files 2011-04-22 22:28:33.000000000 -0700
@@ -50,6 +50,9 @@
$(AGENT_SRC_DIR)/sun/jvm/hotspot/compiler/*.java \
$(AGENT_SRC_DIR)/sun/jvm/hotspot/debugger/*.java \
@@ -4191,8 +4409,8 @@ $FreeBSD$
$(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/make/solaris/makefiles/defs.make 2010-12-16 13:52:08.000000000 -0800
-+++ ./hotspot/make/solaris/makefiles/defs.make 2010-10-31 14:25:25.000000000 -0700
+--- ./hotspot/make/solaris/makefiles/defs.make 2011-05-26 17:27:42.000000000 -0700
++++ ./hotspot/make/solaris/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -61,34 +61,37 @@
JDK_INCLUDE_SUBDIR=solaris
@@ -4244,8 +4462,39 @@ $FreeBSD$
-EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.so
+EXPORT_LIST += $(EXPORT_JRE_LIB_ARCH_DIR)/libsaproc.$(LIBRARY_SUFFIX)
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/make/windows/makefiles/defs.make 2010-12-16 13:52:10.000000000 -0800
-+++ ./hotspot/make/windows/makefiles/defs.make 2010-07-10 12:30:12.000000000 -0700
+--- ./hotspot/make/templates/bsd-header 2011-05-26 17:27:52.000000000 -0700
++++ ./hotspot/make/templates/bsd-header 1969-12-31 16:00:00.000000000 -0800
+@@ -1,28 +0,0 @@
+-Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
+-
+-Redistribution and use in source and binary forms, with or without
+-modification, are permitted provided that the following conditions
+-are met:
+-
+- - Redistributions of source code must retain the above copyright
+- notice, this list of conditions and the following disclaimer.
+-
+- - Redistributions in binary form must reproduce the above copyright
+- notice, this list of conditions and the following disclaimer in the
+- documentation and/or other materials provided with the distribution.
+-
+- - Neither the name of Oracle nor the names of its
+- contributors may be used to endorse or promote products derived
+- from this software without specific prior written permission.
+-
+-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+-PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+--- ./hotspot/make/windows/makefiles/defs.make 2011-05-26 17:27:54.000000000 -0700
++++ ./hotspot/make/windows/makefiles/defs.make 2011-04-22 22:28:33.000000000 -0700
@@ -109,6 +109,9 @@
JDK_INCLUDE_SUBDIR=win32
@@ -4287,9 +4536,9 @@ $FreeBSD$
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.pdb
EXPORT_LIST += $(EXPORT_JRE_BIN_DIR)/sawindbg.map
EXPORT_LIST += $(EXPORT_LIB_DIR)/sa-jdi.jar
---- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2010-12-16 13:52:14.000000000 -0800
-+++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2010-11-13 14:40:43.000000000 -0800
-@@ -63,4 +63,8 @@
+--- ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2011-05-26 17:28:09.000000000 -0700
++++ ./hotspot/src/cpu/sparc/vm/globals_sparc.hpp 2011-04-22 22:28:33.000000000 -0700
+@@ -70,7 +70,11 @@
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
@@ -4298,9 +4547,24 @@ $FreeBSD$
+#else
define_pd_global(bool, UseMembar, false);
+#endif
---- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-12-16 13:52:17.000000000 -0800
-+++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2010-10-31 14:03:01.000000000 -0700
-@@ -469,8 +469,8 @@
+
+ // GC Ergo Flags
+ define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
+--- ./hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-05-26 17:28:20.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/bytes_x86.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -81,6 +81,9 @@
+ #ifdef TARGET_OS_ARCH_windows_x86
+ # include "bytes_windows_x86.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "bytes_bsd_x86.inline.hpp"
++#endif
+
+
+ #endif // CPU_X86_VM_BYTES_X86_HPP
+--- ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-05-26 17:28:22.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp 2011-04-23 12:09:38.000000000 -0700
+@@ -480,8 +480,8 @@
// Fetch the exception from TLS and clear out exception related thread state
__ get_thread(rsi);
__ movptr(rax, Address(rsi, JavaThread::exception_oop_offset()));
@@ -4311,9 +4575,21 @@ $FreeBSD$
__ bind(_unwind_handler_entry);
__ verify_not_null_oop(rax);
---- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2010-12-16 13:52:18.000000000 -0800
-+++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2010-11-13 14:40:31.000000000 -0800
-@@ -64,4 +64,8 @@
+--- ./hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-05-26 17:28:24.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/copy_x86.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_ARCH_windows_x86
+ # include "copy_windows_x86.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "copy_bsd_x86.inline.hpp"
++#endif
+
+
+ static void pd_fill_to_words(HeapWord* tohw, size_t count, juint value) {
+--- ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2011-05-26 17:28:28.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/globals_x86.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -70,7 +70,11 @@
define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true);
@@ -4322,9 +4598,22 @@ $FreeBSD$
+#else
define_pd_global(bool, UseMembar, false);
+#endif
---- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-12-16 13:52:18.000000000 -0800
-+++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2010-10-31 14:03:01.000000000 -0700
-@@ -1153,7 +1153,7 @@
+
+ // GC Ergo Flags
+ define_pd_global(intx, CMSYoungGenPerWorker, 64*M); // default max size of CMS young gen, per GC worker thread
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-05-26 17:28:28.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_32.cpp 2011-05-12 20:54:44.000000000 -0700
+@@ -45,6 +45,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ // Implementation of InterpreterMacroAssembler
+@@ -1144,7 +1147,7 @@
int recvr_offset = in_bytes(VirtualCallData::receiver_offset(start_row));
set_mdp_data_at(mdp, recvr_offset, receiver);
int count_offset = in_bytes(VirtualCallData::receiver_count_offset(start_row));
@@ -4333,7 +4622,7 @@ $FreeBSD$
set_mdp_data_at(mdp, count_offset, reg2);
if (start_row > 0) {
jmp(done);
-@@ -1296,7 +1296,7 @@
+@@ -1287,7 +1290,7 @@
test_method_data_pointer(mdp, profile_continue);
// Build the base (index * per_case_size_in_bytes()) + case_array_offset_in_bytes()
@@ -4342,170 +4631,161 @@ $FreeBSD$
// index is positive and so should have correct value if this code were
// used on 64bits
imulptr(index, reg2);
---- ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-12-16 13:52:18.000000000 -0800
-+++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2010-06-15 22:03:21.000000000 -0700
+--- ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-05-26 17:28:29.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/interp_masm_x86_64.cpp 2011-05-12 20:54:44.000000000 -0700
+@@ -45,6 +45,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ // Implementation of InterpreterMacroAssembler
+--- ./hotspot/src/cpu/x86/vm/jni_x86.h 2011-05-26 17:28:32.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/jni_x86.h 2011-04-22 22:28:34.000000000 -0700
@@ -26,7 +26,7 @@
#ifndef _JAVASOFT_JNI_MD_H_
#define _JAVASOFT_JNI_MD_H_
-#if defined(SOLARIS) || defined(LINUX)
+#if defined(SOLARIS) || defined(LINUX) || defined(_ALLBSD_SOURCE)
- #define JNIEXPORT
- #define JNIIMPORT
- #define JNICALL
---- ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2010-12-16 13:52:20.000000000 -0800
-+++ ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2010-11-13 14:40:56.000000000 -0800
-@@ -46,4 +46,8 @@
- define_pd_global(bool, RewriteBytecodes, true);
- define_pd_global(bool, RewriteFrequentPairs, true);
-+#ifdef _ALLBSD_SOURCE
-+define_pd_global(bool, UseMembar, true);
-+#else
- define_pd_global(bool, UseMembar, false);
+ #if defined(__GNUC__) && (__GNUC__ > 4) || (__GNUC__ == 4) && (__GNUC_MINOR__ > 2)
+ #define JNIEXPORT __attribute__((visibility("default")))
+--- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-05-26 17:28:34.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_32.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -47,6 +47,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
+#endif
---- ./hotspot/src/os/bsd/launcher/java_md.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/launcher/java_md.c 2010-10-31 14:26:55.000000000 -0700
-@@ -45,8 +45,15 @@
- #include "version_comp.h"
+ #ifdef COMPILER2
+ #include "opto/runtime.hpp"
+ #endif
+--- ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-05-26 17:28:35.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/stubGenerator_x86_64.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -47,6 +47,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifdef COMPILER2
+ #include "opto/runtime.hpp"
+ #endif
+--- ./hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-05-26 17:28:35.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/stubRoutines_x86_32.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
#endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
-+#ifdef __APPLE__
-+#define JVM_DLL "libjvm.dylib"
-+#define JAVA_DLL "libjava.dylib"
-+#define LD_LIBRARY_PATH "DYLD_LIBRARY_PATH"
-+#else
- #define JVM_DLL "libjvm.so"
- #define JAVA_DLL "libjava.so"
-+#define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
+ // 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-05-26 17:28:36.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/stubRoutines_x86_64.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
+#endif
- #ifndef GAMMA /* launcher.make defines ARCH */
+ // 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-05-26 17:28:37.000000000 -0700
++++ ./hotspot/src/cpu/x86/vm/vm_version_x86.cpp 2011-05-27 00:00:43.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
-@@ -116,7 +123,7 @@
- * A collection of useful strings. One should think of these as #define
- * entries, but actual strings can be more efficient (with many compilers).
- */
--#ifdef __bsd__
-+#ifdef _ALLBSD_SOURCE
- static const char *system_dir = "/usr/java";
- static const char *user_dir = "/java";
- #else /* Solaris */
-@@ -460,10 +467,10 @@
- * If not on Solaris, assume only a single LD_LIBRARY_PATH
- * variable.
- */
-- runpath = getenv("LD_LIBRARY_PATH");
-+ runpath = getenv(LD_LIBRARY_PATH);
- #endif /* __sun */
--#ifdef __bsd
-+#ifdef _ALLBSD_SOURCE
- /*
- * On bsd, if a binary is running as sgid or suid, glibc sets
- * LD_LIBRARY_PATH to the empty string for security purposes. (In
-@@ -476,7 +483,7 @@
- * return from the function now. Getting the right libraries to
- * be found must be handled through other mechanisms.
- */
-- if((getgid() != getegid()) || (getuid() != geteuid()) ) {
-+ if(issetugid()) {
- return;
- }
+ int VM_Version::_cpu;
+--- ./hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-05-26 17:28:41.000000000 -0700
++++ ./hotspot/src/cpu/zero/vm/bytes_zero.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -168,6 +168,9 @@
+ #ifdef TARGET_OS_ARCH_linux_zero
+ # include "bytes_linux_zero.inline.hpp"
#endif
-@@ -487,7 +494,7 @@
- new_runpath = MemAlloc( ((runpath!=NULL)?strlen(runpath):0) +
- 2*strlen(jrepath) + 2*strlen(arch) +
- strlen(jvmpath) + 52);
-- newpath = new_runpath + strlen("LD_LIBRARY_PATH=");
-+ newpath = new_runpath + strlen(LD_LIBRARY_PATH "=");
-
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "bytes_bsd_zero.inline.hpp"
++#endif
- /*
-@@ -502,7 +509,7 @@
+ #endif // VM_LITTLE_ENDIAN
- /* jvmpath, ((running != wanted)?((wanted==64)?"/"BIG_ARCH:"/.."):""), */
+--- ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2011-05-26 17:28:44.000000000 -0700
++++ ./hotspot/src/cpu/zero/vm/globals_zero.hpp 2011-04-23 12:09:38.000000000 -0700
+@@ -52,7 +52,11 @@
+ define_pd_global(bool, RewriteBytecodes, true);
+ define_pd_global(bool, RewriteFrequentPairs, true);
-- sprintf(new_runpath, "LD_LIBRARY_PATH="
-+ sprintf(new_runpath, LD_LIBRARY_PATH "="
- "%s:"
- "%s/lib/%s:"
- "%s/../lib/%s",
-@@ -840,7 +847,7 @@
- jboolean
- GetApplicationHome(char *buf, jint bufsize)
- {
--#ifdef __bsd__
+#ifdef _ALLBSD_SOURCE
- char *execname = GetExecname();
- if (execname) {
- strncpy(buf, execname, bufsize-1);
-@@ -1009,7 +1016,7 @@
- }
- }
- }
--#elif defined(__bsd__)
-+#elif defined(__linux__)
- {
- const char* self = "/proc/self/exe";
- char buf[PATH_MAX+1];
-@@ -1019,7 +1026,7 @@
- exec_path = strdup(buf);
- }
- }
--#else /* !__sun && !__bsd */
-+#else /* !__sun && !__linux */
- {
- /* Not implemented */
- }
-@@ -1224,7 +1231,7 @@
-
- #endif /* __sun && i586 */
-
--#if defined(__bsd__) && defined(i586)
-+#if defined(_ALLBSD_SOURCE) && defined(i586)
++define_pd_global(bool, UseMembar, true);
++#else
+ define_pd_global(bool, UseMembar, false);
++#endif
- /*
- * A utility method for asking the CPU about itself.
-@@ -1290,7 +1297,7 @@
+ // GC Ergo Flags
+ define_pd_global(intx, CMSYoungGenPerWorker, 16*M); // default max size of CMS young gen, per GC worker thread
+--- ./hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-05-26 17:28:45.000000000 -0700
++++ ./hotspot/src/cpu/zero/vm/interp_masm_zero.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -40,5 +40,8 @@
+ #ifdef TARGET_OS_FAMILY_linux
+ # include "thread_linux.inline.hpp"
#endif
- }
-
--#endif /* __bsd__ && i586 */
-+#endif /* _ALLBSD_SOURCE && i586 */
-
- #ifdef i586
- /*
-@@ -1469,7 +1476,7 @@
-
- #endif /* __sun && i586 */
-
--#if defined(__bsd__) && defined(i586)
-+#if defined(_ALLBSD_SOURCE) && defined(i586)
-
- /* The definition of a server-class machine for bsd-i586 */
- jboolean
-@@ -1500,7 +1507,7 @@
- return result;
- }
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
--#endif /* __bsd__ && i586 */
-+#endif /* _ALLBSD_SOURCE && i586 */
+ // This file is intentionally empty
+--- ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-05-26 17:28:49.000000000 -0700
++++ ./hotspot/src/cpu/zero/vm/stubGenerator_zero.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -43,6 +43,9 @@
+ #ifdef TARGET_OS_FAMILY_linux
+ # include "thread_linux.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifdef COMPILER2
+ #include "opto/runtime.hpp"
+ #endif
+--- ./hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-05-26 17:28:49.000000000 -0700
++++ ./hotspot/src/cpu/zero/vm/stubRoutines_zero.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -30,3 +30,6 @@
+ #ifdef TARGET_OS_FAMILY_linux
+ # include "thread_linux.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+--- ./hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-05-26 17:28:51.000000000 -0700
++++ ./hotspot/src/cpu/zero/vm/vm_version_zero.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -32,5 +32,8 @@
+ #ifdef TARGET_OS_FAMILY_linux
+ # include "os_linux.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
- /* Dispatch to the platform-specific definition of "server-class" */
- jboolean
-@@ -1510,7 +1517,7 @@
- result = solaris_sparc_ServerClassMachine();
- #elif defined(__sun) && defined(i586)
- result = solaris_i586_ServerClassMachine();
--#elif defined(__bsd__) && defined(i586)
-+#elif defined(_ALLBSD_SOURCE) && defined(i586)
- result = bsd_i586_ServerClassMachine();
- #else
- if (_launcher_debug) {
---- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2010-11-13 14:35:21.000000000 -0800
-@@ -334,6 +334,15 @@
+ // This file is intentionally empty
+--- ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/attachListener_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -337,6 +337,15 @@
// get the credentials of the peer and check the effective uid/guid
// - check with jeff on this.
@@ -4521,7 +4801,7 @@ $FreeBSD$
struct ucred cred_info;
socklen_t optlen = sizeof(cred_info);
if (::getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void*)&cred_info, &optlen) == -1) {
-@@ -341,10 +350,13 @@
+@@ -344,10 +353,13 @@
RESTARTABLE(::close(s), res);
continue;
}
@@ -4536,7 +4816,7 @@ $FreeBSD$
int res;
RESTARTABLE(::close(s), res);
continue;
-@@ -464,16 +476,13 @@
+@@ -467,16 +479,13 @@
if (init_at_startup() || is_initialized()) {
return false; // initialized at startup or already initialized
}
@@ -4559,92 +4839,32 @@ $FreeBSD$
if (ret == 0) {
// simple check to avoid starting the attach mechanism when
// a bogus user creates the file
---- ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/hpi_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
-@@ -28,6 +28,14 @@
- # include <sys/param.h>
- # include <dlfcn.h>
-
-+#ifdef __APPLE__
-+#define HPI_LIB "libhpi.dylib"
-+#define HPI_G_LIB "libhpi.dylib"
-+#else
-+#define HPI_LIB "libhpi.so"
-+#define HPI_G_LIB "libhpi.so"
-+#endif
-+
- typedef jint (JNICALL *init_t)(GetInterfaceFunc *, void *);
-
- void hpi::initialize_get_interface(vm_calls_t *callbacks) {
-@@ -45,11 +53,11 @@
- os::jvm_path(buf, JVM_MAXPATHLEN);
-
- #ifdef PRODUCT
-- const char * hpi_lib = "/libhpi.so";
-+ const char * hpi_lib = "/" HPI_LIB;
- #else
- char * ptr = strrchr(buf, '/');
- assert(strstr(ptr, "/libjvm") == ptr, "invalid library name");
-- const char * hpi_lib = strstr(ptr, "_g") ? "/libhpi_g.so" : "/libhpi.so";
-+ const char * hpi_lib = strstr(ptr, "_g") ? "/" HPI_G_LIB : "/" HPI_LIB;
- #endif
-
- *(strrchr(buf, '/')) = '\0'; /* get rid of /libjvm.so */
---- ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/hpi_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
-@@ -36,7 +36,7 @@
- // HPI_FileInterface
-
- inline int hpi::close(int fd) {
-- return ::close(fd);
-+ RESTARTABLE_RETURN_INT(::close(fd));
- }
-
- inline size_t hpi::read(int fd, void *buf, unsigned int nBytes) {
-@@ -55,7 +55,7 @@
- // HPI_SocketInterface
-
- inline int hpi::socket_close(int fd) {
-- return ::close(fd);
-+ RESTARTABLE_RETURN_INT(::close(fd));
- }
-
- inline int hpi::socket(int domain, int type, int protocol) {
-@@ -120,9 +120,9 @@
- // fetch it's value, this cast is safe for now. The java.net group
- // may need and want to change this interface someday if socklen_t goes
- // to 64 bits on some platform that we support.
-- // Bsd doc says this can't return EINTR, unlike accept() on Solaris
-+ // At least OpenBSD and FreeBSD can return EINTR from accept.
-
-- return ::accept(fd, him, (socklen_t *)len);
-+ RESTARTABLE_RETURN_INT(::accept(fd, him, (socklen_t *)len));
- }
-
- inline int hpi::recvfrom(int fd, char *buf, int nBytes, int flags,
-@@ -136,12 +136,16 @@
- }
-
- inline int hpi::socket_available(int fd, jint *pbytes) {
-- // Bsd doc says EINTR not returned, unlike Solaris
-- int ret = ::ioctl(fd, FIONREAD, pbytes);
-+ int ret;
-+
-+ if (fd < 0)
-+ return OS_OK;
-+
-+ RESTARTABLE(::ioctl(fd, FIONREAD, pbytes), ret);
-
- //%% note ioctl can return 0 when successful, JVM_SocketAvailable
- // is expected to return 0 on failure and 1 on success to the jdk.
-- return (ret < 0) ? 0 : 1;
-+ return (ret == OS_ERR) ? 0 : 1;
- }
-
+--- ./hotspot/src/os/bsd/vm/globals_bsd.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/globals_bsd.hpp 2011-05-13 21:09:51.000000000 -0700
+@@ -47,7 +47,7 @@
+ // Defines Bsd-specific default values. The flags are available on all
+ // platforms, but they may have different default values on other platforms.
+ //
+-define_pd_global(bool, UseLargePages, true);
++define_pd_global(bool, UseLargePages, false);
+ define_pd_global(bool, UseLargePagesIndividualAllocation, false);
+ define_pd_global(bool, UseOSErrorReporting, false);
+ define_pd_global(bool, UseThreadPriorities, true) ;
+--- ./hotspot/src/os/bsd/vm/jsig.c 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/jsig.c 2011-04-22 22:28:34.000000000 -0700
+@@ -35,10 +35,7 @@
+ #include <pthread.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+-
+-#define bool int
+-#define true 1
+-#define false 0
++#include <stdbool.h>
---- ./hotspot/src/os/bsd/vm/jsig.c 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/jsig.c 2010-07-04 09:31:26.000000000 -0700
-@@ -143,7 +143,8 @@
+ #define MAXSIGNUM 32
+ #define MASK(sig) ((unsigned int)1 << sig)
+@@ -143,7 +140,8 @@
}
sa_handler_t sigset(int sig, sa_handler_t disp) {
@@ -4654,9 +4874,9 @@ $FreeBSD$
}
static int call_os_sigaction(int sig, const struct sigaction *act,
---- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
-@@ -144,38 +144,31 @@
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -141,38 +141,31 @@
"ILL", SIGILL, /* Illegal instruction (ANSI). */
"TRAP", SIGTRAP, /* Trace trap (POSIX). */
"ABRT", SIGABRT, /* Abort (ANSI). */
@@ -4705,9 +4925,9 @@ $FreeBSD$
};
JVM_ENTRY_NO_ENV(jint, JVM_FindSignal(const char *name))
---- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2010-07-04 09:31:26.000000000 -0700
-@@ -51,7 +51,11 @@
+--- ./hotspot/src/os/bsd/vm/jvm_bsd.h 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/jvm_bsd.h 2011-04-22 22:28:34.000000000 -0700
+@@ -54,7 +54,11 @@
#define AGENT_ONATTACH_SYMBOLS {"Agent_OnAttach"}
#define JNI_LIB_PREFIX "lib"
@@ -4719,7 +4939,7 @@ $FreeBSD$
// Hack: MAXPATHLEN is 4095 on some Bsd and 4096 on others. This may
// cause problems if JVM and the rest of JDK are built on different
-@@ -90,6 +94,20 @@
+@@ -93,6 +97,20 @@
#define SHUTDOWN2_SIGNAL SIGINT
#define SHUTDOWN3_SIGNAL SIGTERM
@@ -4740,90 +4960,9 @@ $FreeBSD$
#endif /* JVM_MD_H */
// Reconciliation History
---- ./hotspot/src/os/bsd/vm/objectMonitor_bsd.cpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/objectMonitor_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
-@@ -0,0 +1,24 @@
-+
-+/*
-+ * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ *
-+ */
---- ./hotspot/src/os/bsd/vm/objectMonitor_bsd.hpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/objectMonitor_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
-@@ -0,0 +1,25 @@
-+/*
-+ * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ *
-+ */
-+
-+ private:
---- ./hotspot/src/os/bsd/vm/objectMonitor_bsd.inline.hpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/objectMonitor_bsd.inline.hpp 2010-07-04 09:31:26.000000000 -0700
-@@ -0,0 +1,23 @@
-+/*
-+ * Copyright (c) 1999, 2005, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ *
-+ */
---- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
-@@ -28,8 +28,8 @@
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/osThread_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -49,8 +49,8 @@
void OSThread::pd_initialize() {
assert(this != NULL, "check");
@@ -4834,9 +4973,9 @@ $FreeBSD$
_siginfo = NULL;
_ucontext = NULL;
_expanding_stack = 0;
---- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
-@@ -36,6 +36,12 @@
+--- ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/osThread_bsd.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -39,6 +39,12 @@
private:
@@ -4849,7 +4988,7 @@ $FreeBSD$
// _thread_id is kernel thread id (similar to LWP id on Solaris). Each
// thread has a unique thread_id (BsdThreads or NPTL). It can be used
// to access /proc.
-@@ -44,6 +50,7 @@
+@@ -47,6 +53,7 @@
// _pthread_id is the pthread id, which is used by library calls
// (e.g. pthread_kill).
pthread_t _pthread_id;
@@ -4857,7 +4996,7 @@ $FreeBSD$
sigset_t _caller_sigmask; // Caller's signal mask
-@@ -53,12 +60,18 @@
+@@ -56,12 +63,18 @@
sigset_t caller_sigmask() const { return _caller_sigmask; }
void set_caller_sigmask(sigset_t sigmask) { _caller_sigmask = sigmask; }
@@ -4877,7 +5016,7 @@ $FreeBSD$
#endif
#ifdef ASSERT
// We expect no reposition failures so kill vm if we get one.
-@@ -67,9 +80,15 @@
+@@ -70,9 +83,15 @@
return false;
}
#endif // ASSERT
@@ -4893,9 +5032,18 @@ $FreeBSD$
pthread_t pthread_id() const {
return _pthread_id;
}
---- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2010-11-13 14:36:41.000000000 -0800
-@@ -46,20 +46,42 @@
+--- ./hotspot/src/os/bsd/vm/os_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.cpp 2011-05-20 20:04:01.000000000 -0700
+@@ -22,8 +22,6 @@
+ *
+ */
+
+-# define __STDC_FORMAT_MACROS
+-
+ // no precompiled headers
+ #include "classfile/classLoader.hpp"
+ #include "classfile/systemDictionary.hpp"
+@@ -110,21 +108,42 @@
# include <sys/utsname.h>
# include <sys/socket.h>
# include <sys/wait.h>
@@ -4915,14 +5063,13 @@ $FreeBSD$
+#endif
# include <sys/ipc.h>
# include <sys/shm.h>
--# include <link.h>
++#ifndef __APPLE__
+ # include <link.h>
++#endif
# include <stdint.h>
# include <inttypes.h>
+ # include <sys/ioctl.h>
-+#ifndef __APPLE__
-+# include <link.h>
-+#endif
-+
+#if defined(__FreeBSD__) || defined(__NetBSD__)
+# include <elf.h>
+#endif
@@ -4939,7 +5086,7 @@ $FreeBSD$
#define MAX_PATH (2 * K)
// for timer info max values which include all bits
-@@ -70,19 +92,25 @@
+@@ -136,19 +155,25 @@
// global variables
julong os::Bsd::_physical_memory = 0;
@@ -4965,7 +5112,7 @@ $FreeBSD$
static jlong initial_time_count=0;
-@@ -100,8 +128,6 @@
+@@ -166,8 +191,6 @@
static int SR_signum = SIGUSR2;
sigset_t SR_sigset;
@@ -4974,7 +5121,7 @@ $FreeBSD$
////////////////////////////////////////////////////////////////////////////////
// utility functions
-@@ -114,11 +140,16 @@
+@@ -180,11 +203,16 @@
}
julong os::Bsd::available_memory() {
@@ -4991,7 +5138,7 @@ $FreeBSD$
}
julong os::physical_memory() {
-@@ -166,6 +197,7 @@
+@@ -232,6 +260,7 @@
}
@@ -4999,7 +5146,7 @@ $FreeBSD$
#ifndef SYS_gettid
// i386: 224, ia64: 1105, amd64: 186, sparc 143
#ifdef __ia64__
-@@ -180,6 +212,7 @@
+@@ -246,6 +275,7 @@
#error define gettid for the arch
#endif
#endif
@@ -5007,7 +5154,7 @@ $FreeBSD$
// Cpu architecture string
#if defined(ZERO)
-@@ -205,6 +238,7 @@
+@@ -271,6 +301,7 @@
#endif
@@ -5015,12 +5162,12 @@ $FreeBSD$
// pid_t gettid()
//
// Returns the kernel thread id of the currently running thread. Kernel
-@@ -231,7 +265,48 @@
+@@ -297,7 +328,48 @@
static const char *unstable_chroot_error = "/proc file system not found.\n"
"Java may be unstable running multithreaded in a chroot "
"environment on Bsd when /proc filesystem is not mounted.";
+#endif
-
++
+#ifdef _ALLBSD_SOURCE
+void os::Bsd::initialize_system_info() {
+ int mib[2];
@@ -5038,7 +5185,7 @@ $FreeBSD$
+ else {
+ set_processor_count(1); // fallback
+ }
-+
+
+ /* get physical memory via hw.usermem sysctl (hw.usermem is used
+ * instead of hw.physmem because we need size of allocatable memory
+ */
@@ -5064,7 +5211,7 @@ $FreeBSD$
void os::Bsd::initialize_system_info() {
set_processor_count(sysconf(_SC_NPROCESSORS_CONF));
if (processor_count() == 1) {
-@@ -248,6 +323,7 @@
+@@ -314,6 +386,7 @@
_physical_memory = (julong)sysconf(_SC_PHYS_PAGES) * (julong)sysconf(_SC_PAGESIZE);
assert(processor_count() > 0, "bsd error");
}
@@ -5072,7 +5219,7 @@ $FreeBSD$
void os::init_system_properties_values() {
// char arch[12];
-@@ -291,9 +367,7 @@
+@@ -357,9 +430,7 @@
* ...
* 7: The default directories, normally /lib and /usr/lib.
*/
@@ -5083,7 +5230,7 @@ $FreeBSD$
#define DEFAULT_LIBPATH "/lib:/usr/lib"
#endif
-@@ -372,7 +446,11 @@
+@@ -438,7 +509,11 @@
* should always exist (until the legacy problem cited above is
* addressed).
*/
@@ -5095,7 +5242,7 @@ $FreeBSD$
if (v != NULL) {
char *t = ld_library_path;
/* That's +1 for the colon and +1 for the trailing '\0' */
-@@ -531,6 +609,7 @@
+@@ -597,6 +672,7 @@
}
}
@@ -5103,7 +5250,7 @@ $FreeBSD$
//////////////////////////////////////////////////////////////////////////////
// detecting pthread library
-@@ -694,6 +773,7 @@
+@@ -760,6 +836,7 @@
}
return false;
}
@@ -5111,7 +5258,7 @@ $FreeBSD$
//////////////////////////////////////////////////////////////////////////////
// create new thread
-@@ -702,6 +782,9 @@
+@@ -768,6 +845,9 @@
// check if it's safe to start a new thread
static bool _thread_safety_check(Thread* thread) {
@@ -5121,7 +5268,7 @@ $FreeBSD$
if (os::Bsd::is_BsdThreads() && !os::Bsd::is_floating_stack()) {
// Fixed stack BsdThreads (SuSE Bsd/x86, and some versions of Redhat)
// Heap is mmap'ed at lower end of memory space. Thread stacks are
-@@ -735,6 +818,7 @@
+@@ -801,6 +881,7 @@
// here, that means enough space has been reserved for stack.
return true;
}
@@ -5129,7 +5276,7 @@ $FreeBSD$
}
// Thread start routine for all newly created threads
-@@ -762,6 +846,10 @@
+@@ -828,6 +909,10 @@
return NULL;
}
@@ -5140,7 +5287,7 @@ $FreeBSD$
// thread_id is kernel thread id (similar to Solaris LWP id)
osthread->set_thread_id(os::Bsd::gettid());
-@@ -771,6 +859,7 @@
+@@ -837,6 +922,7 @@
thread->set_lgrp_id(lgrp_id);
}
}
@@ -5148,7 +5295,7 @@ $FreeBSD$
// initialize signal mask for this thread
os::Bsd::hotspot_sigmask(thread);
-@@ -853,17 +942,22 @@
+@@ -919,17 +1005,22 @@
// let pthread_create() pick the default value.
}
@@ -5171,7 +5318,7 @@ $FreeBSD$
pthread_t tid;
int ret = pthread_create(&tid, &attr, (void* (*)(void*)) java_start, thread);
-@@ -877,7 +971,9 @@
+@@ -943,7 +1034,9 @@
// Need to clean up stuff we've allocated so far
thread->set_osthread(NULL);
delete osthread;
@@ -5181,7 +5328,7 @@ $FreeBSD$
return false;
}
-@@ -893,9 +989,11 @@
+@@ -959,9 +1052,11 @@
}
}
@@ -5193,7 +5340,7 @@ $FreeBSD$
}
// Aborted due to thread limit being reached
-@@ -933,7 +1031,11 @@
+@@ -999,7 +1094,11 @@
}
// Store pthread info into the OSThread
@@ -5205,7 +5352,7 @@ $FreeBSD$
osthread->set_pthread_id(::pthread_self());
// initialize floating point control register
-@@ -944,6 +1046,7 @@
+@@ -1010,6 +1109,7 @@
thread->set_osthread(osthread);
@@ -5213,7 +5360,7 @@ $FreeBSD$
if (UseNUMA) {
int lgrp_id = os::numa_get_group_id();
if (lgrp_id != -1) {
-@@ -970,6 +1073,7 @@
+@@ -1036,6 +1136,7 @@
os::Bsd::manually_expand_stack(jt, addr);
osthread->clear_expanding_stack();
}
@@ -5221,7 +5368,7 @@ $FreeBSD$
// initialize signal mask for this thread
// and save the caller's signal mask
-@@ -1028,6 +1132,7 @@
+@@ -1094,6 +1195,7 @@
//////////////////////////////////////////////////////////////////////////////
// initial thread
@@ -5229,7 +5376,7 @@ $FreeBSD$
// Check if current thread is the initial thread, similar to Solaris thr_main.
bool os::Bsd::is_initial_thread(void) {
char dummy;
-@@ -1264,6 +1369,7 @@
+@@ -1330,6 +1432,7 @@
_initial_thread_stack_size = align_size_down(_initial_thread_stack_size, page_size());
_initial_thread_stack_bottom = (address)stack_top - _initial_thread_stack_size;
}
@@ -5237,7 +5384,7 @@ $FreeBSD$
////////////////////////////////////////////////////////////////////////////////
// time support
-@@ -1285,9 +1391,7 @@
+@@ -1351,9 +1454,7 @@
return (1000 * 1000);
}
@@ -5248,7 +5395,7 @@ $FreeBSD$
bool os::supports_vtime() { return false; }
bool os::enable_vtime() { return false; }
bool os::vtime_enabled() { return false; }
-@@ -1307,6 +1411,21 @@
+@@ -1373,6 +1474,21 @@
#define CLOCK_MONOTONIC (1)
#endif
@@ -5270,7 +5417,7 @@ $FreeBSD$
void os::Bsd::clock_init() {
// we do dlopen's in this particular order due to bug in bsd
// dynamical loader (see 6348968) leading to crash on exit
-@@ -1342,7 +1461,9 @@
+@@ -1408,7 +1524,9 @@
}
}
}
@@ -5280,7 +5427,7 @@ $FreeBSD$
#ifndef SYS_clock_getres
#if defined(IA32) || defined(AMD64)
-@@ -1383,6 +1504,7 @@
+@@ -1449,6 +1567,7 @@
_pthread_getcpuclockid = pthread_getcpuclockid_func;
}
}
@@ -5288,7 +5435,7 @@ $FreeBSD$
jlong os::javaTimeNanos() {
if (Bsd::supports_monotonic_clock()) {
-@@ -1533,7 +1655,14 @@
+@@ -1617,7 +1736,14 @@
// DLL functions
@@ -5302,9 +5449,9 @@ $FreeBSD$
+
+const char* os::dll_file_extension() { return JNI_LIB_SUFFIX; }
- const char* os::get_temp_directory() {
- const char *prop = Arguments::get_property("java.io.tmpdir");
-@@ -1554,13 +1683,13 @@
+ // This must be hard coded because it's the system's temporary
+ // directory not the java application's temp directory, ala java.io.tmpdir.
+@@ -1637,13 +1763,13 @@
const size_t pnamelen = pname ? strlen(pname) : 0;
// Quietly truncate on buffer overflow. Should be an error.
@@ -5320,7 +5467,7 @@ $FreeBSD$
} else if (strchr(pname, *os::path_separator()) != NULL) {
int n;
char** pelements = split_path(pname, &n);
-@@ -1569,7 +1698,8 @@
+@@ -1652,7 +1778,8 @@
if (pelements[i] == NULL || strlen(pelements[i]) == 0) {
continue; // skip the empty path values
}
@@ -5330,7 +5477,7 @@ $FreeBSD$
if (file_exists(buffer)) {
break;
}
-@@ -1584,7 +1714,7 @@
+@@ -1667,7 +1794,7 @@
FREE_C_HEAP_ARRAY(char*, pelements);
}
} else {
@@ -5339,8 +5486,8 @@ $FreeBSD$
}
}
-@@ -1625,6 +1755,23 @@
- }
+@@ -1717,6 +1844,23 @@
+ return false;
}
+#ifdef _ALLBSD_SOURCE
@@ -5363,7 +5510,7 @@ $FreeBSD$
struct _address_to_library_name {
address addr; // input : memory address
size_t buflen; // size of fname
-@@ -1699,11 +1846,27 @@
+@@ -1791,11 +1935,27 @@
return false;
}
}
@@ -5391,7 +5538,7 @@ $FreeBSD$
void * os::dll_load(const char *filename, char *ebuf, int ebuflen)
{
void * result= ::dlopen(filename, RTLD_LAZY);
-@@ -1756,6 +1919,26 @@
+@@ -1848,6 +2008,26 @@
#define EM_486 6 /* Intel 80486 */
#endif
@@ -5418,7 +5565,7 @@ $FreeBSD$
static const arch_t arch_array[]={
{EM_386, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
{EM_486, EM_386, ELFCLASS32, ELFDATA2LSB, (char*)"IA 32"},
-@@ -1859,17 +2042,11 @@
+@@ -1951,17 +2131,11 @@
return NULL;
}
@@ -5439,7 +5586,7 @@ $FreeBSD$
}
-@@ -1892,7 +2069,51 @@
+@@ -1984,7 +2158,51 @@
void os::print_dll_info(outputStream *st) {
st->print_cr("Dynamic libraries:");
@@ -5492,7 +5639,7 @@ $FreeBSD$
char fname[32];
pid_t pid = os::Bsd::gettid();
-@@ -1901,6 +2122,7 @@
+@@ -1993,6 +2211,7 @@
if (!_print_ascii_file(fname, st)) {
st->print("Can not get library information for pid = %d\n", pid);
}
@@ -5500,7 +5647,7 @@ $FreeBSD$
}
-@@ -1935,6 +2157,7 @@
+@@ -2027,6 +2246,7 @@
st->print(name.machine);
st->cr();
@@ -5508,7 +5655,7 @@ $FreeBSD$
// Print warning if unsafe chroot environment detected
if (unsafe_chroot_detected) {
st->print("WARNING!! ");
-@@ -1949,6 +2172,7 @@
+@@ -2041,6 +2261,7 @@
st->print("(%s stack)", os::Bsd::is_floating_stack() ? "floating" : "fixed");
}
st->cr();
@@ -5516,7 +5663,7 @@ $FreeBSD$
// rlimit
st->print("rlimit:");
-@@ -1974,6 +2198,7 @@
+@@ -2066,6 +2287,7 @@
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
else st->print("%d", rlim.rlim_cur);
@@ -5524,7 +5671,7 @@ $FreeBSD$
st->print(", AS ");
getrlimit(RLIMIT_AS, &rlim);
if (rlim.rlim_cur == RLIM_INFINITY) st->print("infinity");
-@@ -1986,11 +2211,7 @@
+@@ -2078,11 +2300,7 @@
os::loadavg(loadavg, 3);
st->print("%0.02f %0.02f %0.02f", loadavg[0], loadavg[1], loadavg[2]);
st->cr();
@@ -5537,7 +5684,7 @@ $FreeBSD$
}
void os::print_memory_info(outputStream* st) {
-@@ -1998,18 +2219,27 @@
+@@ -2090,18 +2308,27 @@
st->print("Memory:");
st->print(" %dk page", os::vm_page_size()>>10);
@@ -5565,7 +5712,7 @@ $FreeBSD$
st->cr();
}
-@@ -2252,19 +2482,29 @@
+@@ -2342,19 +2569,29 @@
static volatile jint pending_signals[NSIG+1] = { 0 };
// Bsd(POSIX) specific hand shaking semaphore.
@@ -5597,7 +5744,7 @@ $FreeBSD$
}
static int check_pending_signals(bool wait) {
-@@ -2286,7 +2526,7 @@
+@@ -2376,7 +2613,7 @@
do {
thread->set_suspend_equivalent();
// cleared by handle_special_suspend_equivalent_condition() or java_suspend_self()
@@ -5606,7 +5753,7 @@ $FreeBSD$
// were we externally suspended while we were waiting?
threadIsSuspended = thread->handle_special_suspend_equivalent_condition();
-@@ -2297,7 +2537,7 @@
+@@ -2387,7 +2624,7 @@
// while suspended because that would surprise the thread that
// suspended us.
//
@@ -5615,7 +5762,7 @@ $FreeBSD$
thread->java_suspend_self();
}
-@@ -2341,10 +2581,10 @@
+@@ -2431,10 +2668,10 @@
return;
}
@@ -5628,7 +5775,7 @@ $FreeBSD$
os::get_temp_directory(), os::current_process_id(), num);
unlink(buf);
-@@ -2370,9 +2610,14 @@
+@@ -2460,11 +2697,17 @@
// problem.
bool os::commit_memory(char* addr, size_t size, bool exec) {
int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
@@ -5642,8 +5789,43 @@ $FreeBSD$
+#endif
}
++#ifndef _ALLBSD_SOURCE
+ // Define MAP_HUGETLB here so we can build HotSpot on old systems.
+ #ifndef MAP_HUGETLB
+ #define MAP_HUGETLB 0x40000
+@@ -2474,9 +2717,11 @@
+ #ifndef MADV_HUGEPAGE
+ #define MADV_HUGEPAGE 14
+ #endif
++#endif
+
bool os::commit_memory(char* addr, size_t size, size_t alignment_hint,
-@@ -2388,36 +2633,27 @@
+ bool exec) {
++#ifndef _ALLBSD_SOURCE
+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
+ int prot = exec ? PROT_READ|PROT_WRITE|PROT_EXEC : PROT_READ|PROT_WRITE;
+ uintptr_t res =
+@@ -2485,16 +2730,19 @@
+ -1, 0);
+ return res != (uintptr_t) MAP_FAILED;
+ }
++#endif
+
+ return commit_memory(addr, size, exec);
+ }
+
+ void os::realign_memory(char *addr, size_t bytes, size_t alignment_hint) {
++#ifndef _ALLBSD_SOURCE
+ if (UseHugeTLBFS && alignment_hint > (size_t)vm_page_size()) {
+ // We don't check the return value: madvise(MADV_HUGEPAGE) may not
+ // be supported or the memory may already be backed by huge pages.
+ ::madvise(addr, bytes, MADV_HUGEPAGE);
+ }
++#endif
+ }
+
+ void os::free_memory(char *addr, size_t bytes) {
+@@ -2502,36 +2750,27 @@
}
void os::numa_make_global(char *addr, size_t bytes) {
@@ -5685,15 +5867,15 @@ $FreeBSD$
}
bool os::get_page_info(char *start, page_info* info) {
-@@ -2428,6 +2664,7 @@
+@@ -2542,6 +2781,7 @@
return end;
}
+#ifndef _ALLBSD_SOURCE
- extern "C" void numa_warn(int number, char *where, ...) { }
- extern "C" void numa_error(char *where) { }
-
-@@ -2529,104 +2766,26 @@
+ // Something to do with the numa-aware allocator needs these symbols
+ extern "C" JNIEXPORT void numa_warn(int number, char *where, ...) { }
+ extern "C" JNIEXPORT void numa_error(char *where) { }
+@@ -2645,98 +2885,26 @@
os::Bsd::numa_tonode_memory_func_t os::Bsd::_numa_tonode_memory;
os::Bsd::numa_interleave_memory_func_t os::Bsd::_numa_interleave_memory;
unsigned long* os::Bsd::_numa_all_nodes;
@@ -5730,45 +5912,39 @@ $FreeBSD$
-// writing thread stacks don't use growable mappings (i.e. those
-// creeated with MAP_GROWSDOWN), and aren't marked "[stack]", so this
-// only applies to the main thread.
--static bool
--get_stack_bounds(uintptr_t *bottom, uintptr_t *top)
--{
-- FILE *f = fopen("/proc/self/maps", "r");
-- if (f == NULL)
-- return false;
-
-- while (!feof(f)) {
-- size_t dummy;
-- char *str = NULL;
-- ssize_t len = getline(&str, &dummy, f);
-- if (len == -1) {
-- fclose(f);
-- return false;
-- }
+-static
+-bool get_stack_bounds(uintptr_t *bottom, uintptr_t *top) {
-
-- if (len > 0 && str[len-1] == '\n') {
-- str[len-1] = 0;
-- len--;
-- }
+- char buf[128];
+- int fd, sz;
-
-- static const char *stack_str = "[stack]";
-- if (len > (ssize_t)strlen(stack_str)
-- && (strcmp(str + len - strlen(stack_str), stack_str) == 0)) {
-- if (sscanf(str, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
-- uintptr_t sp = (uintptr_t)__builtin_frame_address(0);
-- if (sp >= *bottom && sp <= *top) {
-- free(str);
-- fclose(f);
-- return true;
+- if ((fd = ::open("/proc/self/maps", O_RDONLY)) < 0) {
+- return false;
+- }
+-
+- const char kw[] = "[stack]";
+- const int kwlen = sizeof(kw)-1;
+-
+- // Address part of /proc/self/maps couldn't be more than 128 bytes
+- while ((sz = os::get_line_chars(fd, buf, sizeof(buf))) > 0) {
+- if (sz > kwlen && ::memcmp(buf+sz-kwlen, kw, kwlen) == 0) {
+- // Extract addresses
+- if (sscanf(buf, "%" SCNxPTR "-%" SCNxPTR, bottom, top) == 2) {
+- uintptr_t sp = (uintptr_t) __builtin_frame_address(0);
+- if (sp >= *bottom && sp <= *top) {
+- ::close(fd);
+- return true;
+- }
- }
-- }
-- }
-- free(str);
+- }
- }
-- fclose(f);
+-
+- ::close(fd);
- return false;
-}
-
+-
-// If the (growable) stack mapping already extends beyond the point
-// where we're going to put our guard pages, truncate the mapping at
-// that point by munmap()ping it. This ensures that when we later
@@ -5805,25 +5981,58 @@ $FreeBSD$
return os::uncommit_memory(addr, size);
}
-@@ -2731,6 +2890,9 @@
+@@ -2838,6 +3006,7 @@
+
+ bool os::Bsd::hugetlbfs_sanity_check(bool warn, size_t page_size) {
+ bool result = false;
++#ifndef _ALLBSD_SOURCE
+ void *p = mmap (NULL, page_size, PROT_READ|PROT_WRITE,
+ MAP_ANONYMOUS|MAP_PRIVATE|MAP_HUGETLB,
+ -1, 0);
+@@ -2869,6 +3038,7 @@
+ if (warn) {
+ warning("HugeTLBFS is not supported by the operating system.");
+ }
++#endif
+
+ return result;
+ }
+@@ -2915,6 +3085,7 @@
static size_t _large_page_size = 0;
- bool os::large_page_init() {
-+#ifdef _ALLBSD_SOURCE
-+ return false;
-+#else
- if (!UseLargePages) return false;
+ void os::large_page_init() {
++#ifndef _ALLBSD_SOURCE
+ if (!UseLargePages) {
+ UseHugeTLBFS = false;
+ UseSHM = false;
+@@ -2992,11 +3163,14 @@
+ UseLargePages = UseHugeTLBFS || UseSHM;
- if (LargePageSizeInBytes) {
-@@ -2788,6 +2950,7 @@
- // We optimistically assume the support is available. If later it turns out
- // not true, VM will automatically switch to use regular page size.
- return true;
+ set_coredump_filter();
+#endif
}
++#ifndef _ALLBSD_SOURCE
#ifndef SHM_HUGETLB
-@@ -2964,7 +3127,7 @@
+ #define SHM_HUGETLB 04000
+ #endif
++#endif
+
+ char* os::reserve_memory_special(size_t bytes, char* req_addr, bool exec) {
+ // "exec" is passed in but not used. Creating the shared image for
+@@ -3014,7 +3188,11 @@
+
+ // Create a large shared memory region to attach to based on size.
+ // Currently, size is the total size of the heap
++#ifndef _ALLBSD_SOURCE
+ int shmid = shmget(key, bytes, SHM_HUGETLB|IPC_CREAT|SHM_R|SHM_W);
++#else
++ int shmid = shmget(key, bytes, IPC_CREAT|SHM_R|SHM_W);
++#endif
+ if (shmid == -1) {
+ // Possible reasons for shmget failure:
+ // 1. shmmax is too small for Java heap.
+@@ -3167,7 +3345,7 @@
}
size_t os::read(int fd, void *buf, unsigned int nBytes) {
@@ -5832,7 +6041,7 @@ $FreeBSD$
}
// TODO-FIXME: reconcile Solaris' os::sleep with the bsd variation.
-@@ -3100,6 +3263,44 @@
+@@ -3303,6 +3481,44 @@
// this reason, the code should not be used as default (ThreadPriorityPolicy=0).
// It is only used when ThreadPriorityPolicy=1 and requires root privilege.
@@ -5877,7 +6086,7 @@ $FreeBSD$
int os::java_to_os_priority[MaxPriority + 1] = {
19, // 0 Entry should never be used
-@@ -3117,6 +3318,7 @@
+@@ -3320,6 +3536,7 @@
-5 // 10 MaxPriority
};
@@ -5885,7 +6094,7 @@ $FreeBSD$
static int prio_init() {
if (ThreadPriorityPolicy == 1) {
-@@ -3136,8 +3338,28 @@
+@@ -3339,8 +3556,28 @@
OSReturn os::set_native_priority(Thread* thread, int newpri) {
if ( !UseThreadPriorities || ThreadPriorityPolicy == 0 ) return OS_OK;
@@ -5914,7 +6123,7 @@ $FreeBSD$
}
OSReturn os::get_native_priority(const Thread* const thread, int *priority_ptr) {
-@@ -3147,7 +3369,17 @@
+@@ -3350,7 +3587,17 @@
}
errno = 0;
@@ -5932,7 +6141,7 @@ $FreeBSD$
return (*priority_ptr != -1 || errno == 0 ? OS_OK : OS_ERR);
}
-@@ -3257,7 +3489,7 @@
+@@ -3460,7 +3707,7 @@
/* Get signal number to use for suspend/resume */
if ((s = ::getenv("_JAVA_SR_SIGNUM")) != 0) {
int sig = ::strtol(s, 0, 10);
@@ -5941,7 +6150,7 @@ $FreeBSD$
SR_signum = sig;
}
}
-@@ -3601,6 +3833,28 @@
+@@ -3804,6 +4051,28 @@
set_signal_handler(SIGFPE, true);
set_signal_handler(SIGXFSZ, true);
@@ -5970,7 +6179,7 @@ $FreeBSD$
if (libjsig_is_loaded) {
// Tell libjsig jvm finishes setting signal handlers
(*end_signal_setting)();
-@@ -3621,6 +3875,7 @@
+@@ -3824,6 +4093,7 @@
}
}
@@ -5978,7 +6187,7 @@ $FreeBSD$
// This is the fastest way to get thread cpu time on Bsd.
// Returns cpu time (user+sys) for any thread, not only for current.
// POSIX compliant clocks are implemented in the kernels 2.6.16+.
-@@ -3635,6 +3890,7 @@
+@@ -3838,6 +4108,7 @@
return (tp.tv_sec * SEC_IN_NANOSECS) + tp.tv_nsec;
}
@@ -5986,7 +6195,7 @@ $FreeBSD$
/////
// glibc on Bsd platform uses non-documented flag
-@@ -3856,13 +4112,13 @@
+@@ -4059,13 +4330,13 @@
_initial_pid = (java_launcher_pid > 0) ? java_launcher_pid : getpid();
@@ -6002,7 +6211,7 @@ $FreeBSD$
if (Bsd::page_size() == -1) {
fatal(err_msg("os_bsd.cpp: os::init: sysconf failed (%s)",
strerror(errno)));
-@@ -3876,7 +4132,16 @@
+@@ -4079,7 +4350,16 @@
Bsd::clock_init();
initial_time_count = os::elapsed_counter();
@@ -6020,7 +6229,7 @@ $FreeBSD$
}
// To install functions for atexit system call
-@@ -3889,7 +4154,9 @@
+@@ -4092,7 +4372,9 @@
// this is called _after_ the global arguments have been parsed
jint os::init_2(void)
{
@@ -6030,7 +6239,7 @@ $FreeBSD$
// Allocate a single page and mark it as readable for safepoint polling
address polling_page = (address) ::mmap(NULL, Bsd::page_size(), PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
-@@ -3947,6 +4214,7 @@
+@@ -4150,6 +4432,7 @@
JavaThread::set_stack_size_at_create(round_to(threadStackSizeInBytes,
vm_page_size()));
@@ -6038,7 +6247,7 @@ $FreeBSD$
Bsd::capture_initial_stack(JavaThread::stack_size_at_create());
Bsd::libpthread_init();
-@@ -3969,6 +4237,7 @@
+@@ -4189,6 +4472,7 @@
UseNUMA = true;
}
}
@@ -6046,7 +6255,7 @@ $FreeBSD$
if (MaxFDLimit) {
// set the number of file descriptors to max. print out error
-@@ -3980,6 +4249,14 @@
+@@ -4200,6 +4484,14 @@
perror("os::init_2 getrlimit failed");
} else {
nbr_files.rlim_cur = nbr_files.rlim_max;
@@ -6061,7 +6270,7 @@ $FreeBSD$
status = setrlimit(RLIMIT_NOFILE, &nbr_files);
if (status != 0) {
if (PrintMiscellaneous && (Verbose || WizardMode))
-@@ -3988,8 +4265,10 @@
+@@ -4208,8 +4500,10 @@
}
}
@@ -6070,9 +6279,9 @@ $FreeBSD$
Bsd::set_createThread_lock(new Mutex(Mutex::leaf, "createThread_lock", false));
+#endif
- // Initialize HPI.
- jint hpi_result = hpi::initialize();
-@@ -4040,11 +4319,15 @@
+ // at-exit methods are called in the reverse order of their registration.
+ // atexit functions are called on return from main or as a result of a
+@@ -4253,11 +4547,15 @@
};
int os::active_processor_count() {
@@ -6088,7 +6297,7 @@ $FreeBSD$
}
bool os::distribute_processes(uint length, uint* distribution) {
-@@ -4086,6 +4369,9 @@
+@@ -4299,6 +4597,9 @@
int os::Bsd::safe_cond_timedwait(pthread_cond_t *_cond, pthread_mutex_t *_mutex, const struct timespec *_abstime)
{
@@ -6098,7 +6307,7 @@ $FreeBSD$
if (is_NPTL()) {
return pthread_cond_timedwait(_cond, _mutex, _abstime);
} else {
-@@ -4101,6 +4387,7 @@
+@@ -4314,6 +4615,7 @@
#endif // IA64
return status;
}
@@ -6106,7 +6315,26 @@ $FreeBSD$
}
////////////////////////////////////////////////////////////////////////////////
-@@ -4233,17 +4520,17 @@
+@@ -4461,14 +4763,14 @@
+ int o_delete = (oflag & O_DELETE);
+ oflag = oflag & ~O_DELETE;
+
+- fd = ::open64(path, oflag, mode);
++ fd = ::open(path, oflag, mode);
+ if (fd == -1) return -1;
+
+ //If the open succeeded, the file might still be a directory
+ {
+- struct stat64 buf64;
+- int ret = ::fstat64(fd, &buf64);
+- int st_mode = buf64.st_mode;
++ struct stat buf;
++ int ret = ::fstat(fd, &buf);
++ int st_mode = buf.st_mode;
+
+ if (ret != -1) {
+ if ((st_mode & S_IFMT) == S_IFDIR) {
+@@ -4525,17 +4827,17 @@
if (!rewrite_existing) {
oflags |= O_EXCL;
}
@@ -6126,8 +6354,60 @@ $FreeBSD$
+ return (jlong)::lseek(fd, (off_t)offset, SEEK_SET);
}
+ // This code originates from JDK's sysAvailable
+@@ -4544,10 +4846,10 @@
+ int os::available(int fd, jlong *bytes) {
+ jlong cur, end;
+ int mode;
+- struct stat64 buf64;
++ struct stat buf;
+
+- if (::fstat64(fd, &buf64) >= 0) {
+- mode = buf64.st_mode;
++ if (::fstat(fd, &buf) >= 0) {
++ mode = buf.st_mode;
+ if (S_ISCHR(mode) || S_ISFIFO(mode) || S_ISSOCK(mode)) {
+ /*
+ * XXX: is the following call interruptible? If so, this might
+@@ -4561,11 +4863,11 @@
+ }
+ }
+ }
+- if ((cur = ::lseek64(fd, 0L, SEEK_CUR)) == -1) {
++ if ((cur = ::lseek(fd, 0L, SEEK_CUR)) == -1) {
+ return 0;
+- } else if ((end = ::lseek64(fd, 0L, SEEK_END)) == -1) {
++ } else if ((end = ::lseek(fd, 0L, SEEK_END)) == -1) {
+ return 0;
+- } else if (::lseek64(fd, cur, SEEK_SET) == -1) {
++ } else if (::lseek(fd, cur, SEEK_SET) == -1) {
+ return 0;
+ }
+ *bytes = end - cur;
+@@ -4573,12 +4875,17 @@
+ }
+
+ int os::socket_available(int fd, jint *pbytes) {
+- // Bsd doc says EINTR not returned, unlike Solaris
+- int ret = ::ioctl(fd, FIONREAD, pbytes);
++ if (fd < 0)
++ return OS_OK;
++
++ int ret;
+
+- //%% note ioctl can return 0 when successful, JVM_SocketAvailable
+- // is expected to return 0 on failure and 1 on success to the jdk.
+- return (ret < 0) ? 0 : 1;
++ RESTARTABLE(::ioctl(fd, FIONREAD, pbytes), ret);
++
++ //%% note ioctl can return 0 when successful, JVM_SocketAvailable
++ // is expected to return 0 on failure and 1 on success to the jdk.
++
++ return (ret == OS_ERR) ? 0 : 1;
+ }
+
// Map a block of memory.
-@@ -4293,6 +4580,7 @@
+@@ -4628,6 +4935,7 @@
return munmap(addr, bytes) == 0;
}
@@ -6135,7 +6415,7 @@ $FreeBSD$
static jlong slow_thread_cpu_time(Thread *thread, bool user_sys_cpu_time);
static clockid_t thread_cpu_clockid(Thread* thread) {
-@@ -4304,6 +4592,7 @@
+@@ -4639,6 +4947,7 @@
assert(rc == 0, "pthread_getcpuclockid is expected to return 0 code");
return clockid;
}
@@ -6143,7 +6423,7 @@ $FreeBSD$
// current_thread_cpu_time(bool) and thread_cpu_time(Thread*, bool)
// are used by JVM M&M and JVMTI to get user+sys or user CPU time
-@@ -4313,39 +4602,71 @@
+@@ -4648,39 +4957,71 @@
// the fast estimate available on the platform.
jlong os::current_thread_cpu_time() {
@@ -6215,7 +6495,7 @@ $FreeBSD$
//
// -1 on error.
//
-@@ -4435,6 +4756,7 @@
+@@ -4770,6 +5111,7 @@
return (jlong)user_time * (1000000000 / clock_tics_per_sec);
}
}
@@ -6223,21 +6503,21 @@ $FreeBSD$
void os::current_thread_cpu_time_info(jvmtiTimerInfo *info_ptr) {
info_ptr->max_value = ALL_64_BITS; // will not wrap in less than 64 bits
-@@ -4451,7 +4773,13 @@
+@@ -4786,7 +5128,13 @@
}
bool os::is_thread_cpu_time_supported() {
+#ifdef __APPLE__
- return true;
++ return true;
+#elif defined(_ALLBSD_SOURCE)
+ return false;
+#else
-+ return true;
+ return true;
+#endif
}
// System loadavg support. Returns -1 if load average cannot be obtained.
-@@ -4584,7 +4912,7 @@
+@@ -4881,7 +5229,7 @@
// abstime will be the absolute timeout time
// TODO: replace compute_abstime() with unpackTime()
@@ -6246,7 +6526,7 @@ $FreeBSD$
if (millis < 0) millis = 0;
struct timeval now;
int status = gettimeofday(&now, NULL);
-@@ -4636,7 +4964,7 @@
+@@ -4933,7 +5281,7 @@
status = pthread_cond_wait(_cond, _mutex);
// for some reason, under 2.7 lwp_cond_wait() may return ETIME ...
// Treat this the same as if the wait was interrupted
@@ -6255,7 +6535,7 @@ $FreeBSD$
assert_status(status == 0 || status == EINTR, status, "cond_wait");
}
-- _nParked ;
-@@ -4694,10 +5022,10 @@
+@@ -4991,10 +5339,10 @@
pthread_cond_init (_cond, NULL) ;
}
assert_status(status == 0 || status == EINTR ||
@@ -6268,7 +6548,7 @@ $FreeBSD$
// We consume and ignore EINTR and spurious wakeups.
}
--_nParked ;
-@@ -4789,7 +5117,7 @@
+@@ -5086,7 +5434,7 @@
* years from "now".
*/
@@ -6277,7 +6557,7 @@ $FreeBSD$
assert (time > 0, "convertTime");
struct timeval now;
-@@ -4849,7 +5177,7 @@
+@@ -5146,7 +5494,7 @@
}
// Next, demultiplex/decode time arguments
@@ -6286,7 +6566,7 @@ $FreeBSD$
if (time < 0 || (isAbsolute && time == 0) ) { // don't wait at all
return;
}
-@@ -4903,7 +5231,7 @@
+@@ -5200,7 +5548,7 @@
}
}
assert_status(status == 0 || status == EINTR ||
@@ -6295,7 +6575,7 @@ $FreeBSD$
status, "cond_timedwait");
#ifdef ASSERT
-@@ -4946,14 +5274,12 @@
+@@ -5243,14 +5591,12 @@
}
@@ -6315,7 +6595,7 @@ $FreeBSD$
#endif
// Run the specified command in a separate process. Return its exit value,
-@@ -4968,8 +5294,7 @@
+@@ -5265,8 +5611,7 @@
// separate process to execve. Make a direct syscall to fork process.
// On IA64 there's no fork syscall, we have to use fork() and hope for
// the best...
@@ -6325,7 +6605,7 @@ $FreeBSD$
if (pid < 0) {
// fork failed
-@@ -4985,8 +5310,7 @@
+@@ -5282,8 +5627,7 @@
// in the new process, so make a system call directly.
// IA64 should use normal execve() from glibc to match the glibc fork()
// above.
@@ -6335,9 +6615,9 @@ $FreeBSD$
// execve failed
_exit(-1);
---- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2010-07-04 09:31:26.000000000 -0700
-@@ -27,6 +27,12 @@
+--- ./hotspot/src/os/bsd/vm/os_bsd.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.hpp 2011-05-07 21:53:43.000000000 -0700
+@@ -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 *);
@@ -6350,7 +6630,7 @@ $FreeBSD$
class Bsd {
friend class os;
-@@ -47,6 +53,7 @@
+@@ -50,6 +56,7 @@
static int sigflags[MAXSIGNUM];
static int (*_clock_gettime)(clockid_t, struct timespec *);
@@ -6358,7 +6638,7 @@ $FreeBSD$
static int (*_pthread_getcpuclockid)(pthread_t, clockid_t *);
static address _initial_thread_stack_bottom;
-@@ -58,6 +65,7 @@
+@@ -61,6 +68,7 @@
static bool _is_floating_stack;
static bool _is_NPTL;
static bool _supports_fast_thread_cpu_time;
@@ -6366,7 +6646,7 @@ $FreeBSD$
static GrowableArray<int>* _cpu_to_node;
-@@ -65,38 +73,52 @@
+@@ -68,21 +76,27 @@
static julong _physical_memory;
static pthread_t _main_thread;
@@ -6394,6 +6674,9 @@ $FreeBSD$
static void rebuild_cpu_to_node_map();
static GrowableArray<int>* cpu_to_node() { return _cpu_to_node; }
+@@ -90,19 +104,27 @@
+ static bool hugetlbfs_sanity_check(bool warn, size_t page_size);
+
public:
+
static void init_thread_fpu_state();
@@ -6419,7 +6702,7 @@ $FreeBSD$
static bool is_initial_thread(void);
static int page_size(void) { return _page_size; }
-@@ -133,6 +155,7 @@
+@@ -139,6 +161,7 @@
static struct sigaction *get_chained_signal_action(int sig);
static bool chained_handler(int sig, siginfo_t* siginfo, void* context);
@@ -6427,7 +6710,7 @@ $FreeBSD$
// GNU libc and libpthread version strings
static const char *glibc_version() { return _glibc_version; }
static const char *libpthread_version() { return _libpthread_version; }
-@@ -148,6 +171,7 @@
+@@ -154,6 +177,7 @@
static void libpthread_init();
static bool libnuma_init();
static void* libnuma_dlsym(void* handle, const char* name);
@@ -6435,7 +6718,7 @@ $FreeBSD$
// Minimum stack size a thread can be created with (allowing
// the VM to completely create the thread and enter user code)
static size_t min_stack_allowed;
-@@ -156,17 +180,21 @@
+@@ -162,17 +186,21 @@
static size_t default_stack_size(os::ThreadType thr_type);
static size_t default_guard_size(os::ThreadType thr_type);
@@ -6457,7 +6740,7 @@ $FreeBSD$
static bool supports_monotonic_clock() {
return _clock_gettime != NULL;
-@@ -176,6 +204,7 @@
+@@ -182,6 +210,7 @@
return _clock_gettime ? _clock_gettime(clock_id, tp) : -1;
}
@@ -6465,7 +6748,7 @@ $FreeBSD$
static int pthread_getcpuclockid(pthread_t tid, clockid_t *clock_id) {
return _pthread_getcpuclockid ? _pthread_getcpuclockid(tid, clock_id) : -1;
}
-@@ -185,6 +214,7 @@
+@@ -191,6 +220,7 @@
}
static jlong fast_thread_cpu_time(clockid_t clockid);
@@ -6473,9 +6756,9 @@ $FreeBSD$
// Stack repair handling
---- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2010-07-04 09:31:26.000000000 -0700
-@@ -61,7 +61,15 @@
+--- ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/os_bsd.inline.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -94,7 +94,15 @@
inline bool os::allocate_stack_guard_pages() {
assert(uses_stack_guard_pages(), "sanity check");
@@ -6491,9 +6774,53 @@ $FreeBSD$
}
---- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
-@@ -241,7 +241,7 @@
+@@ -126,7 +134,7 @@
+ }
+
+ inline jlong os::lseek(int fd, jlong offset, int whence) {
+- return (jlong) ::lseek64(fd, offset, whence);
++ return (jlong) ::lseek(fd, offset, whence);
+ }
+
+ inline int os::fsync(int fd) {
+@@ -138,7 +146,7 @@
+ }
+
+ inline int os::ftruncate(int fd, jlong length) {
+- return ::ftruncate64(fd, length);
++ return ::ftruncate(fd, length);
+ }
+
+ inline struct dirent* os::readdir(DIR* dirp, dirent *dbuf)
+@@ -191,11 +199,11 @@
+ }
+
+ inline int os::close(int fd) {
+- return ::close(fd);
++ RESTARTABLE_RETURN_INT(::close(fd));
+ }
+
+ inline int os::socket_close(int fd) {
+- return ::close(fd);
++ RESTARTABLE_RETURN_INT(::close(fd));
+ }
+
+ inline int os::socket(int domain, int type, int protocol) {
+@@ -260,9 +268,9 @@
+ // fetch it's value, this cast is safe for now. The java.net group
+ // may need and want to change this interface someday if socklen_t goes
+ // to 64 bits on some platform that we support.
+- // Bsd doc says this can't return EINTR, unlike accept() on Solaris
+
+- return ::accept(fd, him, (socklen_t *)len);
++ // At least OpenBSD and FreeBSD can return EINTR from accept.
++ RESTARTABLE_RETURN_INT(::accept(fd, him, (socklen_t *)len));
+ }
+
+ inline int os::recvfrom(int fd, char *buf, int nBytes, int flags,
+--- ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os/bsd/vm/perfMemory_bsd.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -248,7 +248,7 @@
char* pwbuf = NEW_C_HEAP_ARRAY(char, bufsize);
@@ -6502,59 +6829,185 @@ $FreeBSD$
struct passwd* p;
int result = getpwuid_r(uid, &pwent, pwbuf, (size_t)bufsize, &p);
---- ./hotspot/src/os/bsd/vm/vtune_bsd.cpp 1969-12-31 16:00:00.000000000 -0800
-+++ ./hotspot/src/os/bsd/vm/vtune_bsd.cpp 2010-07-04 09:31:26.000000000 -0700
-@@ -0,0 +1,45 @@
-+/*
-+ * Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-+ * or visit www.oracle.com if you need additional information or have any
-+ * questions.
-+ *
-+ */
-+
-+#include "incls/_precompiled.incl"
-+#include "incls/_vtune_bsd.cpp.incl"
-+
-+// empty implementation
-+
-+void VTune::start_GC() {}
-+void VTune::end_GC() {}
-+void VTune::start_class_load() {}
-+void VTune::end_class_load() {}
-+void VTune::exit() {}
-+void VTune::register_stub(const char* name, address start, address end) {}
+--- ./hotspot/src/os/linux/vm/os_linux.cpp 2011-05-26 17:28:57.000000000 -0700
++++ ./hotspot/src/os/linux/vm/os_linux.cpp 2011-05-20 20:03:59.000000000 -0700
+@@ -22,8 +22,6 @@
+ *
+ */
+
+-# define __STDC_FORMAT_MACROS
+-
+ // no precompiled headers
+ #include "classfile/classLoader.hpp"
+ #include "classfile/systemDictionary.hpp"
+--- ./hotspot/src/os/posix/launcher/java_md.c 2011-05-26 17:28:59.000000000 -0700
++++ ./hotspot/src/os/posix/launcher/java_md.c 2011-04-22 22:28:34.000000000 -0700
+@@ -41,14 +41,21 @@
+ #include "version_comp.h"
+ #endif
+
+-#ifdef __linux__
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ #include <pthread.h>
+ #else
+ #include <thread.h>
+ #endif
+
++#ifdef __APPLE__
++#define JVM_DLL "libjvm.dylib"
++#define JAVA_DLL "libjava.dylib"
++#define LD_LIBRARY_PATH "DYLD_LIBRARY_PATH"
++#else
+ #define JVM_DLL "libjvm.so"
+ #define JAVA_DLL "libjava.so"
++#define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
++#endif
+
+ #ifndef GAMMA /* launcher.make defines ARCH */
+ /*
+@@ -423,10 +430,10 @@
+ * If not on Solaris, assume only a single LD_LIBRARY_PATH
+ * variable.
+ */
+- runpath = getenv("LD_LIBRARY_PATH");
++ runpath = getenv(LD_LIBRARY_PATH);
+ #endif /* __sun */
+
+-#ifdef __linux
++#if defined(__linux)
+ /*
+ * On linux, if a binary is running as sgid or suid, glibc sets
+ * LD_LIBRARY_PATH to the empty string for security purposes. (In
+@@ -442,6 +449,22 @@
+ if((getgid() != getegid()) || (getuid() != geteuid()) ) {
+ return;
+ }
++#elif _ALLBSD_SOURCE
++ /*
++ * On BSD, if a binary is running as sgid or suid, libc sets
++ * LD_LIBRARY_PATH to the empty string for security purposes. (In
++ * contrast, on Solaris the LD_LIBRARY_PATH variable for a
++ * privileged binary does not lose its settings; but the dynamic
++ * linker does apply more scrutiny to the path.) The launcher uses
++ * the value of LD_LIBRARY_PATH to prevent an exec loop.
++ * Therefore, if we are running sgid or suid, this function's
++ * setting of LD_LIBRARY_PATH will be ineffective and we should
++ * return from the function now. Getting the right libraries to
++ * be found must be handled through other mechanisms.
++ */
++ if(issetugid()) {
++ return;
++ }
+ #endif
+
+ /* runpath contains current effective LD_LIBRARY_PATH setting */
+@@ -450,7 +473,7 @@
+ new_runpath = JLI_MemAlloc( ((runpath!=NULL)?strlen(runpath):0) +
+ 2*strlen(jrepath) + 2*strlen(arch) +
+ strlen(jvmpath) + 52);
+- newpath = new_runpath + strlen("LD_LIBRARY_PATH=");
++ newpath = new_runpath + strlen(LD_LIBRARY_PATH "=");
+
+
+ /*
+@@ -465,7 +488,7 @@
+
+ /* jvmpath, ((running != wanted)?((wanted==64)?"/"LIBARCH64NAME:"/.."):""), */
+
+- sprintf(new_runpath, "LD_LIBRARY_PATH="
++ sprintf(new_runpath, LD_LIBRARY_PATH "="
+ "%s:"
+ "%s/lib/%s:"
+ "%s/../lib/%s",
+@@ -792,7 +815,7 @@
+ jboolean
+ GetApplicationHome(char *buf, jint bufsize)
+ {
+-#ifdef __linux__
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ char *execname = GetExecname();
+ if (execname) {
+ strncpy(buf, execname, bufsize-1);
+@@ -1175,7 +1198,7 @@
+
+ #endif /* __sun && i586 */
+
+-#if defined(__linux__) && defined(i586)
++#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(i586)
+
+ /*
+ * A utility method for asking the CPU about itself.
+@@ -1452,6 +1475,39 @@
+
+ #endif /* __linux__ && i586 */
+
++#if defined(_ALLBSD_SOURCE) && defined(i586)
+
-+void VTune::create_nmethod(nmethod* nm) {}
-+void VTune::delete_nmethod(nmethod* nm) {}
++/* The definition of a server-class machine for bsd-i586 */
++jboolean
++bsd_i586_ServerClassMachine(void) {
++ jboolean result = JNI_FALSE;
++ /* How big is a server class machine? */
++ const unsigned long server_processors = 2UL;
++ const uint64_t server_memory = 2UL * GB;
++ /*
++ * We seem not to get our full complement of memory.
++ * We allow some part (1/8?) of the memory to be "missing",
++ * based on the sizes of DIMMs, and maybe graphics cards.
++ */
++ const uint64_t missing_memory = 256UL * MB;
++ const uint64_t actual_memory = physical_memory();
+
-+void vtune_init() {}
++ /* Is this a server class machine? */
++ if (actual_memory >= (server_memory - missing_memory)) {
++ const unsigned long actual_processors = physical_processors();
++ if (actual_processors >= server_processors) {
++ result = JNI_TRUE;
++ }
++ }
++ if (_launcher_debug) {
++ printf("linux_" LIBARCHNAME "_ServerClassMachine: %s\n",
++ (result == JNI_TRUE ? "true" : "false"));
++ }
++ return result;
++}
+
++#endif /* _ALLBSD_SOURCE && i586 */
+
-+// Reconciliation History
-+// vtune_solaris.cpp 1.8 99/07/12 23:54:21
-+// End
---- ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 2010-12-18 00:00:03.000000000 -0800
+ /* Dispatch to the platform-specific definition of "server-class" */
+ jboolean
+ ServerClassMachine(void) {
+@@ -1466,6 +1522,8 @@
+ result = solaris_i586_ServerClassMachine();
+ #elif defined(__linux__) && defined(i586)
+ result = linux_i586_ServerClassMachine();
++#elif defined(_ALLBSD_SOURCE) && defined(i586)
++ result = bsd_i586_ServerClassMachine();
+ #else
+ if (_launcher_debug) {
+ printf("ServerClassMachine: returns default value of %s\n",
+@@ -1821,7 +1879,7 @@
+ int
+ ContinueInNewThread(int (JNICALL *continuation)(void *), jlong stack_size, void * args) {
+ int rslt;
+-#ifdef __linux__
++#if defined(__linux__) || defined(_ALLBSD_SOURCE)
+ pthread_t tid;
+ pthread_attr_t attr;
+ pthread_attr_init(&attr);
+--- ./hotspot/src/os/posix/launcher/launcher.script 2011-05-26 17:28:59.000000000 -0700
++++ ./hotspot/src/os/posix/launcher/launcher.script 2011-04-22 22:28:34.000000000 -0700
+@@ -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_sparc/vm/assembler_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/assembler_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,45 +0,0 @@
+@@ -1,48 +0,0 @@
-/*
-- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1999, 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
@@ -6577,8 +7030,11 @@ $FreeBSD$
- *
- */
-
--#include "incls/_precompiled.incl"
--#include "incls/_assembler_bsd_sparc.cpp.incl"
+-#include "precompiled.hpp"
+-#include "asm/assembler.hpp"
+-#include "assembler_sparc.inline.hpp"
+-#include "runtime/os.hpp"
+-#include "runtime/threadLocalStorage.hpp"
-
-#include <asm-sparc/traps.h>
-
@@ -6598,11 +7054,11 @@ $FreeBSD$
-// Use software breakpoint trap until we figure out how to do this on Bsd
-void MacroAssembler::get_psr_trap() { trap(SP_TRAP_SBPT); }
-void MacroAssembler::set_psr_trap() { trap(SP_TRAP_SBPT); }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/atomic_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,206 +0,0 @@
+@@ -1,218 +0,0 @@
-/*
-- * Copyright (c) 1999, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1999, 2011, 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
@@ -6625,6 +7081,14 @@ $FreeBSD$
- *
- */
-
+-#ifndef OS_CPU_BSD_SPARC_VM_ATOMIC_BSD_SPARC_INLINE_HPP
+-#define OS_CPU_BSD_SPARC_VM_ATOMIC_BSD_SPARC_INLINE_HPP
+-
+-#include "orderAccess_bsd_sparc.inline.hpp"
+-#include "runtime/atomic.hpp"
+-#include "runtime/os.hpp"
+-#include "vm_version_sparc.hpp"
+-
-// Implementation of class atomic
-
-inline void Atomic::store (jbyte store_value, jbyte* dest) { *dest = store_value; }
@@ -6649,6 +7113,8 @@ $FreeBSD$
-inline void Atomic::dec_ptr(volatile intptr_t* dest) { (void)add_ptr(-1, dest); }
-inline void Atomic::dec_ptr(volatile void* dest) { (void)add_ptr(-1, dest); }
-
+-inline jlong Atomic::load(volatile jlong* src) { return *src; }
+-
-inline jint Atomic::add (jint add_value, volatile jint* dest) {
- intptr_t rv;
- __asm__ volatile(
@@ -6807,7 +7273,9 @@ $FreeBSD$
-inline void* Atomic::cmpxchg_ptr(void* exchange_value, volatile void* dest, void* compare_value) {
- return (void*)cmpxchg_ptr((intptr_t)exchange_value, (volatile intptr_t*)dest, (intptr_t)compare_value);
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2010-12-18 00:00:03.000000000 -0800
+-
+-#endif // OS_CPU_BSD_SPARC_VM_ATOMIC_BSD_SPARC_INLINE_HPP
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.ad 1969-12-31 16:00:00.000000000 -0800
@@ -1,27 +0,0 @@
-//
@@ -6837,7 +7305,7 @@ $FreeBSD$
-//
-
-// SPARC Bsd Architecture Description File
---- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/bsd_sparc.s 1969-12-31 16:00:00.000000000 -0800
@@ -1,105 +0,0 @@
-#
@@ -6945,11 +7413,11 @@ $FreeBSD$
- ta 0x03
- retl
- mov %fp, %o0
---- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/globals_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,36 +0,0 @@
+@@ -1,41 +0,0 @@
-/*
-- * Copyright (c) 2000, 2009, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2000, 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
@@ -6972,6 +7440,9 @@ $FreeBSD$
- *
- */
-
+-#ifndef OS_CPU_BSD_SPARC_VM_GLOBALS_BSD_SPARC_HPP
+-#define OS_CPU_BSD_SPARC_VM_GLOBALS_BSD_SPARC_HPP
+-
-//
-// Sets the default values for platform dependent flags used by the
-// runtime system. (see globals.hpp)
@@ -6984,9 +7455,11 @@ $FreeBSD$
-define_pd_global(uintx, HeapBaseMinAddress, 4*G);
-// Only used on 64 bit Windows platforms
-define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2010-12-18 00:00:03.000000000 -0800
+-
+-#endif // OS_CPU_BSD_SPARC_VM_GLOBALS_BSD_SPARC_HPP
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/orderAccess_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,102 +0,0 @@
+@@ -1,110 +0,0 @@
-/*
- * Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -7011,6 +7484,12 @@ $FreeBSD$
- *
- */
-
+-#ifndef OS_CPU_BSD_SPARC_VM_ORDERACCESS_BSD_SPARC_INLINE_HPP
+-#define OS_CPU_BSD_SPARC_VM_ORDERACCESS_BSD_SPARC_INLINE_HPP
+-
+-#include "runtime/orderAccess.hpp"
+-#include "vm_version_sparc.hpp"
+-
-// Implementation of class OrderAccess.
-
-// Assume TSO.
@@ -7089,11 +7568,13 @@ $FreeBSD$
-
-inline void OrderAccess::release_store_ptr_fence(volatile intptr_t* p, intptr_t v) { *p = v; fence(); }
-inline void OrderAccess::release_store_ptr_fence(volatile void* p, void* v) { *(void* volatile *)p = v; fence(); }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2010-12-18 00:00:03.000000000 -0800
+-
+-#endif // OS_CPU_BSD_SPARC_VM_ORDERACCESS_BSD_SPARC_INLINE_HPP
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,724 +0,0 @@
+@@ -1,758 +0,0 @@
-/*
-- * Copyright (c) 1999, 2010, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1999, 2011, 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
@@ -7116,9 +7597,43 @@ $FreeBSD$
- *
- */
-
--// do not include precompiled header file
+-// no precompiled headers
+-#include "assembler_sparc.inline.hpp"
+-#include "classfile/classLoader.hpp"
+-#include "classfile/systemDictionary.hpp"
+-#include "classfile/vmSymbols.hpp"
+-#include "code/icBuffer.hpp"
+-#include "code/vtableStubs.hpp"
+-#include "interpreter/interpreter.hpp"
+-#include "jvm_bsd.h"
+-#include "memory/allocation.inline.hpp"
+-#include "mutex_bsd.inline.hpp"
+-#include "nativeInst_sparc.hpp"
+-#include "os_share_bsd.hpp"
+-#include "prims/jniFastGetField.hpp"
+-#include "prims/jvm.h"
+-#include "prims/jvm_misc.hpp"
+-#include "runtime/arguments.hpp"
+-#include "runtime/extendedPC.hpp"
+-#include "runtime/frame.inline.hpp"
+-#include "runtime/interfaceSupport.hpp"
+-#include "runtime/java.hpp"
+-#include "runtime/javaCalls.hpp"
+-#include "runtime/mutexLocker.hpp"
+-#include "runtime/osThread.hpp"
+-#include "runtime/sharedRuntime.hpp"
+-#include "runtime/stubRoutines.hpp"
+-#include "runtime/timer.hpp"
+-#include "thread_bsd.inline.hpp"
+-#include "utilities/events.hpp"
+-#include "utilities/vmError.hpp"
+-#ifdef COMPILER1
+-#include "c1/c1_Runtime1.hpp"
+-#endif
+-#ifdef COMPILER2
+-#include "opto/runtime.hpp"
+-#endif
-
--#include "incls/_os_bsd_sparc.cpp.incl"
-
-// Bsd/Sparc has rather obscure naming of registers in sigcontext
-// different between 32 and 64 bits
@@ -7602,7 +8117,7 @@ $FreeBSD$
- return false;
-}
-
--extern "C" int
+-extern "C" JNIEXPORT int
-JVM_handle_bsd_signal(int sig,
- siginfo_t* info,
- void* ucVoid,
@@ -7816,11 +8331,11 @@ $FreeBSD$
- // guard page, only enable glibc guard page for non-Java threads.
- return (thr_type == java_thread ? 0 : page_size());
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/os_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,44 +0,0 @@
+@@ -1,49 +0,0 @@
-/*
-- * Copyright (c) 1999, 2009, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1999, 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
@@ -7843,6 +8358,9 @@ $FreeBSD$
- *
- */
-
+-#ifndef OS_CPU_BSD_SPARC_VM_OS_BSD_SPARC_HPP
+-#define OS_CPU_BSD_SPARC_VM_OS_BSD_SPARC_HPP
+-
- //
- // NOTE: we are back in class os here, not Bsd
- //
@@ -7863,11 +8381,13 @@ $FreeBSD$
- // Used to register dynamic code cache area with the OS
- // Note: Currently only used in 64 bit Windows implementations
- static bool register_code_area(char *low, char *high) { return true; }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2010-12-18 00:00:03.000000000 -0800
+-
+-#endif // OS_CPU_BSD_SPARC_VM_OS_BSD_SPARC_HPP
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/prefetch_bsd_sparc.inline.hpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,40 +0,0 @@
+@@ -1,47 +0,0 @@
-/*
-- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2003, 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
@@ -7890,6 +8410,11 @@ $FreeBSD$
- *
- */
-
+-#ifndef OS_CPU_BSD_SPARC_VM_PREFETCH_BSD_SPARC_INLINE_HPP
+-#define OS_CPU_BSD_SPARC_VM_PREFETCH_BSD_SPARC_INLINE_HPP
+-
+-#include "runtime/prefetch.hpp"
+-
-#if defined(COMPILER2) || defined(_LP64)
-
-inline void Prefetch::read(void *loc, intx interval) {
@@ -7906,11 +8431,13 @@ $FreeBSD$
-inline void Prefetch::write(void *loc, intx interval) {}
-
-#endif
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2010-12-18 00:00:03.000000000 -0800
+-
+-#endif // OS_CPU_BSD_SPARC_VM_PREFETCH_BSD_SPARC_INLINE_HPP
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,37 +0,0 @@
+@@ -1,38 +0,0 @@
-/*
-- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1998, 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
@@ -7933,8 +8460,9 @@ $FreeBSD$
- *
- */
-
--#include "incls/_precompiled.incl"
--#include "incls/_threadLS_bsd_sparc.cpp.incl"
+-#include "precompiled.hpp"
+-#include "runtime/threadLocalStorage.hpp"
+-#include "thread_bsd.inline.hpp"
-
-void ThreadLocalStorage::generate_code_for_get_thread() {
-}
@@ -7946,11 +8474,11 @@ $FreeBSD$
-void ThreadLocalStorage::pd_set_thread(Thread* thread) {
- os::thread_local_storage_at_put(ThreadLocalStorage::thread_index(), thread);
-}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/threadLS_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,28 +0,0 @@
+@@ -1,33 +0,0 @@
-/*
-- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1998, 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
@@ -7973,15 +8501,20 @@ $FreeBSD$
- *
- */
-
+-#ifndef OS_CPU_BSD_SPARC_VM_THREADLS_BSD_SPARC_HPP
+-#define OS_CPU_BSD_SPARC_VM_THREADLS_BSD_SPARC_HPP
+-
-public:
- static Thread* thread() {
- return (Thread*) os::thread_local_storage_at(thread_index());
- }
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2010-12-18 00:00:03.000000000 -0800
+-
+-#endif // OS_CPU_BSD_SPARC_VM_THREADLS_BSD_SPARC_HPP
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,110 +0,0 @@
+@@ -1,111 +0,0 @@
-/*
-- * Copyright (c) 2003, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2003, 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
@@ -8004,8 +8537,9 @@ $FreeBSD$
- *
- */
-
--#include "incls/_precompiled.incl"
--#include "incls/_thread_bsd_sparc.cpp.incl"
+-#include "precompiled.hpp"
+-#include "runtime/frame.inline.hpp"
+-#include "thread_bsd.inline.hpp"
-
-// For Forte Analyzer AsyncGetCallTrace profiling support - thread is
-// currently interrupted by SIGPROF
@@ -8090,11 +8624,11 @@ $FreeBSD$
-
-void JavaThread::cache_global_variables() { }
-
---- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2010-12-18 00:00:03.000000000 -0800
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/thread_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,98 +0,0 @@
+@@ -1,103 +0,0 @@
-/*
-- * Copyright (c) 1998, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 1998, 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
@@ -8117,6 +8651,9 @@ $FreeBSD$
- *
- */
-
+-#ifndef OS_CPU_BSD_SPARC_VM_THREAD_BSD_SPARC_HPP
+-#define OS_CPU_BSD_SPARC_VM_THREAD_BSD_SPARC_HPP
+-
-private:
-
- void pd_initialize() {
@@ -8191,11 +8728,13 @@ $FreeBSD$
- static bool register_stack_overflow() { return false; }
- static void enable_register_stack_guard() {}
- static void disable_register_stack_guard() {}
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2010-12-18 00:00:03.000000000 -0800
+-
+-#endif // OS_CPU_BSD_SPARC_VM_THREAD_BSD_SPARC_HPP
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vmStructs_bsd_sparc.hpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,69 +0,0 @@
+@@ -1,74 +0,0 @@
-/*
-- * Copyright (c) 2000, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2000, 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
@@ -8218,6 +8757,9 @@ $FreeBSD$
- *
- */
-
+-#ifndef OS_CPU_BSD_SPARC_VM_VMSTRUCTS_BSD_SPARC_HPP
+-#define OS_CPU_BSD_SPARC_VM_VMSTRUCTS_BSD_SPARC_HPP
+-
-// These are the OS and CPU-specific fields, types and integer
-// constants required by the Serviceability Agent. This file is
-// referenced by vmStructs.cpp.
@@ -8263,11 +8805,13 @@ $FreeBSD$
- \
- /* This must be the last entry, and must be present */ \
- last_entry()
---- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2010-12-18 00:00:03.000000000 -0800
+-
+-#endif // OS_CPU_BSD_SPARC_VM_VMSTRUCTS_BSD_SPARC_HPP
+--- ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 2011-05-29 11:28:24.000000000 -0700
+++ ./hotspot/src/os_cpu/bsd_sparc/vm/vm_version_bsd_sparc.cpp 1969-12-31 16:00:00.000000000 -0800
-@@ -1,61 +0,0 @@
+@@ -1,62 +0,0 @@
-/*
-- * Copyright (c) 2006, 2008, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2006, 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
@@ -8290,8 +8834,9 @@ $FreeBSD$
- *
- */
-
--# include "incls/_precompiled.incl"
--# include "incls/_vm_version_bsd_sparc.cpp.incl"
+-#include "precompiled.hpp"
+-#include "runtime/os.hpp"
+-#include "vm_version_sparc.hpp"
-
-static bool detect_niagara() {
- char cpu[128];
@@ -8327,8 +8872,8 @@ $FreeBSD$
-
- return features;
-}
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2010-07-24 14:30:52.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_32.s 2011-04-22 22:28:34.000000000 -0700
@@ -21,6 +21,17 @@
# questions.
#
@@ -8347,7 +8892,7 @@ $FreeBSD$
# NOTE WELL! The _Copy functions are called directly
# from server-compiler-generated code via CallLeafNoFP,
-@@ -28,41 +39,61 @@
+@@ -28,42 +39,62 @@
# point or use it in the same manner as does the server
# compiler.
@@ -8369,7 +8914,9 @@ $FreeBSD$
+ .globl SYMBOL(_mmx_Copy_arrayof_conjoint_jshorts)
- .globl _Atomic_cmpxchg_long
+- .globl _Atomic_move_long
+ .globl SYMBOL(_Atomic_cmpxchg_long)
++ .globl SYMBOL(_Atomic_move_long)
.text
@@ -8428,7 +8975,7 @@ $FreeBSD$
rep
nop
movl $1, %eax
-@@ -72,8 +103,8 @@
+@@ -73,8 +104,8 @@
# void* to,
# size_t count)
.p2align 4,,15
@@ -8439,7 +8986,7 @@ $FreeBSD$
pushl %esi
movl 4+12(%esp),%ecx # count
pushl %edi
-@@ -180,8 +211,8 @@
+@@ -181,8 +212,8 @@
#
# Same as _Copy_conjoint_bytes, except no source alignment check.
.p2align 4,,15
@@ -8450,7 +8997,7 @@ $FreeBSD$
pushl %esi
movl 4+12(%esp),%ecx # count
pushl %edi
-@@ -268,8 +299,8 @@
+@@ -269,8 +300,8 @@
# void* to,
# size_t count)
.p2align 4,,15
@@ -8461,7 +9008,7 @@ $FreeBSD$
pushl %esi
movl 4+12(%esp),%ecx # count
pushl %edi
-@@ -355,8 +386,8 @@
+@@ -356,8 +387,8 @@
# void* to,
# size_t count)
.p2align 4,,15
@@ -8472,7 +9019,7 @@ $FreeBSD$
pushl %esi
movl 4+12(%esp),%ecx # count
pushl %edi
-@@ -432,10 +463,10 @@
+@@ -433,10 +464,10 @@
# Equivalent to
# arrayof_conjoint_jints
.p2align 4,,15
@@ -8487,7 +9034,7 @@ $FreeBSD$
pushl %esi
movl 4+12(%esp),%ecx # count
pushl %edi
-@@ -497,7 +528,7 @@
+@@ -498,7 +529,7 @@
#
# count treated as signed
#
@@ -8496,7 +9043,7 @@ $FreeBSD$
# while (--count >= 0) {
# *to++ = *from++;
# }
-@@ -507,8 +538,8 @@
+@@ -508,8 +539,8 @@
# }
# }
.p2align 4,,15
@@ -8507,7 +9054,7 @@ $FreeBSD$
movl 4+8(%esp),%ecx # count
movl 4+0(%esp),%eax # from
movl 4+4(%esp),%edx # to
-@@ -536,8 +567,8 @@
+@@ -537,8 +568,8 @@
# void* to,
# size_t count)
.p2align 4,,15
@@ -8518,7 +9065,7 @@ $FreeBSD$
pushl %esi
movl 4+12(%esp),%ecx
pushl %edi
-@@ -635,8 +666,8 @@
+@@ -636,8 +667,8 @@
# bool is_MP)
#
.p2align 4,,15
@@ -8529,8 +9076,8 @@ $FreeBSD$
# 8(%esp) : return PC
pushl %ebx # 4(%esp) : old %ebx
pushl %edi # 0(%esp) : old %edi
---- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2010-07-04 09:32:22.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bsd_x86_64.s 2011-04-22 22:28:34.000000000 -0700
@@ -21,6 +21,14 @@
# questions.
#
@@ -8678,11 +9225,11 @@ $FreeBSD$
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 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2010-07-04 09:32:22.000000000 -0700
-@@ -22,7 +22,33 @@
- *
- */
+--- ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/bytes_bsd_x86.inline.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -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
+#ifndef _ALLBSD_SOURCE
#include <byteswap.h>
@@ -8714,11 +9261,11 @@ $FreeBSD$
// 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 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700
-@@ -22,9 +22,10 @@
- *
- */
+--- ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/globals_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -25,9 +25,10 @@
+ #ifndef OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
+ #define OS_CPU_BSD_X86_VM_GLOBALS_BSD_X86_HPP
+//
// Sets the default values for platform dependent flags used by the runtime system.
@@ -8728,7 +9275,7 @@ $FreeBSD$
define_pd_global(bool, DontYieldALot, false);
#ifdef AMD64
define_pd_global(intx, ThreadStackSize, 1024); // 0 => use system default
-@@ -38,10 +39,11 @@
+@@ -41,11 +42,12 @@
#endif // AMD64
define_pd_global(intx, CompilerThreadStackSize, 0);
@@ -8742,9 +9289,10 @@ $FreeBSD$
+define_pd_global(uintx, HeapBaseMinAddress, 2*G);
// Only used on 64 bit Windows platforms
define_pd_global(bool, UseVectoredExceptions, false);
---- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2010-12-04 09:53:21.000000000 -0800
-@@ -44,23 +44,202 @@
+
+--- ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp 2011-04-22 22:28:34.000000000 -0700
+@@ -78,23 +78,202 @@
# include <sys/wait.h>
# include <pwd.h>
# include <poll.h>
@@ -8954,7 +9502,7 @@ $FreeBSD$
address os::current_stack_pointer() {
#ifdef SPARC_WORKS
register void *esp;
-@@ -85,15 +264,15 @@
+@@ -119,15 +298,15 @@
}
address os::Bsd::ucontext_get_pc(ucontext_t * uc) {
@@ -8973,7 +9521,7 @@ $FreeBSD$
}
// For Forte Analyzer AsyncGetCallTrace profiling support - thread
-@@ -245,18 +424,18 @@
+@@ -279,18 +458,18 @@
pc = (address) os::Bsd::ucontext_get_pc(uc);
if (pc == (address) Fetch32PFI) {
@@ -8995,7 +9543,7 @@ $FreeBSD$
address addr = (address) info->si_addr;
// check if fault address is within thread stack
-@@ -278,6 +457,7 @@
+@@ -312,6 +491,7 @@
// to handle_unexpected_exception way down below.
thread->disable_stack_red_zone();
tty->print_raw_cr("An irrecoverable stack overflow has occurred.");
@@ -9003,7 +9551,7 @@ $FreeBSD$
} else {
// Accessing stack address below sp may cause SEGV if current
// thread has MAP_GROWSDOWN stack. This should only happen when
-@@ -293,6 +473,7 @@
+@@ -327,6 +507,7 @@
} else {
fatal("recursive segv. expanding stack.");
}
@@ -9011,7 +9559,7 @@ $FreeBSD$
}
}
}
-@@ -301,9 +482,16 @@
+@@ -335,9 +516,16 @@
// Java thread running in Java code => find exception handler if any
// a fault inside compiled code, the interpreter, or a stub
@@ -9029,7 +9577,7 @@ $FreeBSD$
// BugId 4454115: A read from a MappedByteBuffer can fault
// here if the underlying file has been truncated.
// Do not crash the VM in such a case.
-@@ -324,6 +512,28 @@
+@@ -358,6 +546,28 @@
pc,
SharedRuntime::
IMPLICIT_DIVIDE_BY_ZERO);
@@ -9058,7 +9606,7 @@ $FreeBSD$
#else
if (sig == SIGFPE /* && info->si_code == FPE_INTDIV */) {
// HACK: si_code does not work on bsd 2.2.12-20!!!
-@@ -351,7 +561,7 @@
+@@ -385,7 +595,7 @@
fatal("please update this code.");
}
#endif // AMD64
@@ -9067,7 +9615,7 @@ $FreeBSD$
!MacroAssembler::needs_explicit_null_check((intptr_t)info->si_addr)) {
// Determination of interpreter/vtable stub/compiled code null exception
stub = SharedRuntime::continuation_for_implicit_exception(thread, pc, SharedRuntime::IMPLICIT_NULL);
-@@ -375,7 +585,7 @@
+@@ -409,7 +619,7 @@
// process of write protecting the memory serialization page.
// It write enables the page immediately after protecting it
// so we can just return to retry the write.
@@ -9076,7 +9624,7 @@ $FreeBSD$
os::is_memory_serialize_page(thread, (address) info->si_addr)) {
// Block current thread until the memory serialize page permission restored.
os::block_on_serialize_page_trap();
-@@ -396,7 +606,7 @@
+@@ -430,7 +640,7 @@
// Furthermore, a false-positive should be harmless.
if (UnguardOnExecutionViolation > 0 &&
(sig == SIGSEGV || sig == SIGBUS) &&
@@ -9085,7 +9633,7 @@ $FreeBSD$
int page_size = os::vm_page_size();
address addr = (address) info->si_addr;
address pc = os::Bsd::ucontext_get_pc(uc);
-@@ -466,7 +676,7 @@
+@@ -500,7 +710,7 @@
// save all thread context in case we need to restore it
if (thread != NULL) thread->set_saved_exception_pc(pc);
@@ -9094,7 +9642,7 @@ $FreeBSD$
return true;
}
-@@ -496,13 +706,24 @@
+@@ -530,13 +740,24 @@
ShouldNotReachHere();
}
@@ -9119,7 +9667,7 @@ $FreeBSD$
int os::Bsd::get_fpu_control_word(void) {
#ifdef AMD64
return 0;
-@@ -518,11 +739,12 @@
+@@ -552,11 +773,12 @@
_FPU_SETCW(fpu_control);
#endif // !AMD64
}
@@ -9133,7 +9681,7 @@ $FreeBSD$
return true;
#else
struct utsname uts;
-@@ -576,6 +798,9 @@
+@@ -610,6 +832,9 @@
#define GET_GS() ({int gs; __asm__ volatile("movw %%gs, %w0":"=q"(gs)); gs&0xffff;})
#endif
@@ -9143,7 +9691,7 @@ $FreeBSD$
// Test if pthread library can support variable thread stack size. BsdThreads
// in fixed stack mode allocates 2M fixed slot for each thread. BsdThreads
// in floating stack mode and NPTL support variable stack size.
-@@ -612,6 +837,7 @@
+@@ -646,6 +871,7 @@
#endif
}
}
@@ -9151,7 +9699,7 @@ $FreeBSD$
#endif // AMD64
// return default stack size for thr_type
-@@ -665,6 +891,41 @@
+@@ -699,6 +925,41 @@
// pthread_attr_getstack()
static void current_stack_region(address * bottom, size_t * size) {
@@ -9193,7 +9741,7 @@ $FreeBSD$
if (os::Bsd::is_initial_thread()) {
// initial thread needs special handling because pthread_getattr_np()
// may return bogus value.
-@@ -691,6 +952,7 @@
+@@ -725,6 +986,7 @@
pthread_attr_destroy(&attr);
}
@@ -9201,7 +9749,7 @@ $FreeBSD$
assert(os::current_stack_pointer() >= *bottom &&
os::current_stack_pointer() < *bottom + *size, "just checking");
}
-@@ -719,46 +981,44 @@
+@@ -753,46 +1015,44 @@
ucontext_t *uc = (ucontext_t*)context;
st->print_cr("Registers:");
#ifdef AMD64
@@ -9286,7 +9834,7 @@ $FreeBSD$
#endif // AMD64
st->cr();
st->cr();
-@@ -791,31 +1051,31 @@
+@@ -825,31 +1085,31 @@
// this is only for the "general purpose" registers
#ifdef AMD64
@@ -9343,9 +9891,9 @@ $FreeBSD$
#endif // AMD64
st->cr();
---- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700
-@@ -27,8 +27,10 @@
+--- ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/threadLS_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -30,8 +30,10 @@
#ifndef AMD64
// map stack pointer to thread pointer - see notes in threadLS_bsd_x86.cpp
#define SP_BITLENGTH 32
@@ -9356,9 +9904,9 @@ $FreeBSD$
static Thread* _sp_map[1UL << (SP_BITLENGTH - PAGE_SHIFT)];
#endif // !AMD64
---- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2010-07-04 09:32:22.000000000 -0700
-@@ -31,7 +31,7 @@
+--- ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_x86/vm/vmStructs_bsd_x86.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -34,7 +34,7 @@
/******************************/ \
/* Threads (NOTE: incomplete) */ \
/******************************/ \
@@ -9367,11 +9915,11 @@ $FreeBSD$
nonstatic_field(OSThread, _pthread_id, pthread_t) \
/* This must be the last entry, and must be present */ \
last_entry()
---- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700
-@@ -23,136 +23,441 @@
- *
- */
+--- ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_zero/vm/atomic_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -31,136 +31,455 @@
+ #include "runtime/os.hpp"
+ #include "vm_version_zero.hpp"
-// Implementation of class atomic
-
@@ -9540,20 +10088,20 @@ $FreeBSD$
+ * Note that efficient hardware support exists only for the 32 and 64
+ * bit variants; the 8 and 16 bit versions are not provided and should
+ * not be used in MI code.
-+ *
-+ * This implementation takes advantage of the fact that the sparc64
-+ * cas instruction is both a load and a store. The loop is often coded
-+ * as follows:
*
- * Atomically store newval in *ptr if *ptr is equal to oldval for user space.
- * Return zero if *ptr was changed or non-zero if no exchange happened.
- * The C flag is also set if *ptr was changed to allow for assembly
- * optimization in the calling code.
++ * This implementation takes advantage of the fact that the sparc64
++ * cas instruction is both a load and a store. The loop is often coded
++ * as follows:
+ *
+ * do {
+ * expect = *p;
+ * new = expect + 1;
+ * } while (cas(p, expect, new) != expect);
- *
++ *
+ * which performs an unnnecessary load on each iteration that the cas
+ * operation fails. Modified as follows:
+ *
@@ -9578,9 +10126,14 @@ $FreeBSD$
-typedef int (__kernel_cmpxchg_t)(int oldval, int newval, volatile int *ptr);
-#define __kernel_cmpxchg (*(__kernel_cmpxchg_t *) 0xffff0fc0)
--
--
--
++#define itype(sz) uint ## sz ## _t
+
++#define atomic_cas_32(p, e, s) casa(p, e, s, __ASI_ATOMIC)
++#define atomic_cas_64(p, e, s) casxa(p, e, s, __ASI_ATOMIC)
+
++#define atomic_cas(p, e, s, sz) \
++ atomic_cas_ ## sz(p, e, s)
+
-/* Perform an atomic compare and swap: if the current value of `*PTR'
- is OLDVAL, then write NEWVAL into `*PTR'. Return the contents of
- `*PTR' before the operation.*/
@@ -9591,30 +10144,6 @@ $FreeBSD$
- int prev = *ptr;
- if (prev != oldval)
- return prev;
--
-- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
-- // Success.
-- return prev;
--
-- // We failed even though prev == oldval. Try again.
-- }
--}
-+#define itype(sz) uint ## sz ## _t
-
--/* Atomically add an int to memory. */
--static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
-- for (;;) {
-- // Loop until a __kernel_cmpxchg succeeds.
-+#define atomic_cas_32(p, e, s) casa(p, e, s, __ASI_ATOMIC)
-+#define atomic_cas_64(p, e, s) casxa(p, e, s, __ASI_ATOMIC)
-
-- int prev = *ptr;
-+#define atomic_cas(p, e, s, sz) \
-+ atomic_cas_ ## sz(p, e, s)
-
-- if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
-- return prev + add_value;
-- }
+#define atomic_cas_acq(p, e, s, sz) ({ \
+ itype(sz) v; \
+ v = atomic_cas(p, e, s, sz); \
@@ -9743,15 +10272,52 @@ $FreeBSD$
+{ \
+ atomic_store_rel(p, v, sz); \
+}
-+
+
+- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+- // Success.
+- return prev;
++inline jlong Atomic::load(volatile jlong* src) {
++ volatile jlong dest;
++ os::atomic_copy64(src, &dest);
++ return dest;
++}
+
+- // We failed even though prev == oldval. Try again.
+- }
++inline void Atomic::store(jlong store_value, jlong* dest) {
++ os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
+ }
+
+-/* Atomically add an int to memory. */
+-static inline int arm_add_and_fetch(volatile int *ptr, int add_value) {
+- for (;;) {
+- // Loop until a __kernel_cmpxchg succeeds.
++inline void Atomic::store(jlong store_value, volatile jlong* dest) {
++ os::atomic_copy64((volatile jlong*)&store_value, dest);
++}
+
+- int prev = *ptr;
+ATOMIC_GEN(int, u_int *, u_int, u_int, 32);
+ATOMIC_GEN(32, uint32_t *, uint32_t, uint32_t, 32);
-+
+
+- if (__kernel_cmpxchg (prev, prev + add_value, ptr) == 0)
+- return prev + add_value;
+- }
+-}
+ATOMIC_GEN(long, u_long *, u_long, u_long, 64);
+ATOMIC_GEN(64, uint64_t *, uint64_t, uint64_t, 64);
-+
+
+-/* Atomically write VALUE into `*PTR' and returns the previous
+- contents of `*PTR'. */
+-static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
+- for (;;) {
+- // Loop until a __kernel_cmpxchg succeeds.
+- int prev = *ptr;
+ATOMIC_GEN(ptr, uintptr_t *, uintptr_t, uintptr_t, 64);
-+
+
+- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
+- return prev;
+- }
+#define atomic_fetchadd_int atomic_add_int
+#define atomic_fetchadd_32 atomic_add_32
+#define atomic_fetchadd_long atomic_add_long
@@ -9904,24 +10470,14 @@ $FreeBSD$
+ OSAtomicCompareAndSwapPtrBarrier(compare_value, exchange_value, (void * volatile *) dest);
+ return prev;
}
-
--/* Atomically write VALUE into `*PTR' and returns the previous
-- contents of `*PTR'. */
--static inline int arm_lock_test_and_set(volatile int *ptr, int newval) {
-- for (;;) {
-- // Loop until a __kernel_cmpxchg succeeds.
-- int prev = *ptr;
-
-- if (__kernel_cmpxchg (prev, newval, ptr) == 0)
-- return prev;
-- }
--}
-#endif // ARM
++
++
+#endif
inline void Atomic::store(jint store_value, volatile jint* dest) {
*dest = store_value;
-@@ -163,27 +468,11 @@
+@@ -171,27 +490,11 @@
}
inline jint Atomic::add(jint add_value, volatile jint* dest) {
@@ -9951,7 +10507,7 @@ $FreeBSD$
}
inline void* Atomic::add_ptr(intptr_t add_value, volatile void* dest) {
-@@ -215,79 +504,41 @@
+@@ -223,95 +526,43 @@
}
inline jint Atomic::xchg(jint exchange_value, volatile jint* dest) {
@@ -10039,11 +10595,27 @@ $FreeBSD$
- return (void *) cmpxchg_ptr((intptr_t) exchange_value,
- (volatile intptr_t*) dest,
- (intptr_t) compare_value);
+-}
+-
+-inline jlong Atomic::load(volatile jlong* src) {
+- volatile jlong dest;
+- os::atomic_copy64(src, &dest);
+- return dest;
+-}
+-
+-inline void Atomic::store(jlong store_value, jlong* dest) {
+- os::atomic_copy64((volatile jlong*)&store_value, (volatile jlong*)dest);
+-}
+-
+-inline void Atomic::store(jlong store_value, volatile jlong* dest) {
+- os::atomic_copy64((volatile jlong*)&store_value, dest);
+ return atomic_cas_ptr((volatile void *)dest, compare_value, exchange_value);
}
---- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700
-@@ -25,16 +25,23 @@
+
+ #endif // OS_CPU_BSD_ZERO_VM_ATOMIC_BSD_ZERO_INLINE_HPP
+--- ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_zero/vm/bytes_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -28,18 +28,25 @@
// Efficient swapping of data bytes from Java byte
// ordering to native byte ordering and vice versa.
@@ -10071,9 +10643,11 @@ $FreeBSD$
- return bswap_64(x);
+ return bswap64(x);
}
---- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2010-07-04 09:32:22.000000000 -0700
-@@ -40,7 +40,12 @@
+
+ #endif // OS_CPU_BSD_ZERO_VM_BYTES_BSD_ZERO_INLINE_HPP
+--- ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_zero/vm/orderAccess_bsd_zero.inline.hpp 2011-04-22 22:28:34.000000000 -0700
+@@ -46,7 +46,12 @@
#else // ARM
@@ -10086,8 +10660,8 @@ $FreeBSD$
#ifdef PPC
---- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-12-18 00:00:03.000000000 -0800
-+++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2010-10-31 14:26:55.000000000 -0700
+--- ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2011-05-29 11:28:24.000000000 -0700
++++ ./hotspot/src/os_cpu/bsd_zero/vm/os_bsd_zero.cpp 2011-04-22 22:28:34.000000000 -0700
@@ -23,6 +23,10 @@
*
*/
@@ -10096,10 +10670,10 @@ $FreeBSD$
+# include <pthread_np.h> /* For pthread_attr_get_np */
+#endif
+
- // do not include precompiled header file
- #include "incls/_os_bsd_zero.cpp.incl"
-
-@@ -145,6 +149,7 @@
+ // no precompiled headers
+ #include "assembler_zero.inline.hpp"
+ #include "classfile/classLoader.hpp"
+@@ -179,6 +183,7 @@
thread->disable_stack_red_zone();
ShouldNotCallThis();
}
@@ -10107,7 +10681,7 @@ $FreeBSD$
else {
// Accessing stack address below sp may cause SEGV if
// current thread has MAP_GROWSDOWN stack. This should
-@@ -163,6 +168,7 @@
+@@ -197,6 +202,7 @@
fatal("recursive segv. expanding stack.");
}
}
@@ -10115,7 +10689,7 @@ $FreeBSD$
}
}
-@@ -230,6 +236,7 @@
+@@ -264,6 +270,7 @@
// Nothing to do
}
@@ -10123,7 +10697,7 @@ $FreeBSD$
int os::Bsd::get_fpu_control_word() {
ShouldNotCallThis();
}
-@@ -237,6 +244,7 @@
+@@ -271,6 +278,7 @@
void os::Bsd::set_fpu_control_word(int fpu) {
ShouldNotCallThis();
}
@@ -10131,7 +10705,7 @@ $FreeBSD$
bool os::is_allocatable(size_t bytes) {
#ifdef _LP64
-@@ -281,6 +289,48 @@
+@@ -315,6 +323,48 @@
}
static void current_stack_region(address *bottom, size_t *size) {
@@ -10180,7 +10754,7 @@ $FreeBSD$
pthread_attr_t attr;
int res = pthread_getattr_np(pthread_self(), &attr);
if (res != 0) {
-@@ -292,13 +342,11 @@
+@@ -326,13 +376,11 @@
}
}
@@ -10195,7 +10769,7 @@ $FreeBSD$
// The block of memory returned by pthread_attr_getstack() includes
// guard pages where present. We need to trim these off.
-@@ -340,6 +388,7 @@
+@@ -374,6 +422,7 @@
stack_bottom = stack_top - stack_bytes;
}
@@ -10203,9 +10777,9 @@ $FreeBSD$
assert(os::current_stack_pointer() >= stack_bottom, "should do");
assert(os::current_stack_pointer() < stack_top, "should do");
---- ./hotspot/src/share/vm/adlc/adlc.hpp 2010-12-16 13:52:41.000000000 -0800
-+++ ./hotspot/src/share/vm/adlc/adlc.hpp 2010-06-15 22:03:24.000000000 -0700
-@@ -69,9 +69,9 @@
+--- ./hotspot/src/share/vm/adlc/adlc.hpp 2011-05-26 17:30:48.000000000 -0700
++++ ./hotspot/src/share/vm/adlc/adlc.hpp 2011-04-22 22:28:35.000000000 -0700
+@@ -67,9 +67,9 @@
#endif
#endif // _WIN32
@@ -10217,9 +10791,43 @@ $FreeBSD$
// Macros
#define uint32 unsigned int
---- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-12-16 13:52:45.000000000 -0800
-+++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2010-10-31 14:03:01.000000000 -0700
-@@ -952,7 +952,7 @@
+--- ./hotspot/src/share/vm/c1/c1_globals.hpp 2011-05-26 17:31:05.000000000 -0700
++++ ./hotspot/src/share/vm/c1/c1_globals.hpp 2011-04-22 22:28:35.000000000 -0700
+@@ -47,6 +47,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "c1_globals_windows.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "c1_globals_bsd.hpp"
++#endif
+
+ //
+ // Defines all global flags used by the client compiler.
+--- ./hotspot/src/share/vm/classfile/classLoader.cpp 2011-05-26 17:31:23.000000000 -0700
++++ ./hotspot/src/share/vm/classfile/classLoader.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -68,6 +68,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+
+ // Entry points in zip.dll for loading zip/jar file entries
+--- ./hotspot/src/share/vm/classfile/javaClasses.cpp 2011-05-26 17:31:26.000000000 -0700
++++ ./hotspot/src/share/vm/classfile/javaClasses.cpp 2011-05-20 20:03:59.000000000 -0700
+@@ -56,6 +56,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ static bool find_field(instanceKlass* ik,
+ Symbol* name_symbol, Symbol* signature_symbol,
+@@ -1110,7 +1113,7 @@
}
nmethod* nm = method->code();
if (WizardMode && nm != NULL) {
@@ -10228,9 +10836,204 @@ $FreeBSD$
}
}
---- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-12-16 13:52:56.000000000 -0800
-+++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2010-08-06 22:02:53.000000000 -0700
-@@ -83,7 +83,7 @@
+--- ./hotspot/src/share/vm/code/stubs.hpp 2011-05-26 17:31:37.000000000 -0700
++++ ./hotspot/src/share/vm/code/stubs.hpp 2011-04-22 22:28:36.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ // The classes in this file provide a simple framework for the
+ // management of little pieces of machine code - or stubs -
+--- ./hotspot/src/share/vm/compiler/disassembler.hpp 2011-05-26 17:31:39.000000000 -0700
++++ ./hotspot/src/share/vm/compiler/disassembler.hpp 2011-04-22 22:28:36.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ class decode_env;
+
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2011-05-26 17:31:41.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+ elapsedTimer CMSAdaptiveSizePolicy::_concurrent_timer;
+ elapsedTimer CMSAdaptiveSizePolicy::_STW_timer;
+
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2011-05-26 17:31:42.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -50,6 +50,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ //
+ // ConcurrentMarkSweepPolicy methods
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2011-05-26 17:31:45.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp 2011-04-22 22:28:36.000000000 -0700
+@@ -36,6 +36,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ class ConcurrentMarkSweepGeneration;
+ class CMSCollector;
+--- ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2011-05-26 17:31:45.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/concurrentMarkSweep/freeBlockDictionary.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -33,6 +33,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #ifndef PRODUCT
+ Mutex* FreeBlockDictionary::par_lock() const {
+--- ./hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2011-05-26 17:31:49.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/dirtyCardQueue.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -39,6 +39,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ bool DirtyCardQueue::apply_closure(CardTableEntryClosure* cl,
+ bool consume,
+--- ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2011-05-26 17:31:54.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp 2011-05-07 21:53:41.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(MemRegion whole_heap,
+ int max_covered_regions) :
+--- ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2011-05-26 17:31:58.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/g1/ptrQueue.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ PtrQueue::PtrQueue(PtrQueueSet* qset, bool perm, bool active) :
+ _qset(qset), _buf(NULL), _index(0), _active(active),
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2011-05-26 17:32:04.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/parMarkBitMap.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -38,6 +38,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ bool
+ ParMarkBitMap::initialize(MemRegion covered_region)
+--- ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2011-05-26 17:32:10.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/parallelScavenge/psVirtualspace.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ // PSVirtualSpace
+
+--- ./hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2011-05-26 17:32:16.000000000 -0700
++++ ./hotspot/src/share/vm/gc_implementation/shared/mutableNUMASpace.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ MutableNUMASpace::MutableNUMASpace(size_t alignment) : MutableSpace(alignment) {
+--- ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2011-05-26 17:32:18.000000000 -0700
++++ ./hotspot/src/share/vm/gc_interface/collectedHeap.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -39,6 +39,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ #ifdef ASSERT
+--- ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2011-05-26 17:32:18.000000000 -0700
++++ ./hotspot/src/share/vm/gc_interface/collectedHeap.inline.hpp 2011-04-22 22:28:36.000000000 -0700
+@@ -43,6 +43,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // Inline allocation implementations.
+
+--- ./hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2011-05-26 17:32:19.000000000 -0700
++++ ./hotspot/src/share/vm/interpreter/abstractInterpreter.hpp 2011-05-20 20:03:59.000000000 -0700
+@@ -56,6 +56,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // This file contains the platform-independent parts
+ // of the abstract interpreter and the abstract interpreter generator.
+--- ./hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2011-05-26 17:32:19.000000000 -0700
++++ ./hotspot/src/share/vm/interpreter/bytecodeInterpreter.cpp 2011-04-23 12:09:38.000000000 -0700
+@@ -65,6 +65,12 @@
+ #ifdef TARGET_OS_ARCH_linux_ppc
+ # include "orderAccess_linux_ppc.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "orderAccess_bsd_x86.inline.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "orderAccess_bsd_zero.inline.hpp"
++#endif
+
+
+ // no precompiled headers
+--- ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2011-05-26 17:32:21.000000000 -0700
++++ ./hotspot/src/share/vm/interpreter/bytecodeTracer.cpp 2011-05-27 00:00:43.000000000 -0700
+@@ -92,7 +92,7 @@
// the incoming method. We could lose a line of trace output.
// This is acceptable in a debug-only feature.
st->cr();
@@ -10239,7 +11042,7 @@ $FreeBSD$
method->print_name(st);
st->cr();
_current_method = method();
-@@ -97,7 +97,7 @@
+@@ -106,7 +106,7 @@
}
_code = code;
int bci = bcp - method->code_base();
@@ -10248,9 +11051,237 @@ $FreeBSD$
if (Verbose) {
st->print("%8d %4d " INTPTR_FORMAT " " INTPTR_FORMAT " %s",
BytecodeCounter::counter_value(), bci, tos, tos2, Bytecodes::name(code));
---- ./hotspot/src/share/vm/prims/forte.cpp 2010-12-16 13:53:05.000000000 -0800
-+++ ./hotspot/src/share/vm/prims/forte.cpp 2010-06-15 22:03:31.000000000 -0700
-@@ -629,6 +629,11 @@
+--- ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-05-26 17:32:22.000000000 -0700
++++ ./hotspot/src/share/vm/interpreter/interpreterRuntime.hpp 2011-04-22 22:28:36.000000000 -0700
+@@ -41,6 +41,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // The InterpreterRuntime is called by the interpreter for everything
+ // that cannot/should not be dealt with in assembly and needs C support.
+--- ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-05-26 17:32:23.000000000 -0700
++++ ./hotspot/src/share/vm/interpreter/linkResolver.cpp 2011-05-12 20:54:44.000000000 -0700
+@@ -52,6 +52,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ //------------------------------------------------------------------------------------------------------------------------
+ // Implementation of FieldAccessInfo
+--- ./hotspot/src/share/vm/memory/allocation.cpp 2011-05-26 17:32:26.000000000 -0700
++++ ./hotspot/src/share/vm/memory/allocation.cpp 2011-05-12 20:54:44.000000000 -0700
+@@ -39,6 +39,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ void* CHeapObj::operator new(size_t size){
+ return (void *) AllocateHeap(size, "CHeapObj-new");
+--- ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2011-05-26 17:32:28.000000000 -0700
++++ ./hotspot/src/share/vm/memory/collectorPolicy.cpp 2011-05-12 20:54:44.000000000 -0700
+@@ -47,6 +47,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
+ #include "gc_implementation/concurrentMarkSweep/cmsGCAdaptivePolicyCounters.hpp"
+--- ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2011-05-26 17:32:29.000000000 -0700
++++ ./hotspot/src/share/vm/memory/defNewGeneration.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -48,6 +48,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ //
+ // DefNewGeneration functions.
+--- ./hotspot/src/share/vm/memory/gcLocker.hpp 2011-05-26 17:32:30.000000000 -0700
++++ ./hotspot/src/share/vm/memory/gcLocker.hpp 2011-04-22 22:28:36.000000000 -0700
+@@ -41,6 +41,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // The direct lock/unlock calls do not force a collection if an unlock
+ // decrements the count to zero. Avoid calling these if at all possible.
+--- ./hotspot/src/share/vm/memory/genMarkSweep.cpp 2011-05-26 17:32:31.000000000 -0700
++++ ./hotspot/src/share/vm/memory/genMarkSweep.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -55,6 +55,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ void GenMarkSweep::invoke_at_safepoint(int level, ReferenceProcessor* rp,
+ bool clear_all_softrefs) {
+--- ./hotspot/src/share/vm/memory/resourceArea.cpp 2011-05-26 17:32:34.000000000 -0700
++++ ./hotspot/src/share/vm/memory/resourceArea.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ //------------------------------ResourceMark-----------------------------------
+ debug_only(int ResourceArea::_warned;) // to suppress multiple warnings
+--- ./hotspot/src/share/vm/memory/resourceArea.hpp 2011-05-26 17:32:34.000000000 -0700
++++ ./hotspot/src/share/vm/memory/resourceArea.hpp 2011-04-22 22:28:36.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // The resource area holds temporary data structures in the VM.
+ // The actual allocation areas are thread local. Typical usage:
+--- ./hotspot/src/share/vm/memory/space.hpp 2011-05-26 17:32:35.000000000 -0700
++++ ./hotspot/src/share/vm/memory/space.hpp 2011-04-22 22:28:36.000000000 -0700
+@@ -44,6 +44,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ // A space is an abstraction for the "storage units" backing
+ // up the generation abstraction. It includes specific
+--- ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2011-05-26 17:32:36.000000000 -0700
++++ ./hotspot/src/share/vm/memory/threadLocalAllocBuffer.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -38,6 +38,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // Thread-Local Edens support
+
+--- ./hotspot/src/share/vm/memory/universe.cpp 2011-05-26 17:32:36.000000000 -0700
++++ ./hotspot/src/share/vm/memory/universe.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -89,6 +89,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/concurrentMarkSweep/cmsAdaptiveSizePolicy.hpp"
+ #include "gc_implementation/concurrentMarkSweep/cmsCollectorPolicy.hpp"
+--- ./hotspot/src/share/vm/oops/constantPoolKlass.cpp 2011-05-26 17:32:40.000000000 -0700
++++ ./hotspot/src/share/vm/oops/constantPoolKlass.cpp 2011-05-20 20:03:59.000000000 -0700
+@@ -44,6 +44,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/parNew/parOopClosures.inline.hpp"
+ #include "gc_implementation/parallelScavenge/psPromotionManager.inline.hpp"
+--- ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2011-05-26 17:32:40.000000000 -0700
++++ ./hotspot/src/share/vm/oops/constantPoolOop.cpp 2011-04-23 12:09:38.000000000 -0700
+@@ -1332,7 +1332,7 @@
+ }
+ case JVM_CONSTANT_Long: {
+ u8 val = Bytes::get_Java_u8(bytes);
+- printf("long "INT64_FORMAT, *(jlong *) &val);
++ printf("long "INT64_FORMAT, (int64_t) *(jlong *) &val);
+ ent_size = 8;
+ idx++; // Long takes two cpool slots
+ break;
+--- ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-05-26 17:32:41.000000000 -0700
++++ ./hotspot/src/share/vm/oops/instanceKlass.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -60,6 +60,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/g1/g1CollectedHeap.inline.hpp"
+ #include "gc_implementation/g1/g1OopClosures.inline.hpp"
+--- ./hotspot/src/share/vm/oops/markOop.cpp 2011-05-26 17:32:44.000000000 -0700
++++ ./hotspot/src/share/vm/oops/markOop.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -33,6 +33,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ void markOopDesc::print_on(outputStream* st) const {
+--- ./hotspot/src/share/vm/oops/oop.cpp 2011-05-26 17:32:47.000000000 -0700
++++ ./hotspot/src/share/vm/oops/oop.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -36,6 +36,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ bool always_do_update_barrier = false;
+
+--- ./hotspot/src/share/vm/oops/oopsHierarchy.cpp 2011-05-26 17:32:48.000000000 -0700
++++ ./hotspot/src/share/vm/oops/oopsHierarchy.cpp 2011-04-22 22:28:36.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #ifdef CHECK_UNHANDLED_OOPS
+
+--- ./hotspot/src/share/vm/opto/c2_globals.hpp 2011-05-26 17:32:52.000000000 -0700
++++ ./hotspot/src/share/vm/opto/c2_globals.hpp 2011-05-12 20:54:44.000000000 -0700
+@@ -44,6 +44,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "c2_globals_windows.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "c2_globals_bsd.hpp"
++#endif
+
+ //
+ // Defines all globals flags used by the server compiler.
+--- ./hotspot/src/share/vm/prims/forte.cpp 2011-05-26 17:33:09.000000000 -0700
++++ ./hotspot/src/share/vm/prims/forte.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -640,6 +640,11 @@
// Method to let libcollector know about a dynamically loaded function.
// Because it is weakly bound, the calls become NOP's when the library
// isn't present.
@@ -10262,7 +11293,7 @@ $FreeBSD$
void collector_func_load(char* name,
void* null_argument_1,
void* null_argument_2,
-@@ -639,6 +644,7 @@
+@@ -650,6 +655,7 @@
#pragma weak collector_func_load
#define collector_func_load(x0,x1,x2,x3,x4,x5,x6) \
( collector_func_load ? collector_func_load(x0,x1,x2,x3,x4,x5,x6),0 : 0 )
@@ -10270,9 +11301,360 @@ $FreeBSD$
#endif // !_WINDOWS
} // end extern "C"
---- ./hotspot/src/share/vm/runtime/os.cpp 2010-12-16 13:53:09.000000000 -0800
-+++ ./hotspot/src/share/vm/runtime/os.cpp 2010-12-04 08:27:38.000000000 -0800
-@@ -79,7 +79,11 @@
+--- ./hotspot/src/share/vm/prims/jni.cpp 2011-05-26 17:33:09.000000000 -0700
++++ ./hotspot/src/share/vm/prims/jni.cpp 2011-05-07 21:53:42.000000000 -0700
+@@ -91,6 +91,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ static jint CurrentVersion = JNI_VERSION_1_6;
+
+--- ./hotspot/src/share/vm/prims/jvm.cpp 2011-05-26 17:33:10.000000000 -0700
++++ ./hotspot/src/share/vm/prims/jvm.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -72,6 +72,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "jvm_windows.h"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "jvm_bsd.h"
++#endif
+
+ #include <errno.h>
+
+--- ./hotspot/src/share/vm/prims/jvm.h 2011-05-26 17:33:10.000000000 -0700
++++ ./hotspot/src/share/vm/prims/jvm.h 2011-04-23 12:09:39.000000000 -0700
+@@ -36,6 +36,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "jvm_windows.h"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "jvm_bsd.h"
++#endif
+
+ #ifndef _JAVASOFT_JVM_H_
+ #define _JAVASOFT_JVM_H_
+--- ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2011-05-26 17:33:12.000000000 -0700
++++ ./hotspot/src/share/vm/prims/jvmtiEnv.cpp 2011-05-07 21:53:42.000000000 -0700
+@@ -68,6 +68,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+
+--- ./hotspot/src/share/vm/prims/jvmtiImpl.cpp 2011-05-26 17:33:15.000000000 -0700
++++ ./hotspot/src/share/vm/prims/jvmtiImpl.cpp 2011-05-12 20:54:44.000000000 -0700
+@@ -54,6 +54,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ //
+ // class JvmtiAgentThread
+--- ./hotspot/src/share/vm/prims/nativeLookup.cpp 2011-05-26 17:33:19.000000000 -0700
++++ ./hotspot/src/share/vm/prims/nativeLookup.cpp 2011-04-23 12:09:39.000000000 -0700
+@@ -49,6 +49,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+
+ static void mangle_name_on(outputStream* st, Symbol* name, int begin, int end) {
+--- ./hotspot/src/share/vm/runtime/arguments.cpp 2011-05-26 17:33:21.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/arguments.cpp 2011-05-12 20:54:44.000000000 -0700
+@@ -55,6 +55,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
+ #endif
+--- ./hotspot/src/share/vm/runtime/atomic.cpp 2011-05-26 17:33:21.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/atomic.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -33,6 +33,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+ #ifdef TARGET_OS_ARCH_linux_x86
+ # include "atomic_linux_x86.inline.hpp"
+ #endif
+@@ -51,6 +54,12 @@
+ #ifdef TARGET_OS_ARCH_windows_x86
+ # include "atomic_windows_x86.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "atomic_bsd_x86.inline.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "atomic_bsd_zero.inline.hpp"
++#endif
+
+ jbyte Atomic::cmpxchg(jbyte exchange_value, volatile jbyte* dest, jbyte compare_value) {
+ assert(sizeof(jbyte) == 1, "assumption.");
+--- ./hotspot/src/share/vm/runtime/fprofiler.hpp 2011-05-26 17:33:24.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/fprofiler.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // a simple flat profiler for Java
+
+--- ./hotspot/src/share/vm/runtime/globals.hpp 2011-05-26 17:33:25.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/globals.hpp 2011-05-27 00:00:44.000000000 -0700
+@@ -50,6 +50,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "globals_windows.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "globals_bsd.hpp"
++#endif
+ #ifdef TARGET_OS_ARCH_linux_x86
+ # include "globals_linux_x86.hpp"
+ #endif
+@@ -74,6 +77,12 @@
+ #ifdef TARGET_OS_ARCH_linux_ppc
+ # include "globals_linux_ppc.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "globals_bsd_x86.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "globals_bsd_zero.hpp"
++#endif
+ #ifdef COMPILER1
+ #ifdef TARGET_ARCH_x86
+ # include "c1_globals_x86.hpp"
+@@ -96,6 +105,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "c1_globals_windows.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "c1_globals_bsd.hpp"
++#endif
+ #endif
+ #ifdef COMPILER2
+ #ifdef TARGET_ARCH_x86
+@@ -116,6 +128,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "c2_globals_windows.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "c2_globals_bsd.hpp"
++#endif
+ #endif
+ #ifdef SHARK
+ #ifdef TARGET_ARCH_zero
+--- ./hotspot/src/share/vm/runtime/handles.cpp 2011-05-26 17:33:25.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/handles.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -38,6 +38,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #ifdef ASSERT
+ oop* HandleArea::allocate_handle(oop obj) {
+--- ./hotspot/src/share/vm/runtime/handles.inline.hpp 2011-05-26 17:33:25.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/handles.inline.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // these inline functions are in a separate file to break an include cycle
+ // between Thread and Handle
+--- ./hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-05-26 17:33:26.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/interfaceSupport.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -44,6 +44,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // Wrapper for all entry points to the virtual machine.
+ // The HandleMarkCleaner is a faster version of HandleMark.
+@@ -115,6 +118,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "interfaceSupport_windows.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "interfaceSupport_bsd.hpp"
++#endif
+
+ };
+
+--- ./hotspot/src/share/vm/runtime/java.cpp 2011-05-26 17:33:26.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/java.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -85,6 +85,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
+ #include "gc_implementation/parallelScavenge/psScavenge.hpp"
+--- ./hotspot/src/share/vm/runtime/javaCalls.cpp 2011-05-26 17:33:27.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/javaCalls.cpp 2011-05-07 21:53:42.000000000 -0700
+@@ -48,6 +48,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // -----------------------------------------------------
+ // Implementation of JavaCallWrapper
+--- ./hotspot/src/share/vm/runtime/javaCalls.hpp 2011-05-26 17:33:27.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/javaCalls.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -54,6 +54,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // A JavaCallWrapper is constructed before each JavaCall and destructed after the call.
+ // Its purpose is to allocate/deallocate a new handle block and to save/restore the last
+--- ./hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2011-05-26 17:33:27.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/javaFrameAnchor.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -50,6 +50,13 @@
+ #ifdef TARGET_OS_ARCH_linux_ppc
+ # include "orderAccess_linux_ppc.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "orderAccess_bsd_x86.inline.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "orderAccess_bsd_zero.inline.hpp"
++#endif
++
+ //
+ // An object for encapsulating the machine/os dependent part of a JavaThread frame state
+ //
+--- ./hotspot/src/share/vm/runtime/jniHandles.cpp 2011-05-26 17:33:27.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/jniHandles.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ JNIHandleBlock* JNIHandles::_global_handles = NULL;
+--- ./hotspot/src/share/vm/runtime/memprofiler.cpp 2011-05-26 17:33:28.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/memprofiler.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -46,6 +46,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #ifndef PRODUCT
+
+--- ./hotspot/src/share/vm/runtime/mutex.cpp 2011-05-26 17:33:28.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/mutex.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -39,6 +39,10 @@
+ # include "mutex_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "mutex_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o-o
+ //
+--- ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2011-05-26 17:33:28.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/mutexLocker.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -36,6 +36,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // Mutexes used in the VM (see comment in mutexLocker.hpp):
+ //
+--- ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2011-05-26 17:33:29.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/mutexLocker.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -36,6 +36,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ // Mutexes used in the VM.
+
+--- ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2011-05-26 17:33:29.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/objectMonitor.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -50,6 +50,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #if defined(__GNUC__) && !defined(IA64)
+ // Need to inhibit inlining for older versions of GCC to avoid build-time failures
+--- ./hotspot/src/share/vm/runtime/os.cpp 2011-05-26 17:33:29.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/os.cpp 2011-04-23 12:09:39.000000000 -0700
+@@ -60,6 +60,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ # include <signal.h>
+
+@@ -116,7 +120,11 @@
assert(false, "Failed localtime_pd");
return NULL;
}
@@ -10284,9 +11666,259 @@ $FreeBSD$
// If daylight savings time is in effect,
// we are 1 hour East of our time zone
---- ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-12-16 13:53:10.000000000 -0800
-+++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2010-10-31 14:03:02.000000000 -0700
-@@ -149,7 +149,8 @@
+@@ -384,6 +392,13 @@
+ if (_native_java_library == NULL) {
+ vm_exit_during_initialization("Unable to load native library", ebuf);
+ }
++
++#if defined(__OpenBSD__)
++ // Work-around OpenBSD's lack of $ORIGIN support by pre-loading libnet.so
++ // ignore errors
++ dll_build_name(buffer, sizeof(buffer), Arguments::get_dll_dir(), "net");
++ dll_load(buffer, ebuf, sizeof(ebuf));
++#endif
+ }
+ static jboolean onLoaded = JNI_FALSE;
+ if (onLoaded) {
+--- ./hotspot/src/share/vm/runtime/os.hpp 2011-05-26 17:33:29.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/os.hpp 2011-05-12 20:54:45.000000000 -0700
+@@ -30,6 +30,9 @@
+ #include "runtime/extendedPC.hpp"
+ #include "runtime/handles.hpp"
+ #include "utilities/top.hpp"
++#ifdef TARGET_OS_FAMILY_bsd
++# include "jvm_bsd.h"
++#endif
+ #ifdef TARGET_OS_FAMILY_linux
+ # include "jvm_linux.h"
+ #endif
+@@ -39,6 +42,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "jvm_windows.h"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "jvm_bsd.h"
++#endif
+
+ // os defines the interface to operating system; this includes traditional
+ // OS services (time, I/O) as well as other functionality with system-
+@@ -672,6 +678,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.hpp"
++#endif
+ #ifdef TARGET_OS_ARCH_linux_x86
+ # include "os_linux_x86.hpp"
+ #endif
+@@ -696,6 +705,12 @@
+ #ifdef TARGET_OS_ARCH_linux_ppc
+ # include "os_linux_ppc.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "os_bsd_x86.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "os_bsd_zero.hpp"
++#endif
+
+
+ // debugging support (mostly used by debug.cpp but also fatal error handler)
+--- ./hotspot/src/share/vm/runtime/osThread.hpp 2011-05-26 17:33:30.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/osThread.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -109,6 +109,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "osThread_windows.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "osThread_bsd.hpp"
++#endif
+
+ };
+
+--- ./hotspot/src/share/vm/runtime/safepoint.cpp 2011-05-26 17:33:33.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/safepoint.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -78,6 +78,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
+ #include "gc_implementation/shared/concurrentGCThread.hpp"
+--- ./hotspot/src/share/vm/runtime/synchronizer.cpp 2011-05-26 17:33:37.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/synchronizer.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -51,6 +51,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #if defined(__GNUC__) && !defined(IA64)
+ // Need to inhibit inlining for older versions of GCC to avoid build-time failures
+--- ./hotspot/src/share/vm/runtime/task.cpp 2011-05-26 17:33:37.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/task.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -39,6 +39,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ int PeriodicTask::_num_tasks = 0;
+ PeriodicTask* PeriodicTask::_tasks[PeriodicTask::max_tasks];
+--- ./hotspot/src/share/vm/runtime/thread.cpp 2011-05-26 17:33:37.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/thread.cpp 2011-05-27 00:00:44.000000000 -0700
+@@ -89,6 +89,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/concurrentMarkSweep/concurrentMarkSweepThread.hpp"
+ #include "gc_implementation/g1/concurrentMarkThread.inline.hpp"
+--- ./hotspot/src/share/vm/runtime/thread.hpp 2011-05-26 17:33:37.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/thread.hpp 2011-05-27 00:00:44.000000000 -0700
+@@ -1610,6 +1610,12 @@
+ #ifdef TARGET_OS_ARCH_linux_ppc
+ # include "thread_linux_ppc.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "thread_bsd_x86.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "thread_bsd_zero.hpp"
++#endif
+
+
+ public:
+--- ./hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2011-05-26 17:33:38.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/threadLocalStorage.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -36,6 +36,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // static member initialization
+ int ThreadLocalStorage::_thread_index = -1;
+--- ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2011-05-26 17:33:38.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/threadLocalStorage.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -68,6 +68,12 @@
+ #ifdef TARGET_OS_ARCH_linux_ppc
+ # include "threadLS_linux_ppc.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "threadLS_bsd_x86.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "threadLS_bsd_zero.hpp"
++#endif
+
+
+ public:
+--- ./hotspot/src/share/vm/runtime/timer.cpp 2011-05-26 17:33:38.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/timer.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+
+ void elapsedTimer::add(elapsedTimer t) {
+--- ./hotspot/src/share/vm/runtime/virtualspace.cpp 2011-05-26 17:33:39.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/virtualspace.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+
+ // ReservedSpace
+--- ./hotspot/src/share/vm/runtime/vmStructs.cpp 2011-05-26 17:33:40.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/vmStructs.cpp 2011-05-27 00:00:44.000000000 -0700
+@@ -125,6 +125,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifdef TARGET_OS_ARCH_linux_x86
+ # include "vmStructs_linux_x86.hpp"
+ #endif
+@@ -149,6 +152,12 @@
+ #ifdef TARGET_OS_ARCH_linux_ppc
+ # include "vmStructs_linux_ppc.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "vmStructs_bsd_x86.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "vmStructs_bsd_zero.hpp"
++#endif
+ #ifndef SERIALGC
+ #include "gc_implementation/concurrentMarkSweep/cmsPermGen.hpp"
+ #include "gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.hpp"
+--- ./hotspot/src/share/vm/runtime/vmThread.cpp 2011-05-26 17:33:40.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/vmThread.cpp 2011-05-07 21:53:42.000000000 -0700
+@@ -46,6 +46,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ HS_DTRACE_PROBE_DECL3(hotspot, vmops__request, char *, uintptr_t, int);
+ HS_DTRACE_PROBE_DECL3(hotspot, vmops__begin, char *, uintptr_t, int);
+--- ./hotspot/src/share/vm/runtime/vmThread.hpp 2011-05-26 17:33:40.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/vmThread.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -36,6 +36,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ //
+ // Prioritized queue of VM operations.
+--- ./hotspot/src/share/vm/runtime/vm_operations.cpp 2011-05-26 17:33:40.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/vm_operations.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -45,6 +45,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #define VM_OP_NAME_INITIALIZE(name) #name,
+
+--- ./hotspot/src/share/vm/runtime/vm_version.cpp 2011-05-26 17:33:41.000000000 -0700
++++ ./hotspot/src/share/vm/runtime/vm_version.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -166,7 +166,8 @@
#define OS LINUX_ONLY("linux") \
WINDOWS_ONLY("windows") \
@@ -10296,14 +11928,2807 @@ $FreeBSD$
#ifdef ZERO
#define CPU ZERO_LIBARCH
---- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-12-16 13:53:14.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2010-10-31 14:03:02.000000000 -0700
-@@ -71,12 +71,25 @@
+--- ./hotspot/src/share/vm/utilities/accessFlags.cpp 2011-05-26 17:33:55.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/accessFlags.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -34,6 +34,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+
+ void AccessFlags::atomic_set_bits(jint bits) {
+--- ./hotspot/src/share/vm/utilities/array.cpp 2011-05-26 17:33:55.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/array.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -34,6 +34,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ #ifdef ASSERT
+--- ./hotspot/src/share/vm/utilities/bitMap.cpp 2011-05-26 17:33:56.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/bitMap.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+
+ BitMap::BitMap(bm_word_t* map, idx_t size_in_bits) :
+--- ./hotspot/src/share/vm/utilities/debug.cpp 2011-05-26 17:33:57.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/debug.cpp 2011-05-12 20:54:45.000000000 -0700
+@@ -62,6 +62,10 @@
+ # include "os_windows.inline.hpp"
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #ifndef ASSERT
+ # ifdef _DEBUG
+--- ./hotspot/src/share/vm/utilities/elf.hpp 1969-12-31 16:00:00.000000000 -0800
++++ ./hotspot/src/share/vm/utilities/elf.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -0,0 +1,2605 @@
++/* This file defines standard ELF types, structures, and macros.
++ Copyright (C) 1995-2003,2004,2005,2006 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#ifndef __ELF_HPP
++#define __ELF_HPP 1
++
++__BEGIN_DECLS
++
++/* Standard ELF types. */
++
++#include <stdint.h>
++
++/* Type for a 16-bit quantity. */
++typedef uint16_t Elf32_Half;
++typedef uint16_t Elf64_Half;
++
++/* Types for signed and unsigned 32-bit quantities. */
++typedef uint32_t Elf32_Word;
++typedef int32_t Elf32_Sword;
++typedef uint32_t Elf64_Word;
++typedef int32_t Elf64_Sword;
++
++/* Types for signed and unsigned 64-bit quantities. */
++typedef uint64_t Elf32_Xword;
++typedef int64_t Elf32_Sxword;
++typedef uint64_t Elf64_Xword;
++typedef int64_t Elf64_Sxword;
++
++/* Type of addresses. */
++typedef uint32_t Elf32_Addr;
++typedef uint64_t Elf64_Addr;
++
++/* Type of file offsets. */
++typedef uint32_t Elf32_Off;
++typedef uint64_t Elf64_Off;
++
++/* Type for section indices, which are 16-bit quantities. */
++typedef uint16_t Elf32_Section;
++typedef uint16_t Elf64_Section;
++
++/* Type for version symbol information. */
++typedef Elf32_Half Elf32_Versym;
++typedef Elf64_Half Elf64_Versym;
++
++
++/* The ELF file header. This appears at the start of every ELF file. */
++
++#define EI_NIDENT (16)
++
++typedef struct
++{
++ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */
++ Elf32_Half e_type; /* Object file type */
++ Elf32_Half e_machine; /* Architecture */
++ Elf32_Word e_version; /* Object file version */
++ Elf32_Addr e_entry; /* Entry point virtual address */
++ Elf32_Off e_phoff; /* Program header table file offset */
++ Elf32_Off e_shoff; /* Section header table file offset */
++ Elf32_Word e_flags; /* Processor-specific flags */
++ Elf32_Half e_ehsize; /* ELF header size in bytes */
++ Elf32_Half e_phentsize; /* Program header table entry size */
++ Elf32_Half e_phnum; /* Program header table entry count */
++ Elf32_Half e_shentsize; /* Section header table entry size */
++ Elf32_Half e_shnum; /* Section header table entry count */
++ Elf32_Half e_shstrndx; /* Section header string table index */
++} Elf32_Ehdr;
++
++typedef struct
++{
++ unsigned char e_ident[EI_NIDENT]; /* Magic number and other info */
++ Elf64_Half e_type; /* Object file type */
++ Elf64_Half e_machine; /* Architecture */
++ Elf64_Word e_version; /* Object file version */
++ Elf64_Addr e_entry; /* Entry point virtual address */
++ Elf64_Off e_phoff; /* Program header table file offset */
++ Elf64_Off e_shoff; /* Section header table file offset */
++ Elf64_Word e_flags; /* Processor-specific flags */
++ Elf64_Half e_ehsize; /* ELF header size in bytes */
++ Elf64_Half e_phentsize; /* Program header table entry size */
++ Elf64_Half e_phnum; /* Program header table entry count */
++ Elf64_Half e_shentsize; /* Section header table entry size */
++ Elf64_Half e_shnum; /* Section header table entry count */
++ Elf64_Half e_shstrndx; /* Section header string table index */
++} Elf64_Ehdr;
++
++/* Fields in the e_ident array. The EI_* macros are indices into the
++ array. The macros under each EI_* macro are the values the byte
++ may have. */
++
++#define EI_MAG0 0 /* File identification byte 0 index */
++#define ELFMAG0 0x7f /* Magic number byte 0 */
++
++#define EI_MAG1 1 /* File identification byte 1 index */
++#define ELFMAG1 'E' /* Magic number byte 1 */
++
++#define EI_MAG2 2 /* File identification byte 2 index */
++#define ELFMAG2 'L' /* Magic number byte 2 */
++
++#define EI_MAG3 3 /* File identification byte 3 index */
++#define ELFMAG3 'F' /* Magic number byte 3 */
++
++/* Conglomeration of the identification bytes, for easy testing as a word. */
++#define ELFMAG "\177ELF"
++#define SELFMAG 4
++
++#define EI_CLASS 4 /* File class byte index */
++#define ELFCLASSNONE 0 /* Invalid class */
++#define ELFCLASS32 1 /* 32-bit objects */
++#define ELFCLASS64 2 /* 64-bit objects */
++#define ELFCLASSNUM 3
++
++#define EI_DATA 5 /* Data encoding byte index */
++#define ELFDATANONE 0 /* Invalid data encoding */
++#define ELFDATA2LSB 1 /* 2's complement, little endian */
++#define ELFDATA2MSB 2 /* 2's complement, big endian */
++#define ELFDATANUM 3
++
++#define EI_VERSION 6 /* File version byte index */
++ /* Value must be EV_CURRENT */
++
++#define EI_OSABI 7 /* OS ABI identification */
++#define ELFOSABI_NONE 0 /* UNIX System V ABI */
++#define ELFOSABI_SYSV 0 /* Alias. */
++#define ELFOSABI_HPUX 1 /* HP-UX */
++#define ELFOSABI_NETBSD 2 /* NetBSD. */
++#define ELFOSABI_LINUX 3 /* Linux. */
++#define ELFOSABI_SOLARIS 6 /* Sun Solaris. */
++#define ELFOSABI_AIX 7 /* IBM AIX. */
++#define ELFOSABI_IRIX 8 /* SGI Irix. */
++#define ELFOSABI_FREEBSD 9 /* FreeBSD. */
++#define ELFOSABI_TRU64 10 /* Compaq TRU64 UNIX. */
++#define ELFOSABI_MODESTO 11 /* Novell Modesto. */
++#define ELFOSABI_OPENBSD 12 /* OpenBSD. */
++#define ELFOSABI_ARM 97 /* ARM */
++#define ELFOSABI_STANDALONE 255 /* Standalone (embedded) application */
++
++#define EI_ABIVERSION 8 /* ABI version */
++
++#define EI_PAD 9 /* Byte index of padding bytes */
++
++/* Legal values for e_type (object file type). */
++
++#define ET_NONE 0 /* No file type */
++#define ET_REL 1 /* Relocatable file */
++#define ET_EXEC 2 /* Executable file */
++#define ET_DYN 3 /* Shared object file */
++#define ET_CORE 4 /* Core file */
++#define ET_NUM 5 /* Number of defined types */
++#define ET_LOOS 0xfe00 /* OS-specific range start */
++#define ET_HIOS 0xfeff /* OS-specific range end */
++#define ET_LOPROC 0xff00 /* Processor-specific range start */
++#define ET_HIPROC 0xffff /* Processor-specific range end */
++
++/* Legal values for e_machine (architecture). */
++
++#define EM_NONE 0 /* No machine */
++#define EM_M32 1 /* AT&T WE 32100 */
++#define EM_SPARC 2 /* SUN SPARC */
++#define EM_386 3 /* Intel 80386 */
++#define EM_68K 4 /* Motorola m68k family */
++#define EM_88K 5 /* Motorola m88k family */
++#define EM_860 7 /* Intel 80860 */
++#define EM_MIPS 8 /* MIPS R3000 big-endian */
++#define EM_S370 9 /* IBM System/370 */
++#define EM_MIPS_RS3_LE 10 /* MIPS R3000 little-endian */
++
++#define EM_PARISC 15 /* HPPA */
++#define EM_VPP500 17 /* Fujitsu VPP500 */
++#define EM_SPARC32PLUS 18 /* Sun's "v8plus" */
++#define EM_960 19 /* Intel 80960 */
++#define EM_PPC 20 /* PowerPC */
++#define EM_PPC64 21 /* PowerPC 64-bit */
++#define EM_S390 22 /* IBM S390 */
++
++#define EM_V800 36 /* NEC V800 series */
++#define EM_FR20 37 /* Fujitsu FR20 */
++#define EM_RH32 38 /* TRW RH-32 */
++#define EM_RCE 39 /* Motorola RCE */
++#define EM_ARM 40 /* ARM */
++#define EM_FAKE_ALPHA 41 /* Digital Alpha */
++#define EM_SH 42 /* Hitachi SH */
++#define EM_SPARCV9 43 /* SPARC v9 64-bit */
++#define EM_TRICORE 44 /* Siemens Tricore */
++#define EM_ARC 45 /* Argonaut RISC Core */
++#define EM_H8_300 46 /* Hitachi H8/300 */
++#define EM_H8_300H 47 /* Hitachi H8/300H */
++#define EM_H8S 48 /* Hitachi H8S */
++#define EM_H8_500 49 /* Hitachi H8/500 */
++#define EM_IA_64 50 /* Intel Merced */
++#define EM_MIPS_X 51 /* Stanford MIPS-X */
++#define EM_COLDFIRE 52 /* Motorola Coldfire */
++#define EM_68HC12 53 /* Motorola M68HC12 */
++#define EM_MMA 54 /* Fujitsu MMA Multimedia Accelerator*/
++#define EM_PCP 55 /* Siemens PCP */
++#define EM_NCPU 56 /* Sony nCPU embeeded RISC */
++#define EM_NDR1 57 /* Denso NDR1 microprocessor */
++#define EM_STARCORE 58 /* Motorola Start*Core processor */
++#define EM_ME16 59 /* Toyota ME16 processor */
++#define EM_ST100 60 /* STMicroelectronic ST100 processor */
++#define EM_TINYJ 61 /* Advanced Logic Corp. Tinyj emb.fam*/
++#define EM_X86_64 62 /* AMD x86-64 architecture */
++#define EM_PDSP 63 /* Sony DSP Processor */
++
++#define EM_FX66 66 /* Siemens FX66 microcontroller */
++#define EM_ST9PLUS 67 /* STMicroelectronics ST9+ 8/16 mc */
++#define EM_ST7 68 /* STmicroelectronics ST7 8 bit mc */
++#define EM_68HC16 69 /* Motorola MC68HC16 microcontroller */
++#define EM_68HC11 70 /* Motorola MC68HC11 microcontroller */
++#define EM_68HC08 71 /* Motorola MC68HC08 microcontroller */
++#define EM_68HC05 72 /* Motorola MC68HC05 microcontroller */
++#define EM_SVX 73 /* Silicon Graphics SVx */
++#define EM_ST19 74 /* STMicroelectronics ST19 8 bit mc */
++#define EM_VAX 75 /* Digital VAX */
++#define EM_CRIS 76 /* Axis Communications 32-bit embedded processor */
++#define EM_JAVELIN 77 /* Infineon Technologies 32-bit embedded processor */
++#define EM_FIREPATH 78 /* Element 14 64-bit DSP Processor */
++#define EM_ZSP 79 /* LSI Logic 16-bit DSP Processor */
++#define EM_MMIX 80 /* Donald Knuth's educational 64-bit processor */
++#define EM_HUANY 81 /* Harvard University machine-independent object files */
++#define EM_PRISM 82 /* SiTera Prism */
++#define EM_AVR 83 /* Atmel AVR 8-bit microcontroller */
++#define EM_FR30 84 /* Fujitsu FR30 */
++#define EM_D10V 85 /* Mitsubishi D10V */
++#define EM_D30V 86 /* Mitsubishi D30V */
++#define EM_V850 87 /* NEC v850 */
++#define EM_M32R 88 /* Mitsubishi M32R */
++#define EM_MN10300 89 /* Matsushita MN10300 */
++#define EM_MN10200 90 /* Matsushita MN10200 */
++#define EM_PJ 91 /* picoJava */
++#define EM_OPENRISC 92 /* OpenRISC 32-bit embedded processor */
++#define EM_ARC_A5 93 /* ARC Cores Tangent-A5 */
++#define EM_XTENSA 94 /* Tensilica Xtensa Architecture */
++#define EM_NUM 95
++
++/* If it is necessary to assign new unofficial EM_* values, please
++ pick large random numbers (0x8523, 0xa7f2, etc.) to minimize the
++ chances of collision with official or non-GNU unofficial values. */
++
++#define EM_ALPHA 0x9026
++
++/* Legal values for e_version (version). */
++
++#define EV_NONE 0 /* Invalid ELF version */
++#define EV_CURRENT 1 /* Current version */
++#define EV_NUM 2
++
++/* Section header. */
++
++typedef struct
++{
++ Elf32_Word sh_name; /* Section name (string tbl index) */
++ Elf32_Word sh_type; /* Section type */
++ Elf32_Word sh_flags; /* Section flags */
++ Elf32_Addr sh_addr; /* Section virtual addr at execution */
++ Elf32_Off sh_offset; /* Section file offset */
++ Elf32_Word sh_size; /* Section size in bytes */
++ Elf32_Word sh_link; /* Link to another section */
++ Elf32_Word sh_info; /* Additional section information */
++ Elf32_Word sh_addralign; /* Section alignment */
++ Elf32_Word sh_entsize; /* Entry size if section holds table */
++} Elf32_Shdr;
++
++typedef struct
++{
++ Elf64_Word sh_name; /* Section name (string tbl index) */
++ Elf64_Word sh_type; /* Section type */
++ Elf64_Xword sh_flags; /* Section flags */
++ Elf64_Addr sh_addr; /* Section virtual addr at execution */
++ Elf64_Off sh_offset; /* Section file offset */
++ Elf64_Xword sh_size; /* Section size in bytes */
++ Elf64_Word sh_link; /* Link to another section */
++ Elf64_Word sh_info; /* Additional section information */
++ Elf64_Xword sh_addralign; /* Section alignment */
++ Elf64_Xword sh_entsize; /* Entry size if section holds table */
++} Elf64_Shdr;
++
++/* Special section indices. */
++
++#define SHN_UNDEF 0 /* Undefined section */
++#define SHN_LORESERVE 0xff00 /* Start of reserved indices */
++#define SHN_LOPROC 0xff00 /* Start of processor-specific */
++#define SHN_BEFORE 0xff00 /* Order section before all others
++ (Solaris). */
++#define SHN_AFTER 0xff01 /* Order section after all others
++ (Solaris). */
++#define SHN_HIPROC 0xff1f /* End of processor-specific */
++#define SHN_LOOS 0xff20 /* Start of OS-specific */
++#define SHN_HIOS 0xff3f /* End of OS-specific */
++#define SHN_ABS 0xfff1 /* Associated symbol is absolute */
++#define SHN_COMMON 0xfff2 /* Associated symbol is common */
++#define SHN_XINDEX 0xffff /* Index is in extra table. */
++#define SHN_HIRESERVE 0xffff /* End of reserved indices */
++
++/* Legal values for sh_type (section type). */
++
++#define SHT_NULL 0 /* Section header table entry unused */
++#define SHT_PROGBITS 1 /* Program data */
++#define SHT_SYMTAB 2 /* Symbol table */
++#define SHT_STRTAB 3 /* String table */
++#define SHT_RELA 4 /* Relocation entries with addends */
++#define SHT_HASH 5 /* Symbol hash table */
++#define SHT_DYNAMIC 6 /* Dynamic linking information */
++#define SHT_NOTE 7 /* Notes */
++#define SHT_NOBITS 8 /* Program space with no data (bss) */
++#define SHT_REL 9 /* Relocation entries, no addends */
++#define SHT_SHLIB 10 /* Reserved */
++#define SHT_DYNSYM 11 /* Dynamic linker symbol table */
++#define SHT_INIT_ARRAY 14 /* Array of constructors */
++#define SHT_FINI_ARRAY 15 /* Array of destructors */
++#define SHT_PREINIT_ARRAY 16 /* Array of pre-constructors */
++#define SHT_GROUP 17 /* Section group */
++#define SHT_SYMTAB_SHNDX 18 /* Extended section indeces */
++#define SHT_NUM 19 /* Number of defined types. */
++#define SHT_LOOS 0x60000000 /* Start OS-specific. */
++#define SHT_GNU_HASH 0x6ffffff6 /* GNU-style hash table. */
++#define SHT_GNU_LIBLIST 0x6ffffff7 /* Prelink library list */
++#define SHT_CHECKSUM 0x6ffffff8 /* Checksum for DSO content. */
++#define SHT_LOSUNW 0x6ffffffa /* Sun-specific low bound. */
++#define SHT_SUNW_move 0x6ffffffa
++#define SHT_SUNW_COMDAT 0x6ffffffb
++#define SHT_SUNW_syminfo 0x6ffffffc
++#define SHT_GNU_verdef 0x6ffffffd /* Version definition section. */
++#define SHT_GNU_verneed 0x6ffffffe /* Version needs section. */
++#define SHT_GNU_versym 0x6fffffff /* Version symbol table. */
++#define SHT_HISUNW 0x6fffffff /* Sun-specific high bound. */
++#define SHT_HIOS 0x6fffffff /* End OS-specific type */
++#define SHT_LOPROC 0x70000000 /* Start of processor-specific */
++#define SHT_HIPROC 0x7fffffff /* End of processor-specific */
++#define SHT_LOUSER 0x80000000 /* Start of application-specific */
++#define SHT_HIUSER 0x8fffffff /* End of application-specific */
++
++/* Legal values for sh_flags (section flags). */
++
++#define SHF_WRITE (1 << 0) /* Writable */
++#define SHF_ALLOC (1 << 1) /* Occupies memory during execution */
++#define SHF_EXECINSTR (1 << 2) /* Executable */
++#define SHF_MERGE (1 << 4) /* Might be merged */
++#define SHF_STRINGS (1 << 5) /* Contains nul-terminated strings */
++#define SHF_INFO_LINK (1 << 6) /* `sh_info' contains SHT index */
++#define SHF_LINK_ORDER (1 << 7) /* Preserve order after combining */
++#define SHF_OS_NONCONFORMING (1 << 8) /* Non-standard OS specific handling
++ required */
++#define SHF_GROUP (1 << 9) /* Section is member of a group. */
++#define SHF_TLS (1 << 10) /* Section hold thread-local data. */
++#define SHF_MASKOS 0x0ff00000 /* OS-specific. */
++#define SHF_MASKPROC 0xf0000000 /* Processor-specific */
++#define SHF_ORDERED (1 << 30) /* Special ordering requirement
++ (Solaris). */
++#define SHF_EXCLUDE (1 << 31) /* Section is excluded unless
++ referenced or allocated (Solaris).*/
++
++/* Section group handling. */
++#define GRP_COMDAT 0x1 /* Mark group as COMDAT. */
++
++/* Symbol table entry. */
++
++typedef struct
++{
++ Elf32_Word st_name; /* Symbol name (string tbl index) */
++ Elf32_Addr st_value; /* Symbol value */
++ Elf32_Word st_size; /* Symbol size */
++ unsigned char st_info; /* Symbol type and binding */
++ unsigned char st_other; /* Symbol visibility */
++ Elf32_Section st_shndx; /* Section index */
++} Elf32_Sym;
++
++typedef struct
++{
++ Elf64_Word st_name; /* Symbol name (string tbl index) */
++ unsigned char st_info; /* Symbol type and binding */
++ unsigned char st_other; /* Symbol visibility */
++ Elf64_Section st_shndx; /* Section index */
++ Elf64_Addr st_value; /* Symbol value */
++ Elf64_Xword st_size; /* Symbol size */
++} Elf64_Sym;
++
++/* The syminfo section if available contains additional information about
++ every dynamic symbol. */
++
++typedef struct
++{
++ Elf32_Half si_boundto; /* Direct bindings, symbol bound to */
++ Elf32_Half si_flags; /* Per symbol flags */
++} Elf32_Syminfo;
++
++typedef struct
++{
++ Elf64_Half si_boundto; /* Direct bindings, symbol bound to */
++ Elf64_Half si_flags; /* Per symbol flags */
++} Elf64_Syminfo;
++
++/* Possible values for si_boundto. */
++#define SYMINFO_BT_SELF 0xffff /* Symbol bound to self */
++#define SYMINFO_BT_PARENT 0xfffe /* Symbol bound to parent */
++#define SYMINFO_BT_LOWRESERVE 0xff00 /* Beginning of reserved entries */
++
++/* Possible bitmasks for si_flags. */
++#define SYMINFO_FLG_DIRECT 0x0001 /* Direct bound symbol */
++#define SYMINFO_FLG_PASSTHRU 0x0002 /* Pass-thru symbol for translator */
++#define SYMINFO_FLG_COPY 0x0004 /* Symbol is a copy-reloc */
++#define SYMINFO_FLG_LAZYLOAD 0x0008 /* Symbol bound to object to be lazy
++ loaded */
++/* Syminfo version values. */
++#define SYMINFO_NONE 0
++#define SYMINFO_CURRENT 1
++#define SYMINFO_NUM 2
++
++
++/* How to extract and insert information held in the st_info field. */
++
++#define ELF32_ST_BIND(val) (((unsigned char) (val)) >> 4)
++#define ELF32_ST_TYPE(val) ((val) & 0xf)
++#define ELF32_ST_INFO(bind, type) (((bind) << 4) + ((type) & 0xf))
++
++/* Both Elf32_Sym and Elf64_Sym use the same one-byte st_info field. */
++#define ELF64_ST_BIND(val) ELF32_ST_BIND (val)
++#define ELF64_ST_TYPE(val) ELF32_ST_TYPE (val)
++#define ELF64_ST_INFO(bind, type) ELF32_ST_INFO ((bind), (type))
++
++/* Legal values for ST_BIND subfield of st_info (symbol binding). */
++
++#define STB_LOCAL 0 /* Local symbol */
++#define STB_GLOBAL 1 /* Global symbol */
++#define STB_WEAK 2 /* Weak symbol */
++#define STB_NUM 3 /* Number of defined types. */
++#define STB_LOOS 10 /* Start of OS-specific */
++#define STB_HIOS 12 /* End of OS-specific */
++#define STB_LOPROC 13 /* Start of processor-specific */
++#define STB_HIPROC 15 /* End of processor-specific */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type). */
++
++#define STT_NOTYPE 0 /* Symbol type is unspecified */
++#define STT_OBJECT 1 /* Symbol is a data object */
++#define STT_FUNC 2 /* Symbol is a code object */
++#define STT_SECTION 3 /* Symbol associated with a section */
++#define STT_FILE 4 /* Symbol's name is file name */
++#define STT_COMMON 5 /* Symbol is a common data object */
++#define STT_TLS 6 /* Symbol is thread-local data object*/
++#define STT_NUM 7 /* Number of defined types. */
++#define STT_LOOS 10 /* Start of OS-specific */
++#define STT_HIOS 12 /* End of OS-specific */
++#define STT_LOPROC 13 /* Start of processor-specific */
++#define STT_HIPROC 15 /* End of processor-specific */
++
++
++/* Symbol table indices are found in the hash buckets and chain table
++ of a symbol hash table section. This special index value indicates
++ the end of a chain, meaning no further symbols are found in that bucket. */
++
++#define STN_UNDEF 0 /* End of a chain. */
++
++
++/* How to extract and insert information held in the st_other field. */
++
++#define ELF32_ST_VISIBILITY(o) ((o) & 0x03)
++
++/* For ELF64 the definitions are the same. */
++#define ELF64_ST_VISIBILITY(o) ELF32_ST_VISIBILITY (o)
++
++/* Symbol visibility specification encoded in the st_other field. */
++#define STV_DEFAULT 0 /* Default symbol visibility rules */
++#define STV_INTERNAL 1 /* Processor specific hidden class */
++#define STV_HIDDEN 2 /* Sym unavailable in other modules */
++#define STV_PROTECTED 3 /* Not preemptible, not exported */
++
++
++/* Relocation table entry without addend (in section of type SHT_REL). */
++
++typedef struct
++{
++ Elf32_Addr r_offset; /* Address */
++ Elf32_Word r_info; /* Relocation type and symbol index */
++} Elf32_Rel;
++
++/* I have seen two different definitions of the Elf64_Rel and
++ Elf64_Rela structures, so we'll leave them out until Novell (or
++ whoever) gets their act together. */
++/* The following, at least, is used on Sparc v9, MIPS, and Alpha. */
++
++typedef struct
++{
++ Elf64_Addr r_offset; /* Address */
++ Elf64_Xword r_info; /* Relocation type and symbol index */
++} Elf64_Rel;
++
++/* Relocation table entry with addend (in section of type SHT_RELA). */
++
++typedef struct
++{
++ Elf32_Addr r_offset; /* Address */
++ Elf32_Word r_info; /* Relocation type and symbol index */
++ Elf32_Sword r_addend; /* Addend */
++} Elf32_Rela;
++
++typedef struct
++{
++ Elf64_Addr r_offset; /* Address */
++ Elf64_Xword r_info; /* Relocation type and symbol index */
++ Elf64_Sxword r_addend; /* Addend */
++} Elf64_Rela;
++
++/* How to extract and insert information held in the r_info field. */
++
++#define ELF32_R_SYM(val) ((val) >> 8)
++#define ELF32_R_TYPE(val) ((val) & 0xff)
++#define ELF32_R_INFO(sym, type) (((sym) << 8) + ((type) & 0xff))
++
++#define ELF64_R_SYM(i) ((i) >> 32)
++#define ELF64_R_TYPE(i) ((i) & 0xffffffff)
++#define ELF64_R_INFO(sym,type) ((((Elf64_Xword) (sym)) << 32) + (type))
++
++/* Program segment header. */
++
++typedef struct
++{
++ Elf32_Word p_type; /* Segment type */
++ Elf32_Off p_offset; /* Segment file offset */
++ Elf32_Addr p_vaddr; /* Segment virtual address */
++ Elf32_Addr p_paddr; /* Segment physical address */
++ Elf32_Word p_filesz; /* Segment size in file */
++ Elf32_Word p_memsz; /* Segment size in memory */
++ Elf32_Word p_flags; /* Segment flags */
++ Elf32_Word p_align; /* Segment alignment */
++} Elf32_Phdr;
++
++typedef struct
++{
++ Elf64_Word p_type; /* Segment type */
++ Elf64_Word p_flags; /* Segment flags */
++ Elf64_Off p_offset; /* Segment file offset */
++ Elf64_Addr p_vaddr; /* Segment virtual address */
++ Elf64_Addr p_paddr; /* Segment physical address */
++ Elf64_Xword p_filesz; /* Segment size in file */
++ Elf64_Xword p_memsz; /* Segment size in memory */
++ Elf64_Xword p_align; /* Segment alignment */
++} Elf64_Phdr;
++
++/* Legal values for p_type (segment type). */
++
++#define PT_NULL 0 /* Program header table entry unused */
++#define PT_LOAD 1 /* Loadable program segment */
++#define PT_DYNAMIC 2 /* Dynamic linking information */
++#define PT_INTERP 3 /* Program interpreter */
++#define PT_NOTE 4 /* Auxiliary information */
++#define PT_SHLIB 5 /* Reserved */
++#define PT_PHDR 6 /* Entry for header table itself */
++#define PT_TLS 7 /* Thread-local storage segment */
++#define PT_NUM 8 /* Number of defined types */
++#define PT_LOOS 0x60000000 /* Start of OS-specific */
++#define PT_GNU_EH_FRAME 0x6474e550 /* GCC .eh_frame_hdr segment */
++#define PT_GNU_STACK 0x6474e551 /* Indicates stack executability */
++#define PT_GNU_RELRO 0x6474e552 /* Read-only after relocation */
++#define PT_LOSUNW 0x6ffffffa
++#define PT_SUNWBSS 0x6ffffffa /* Sun Specific segment */
++#define PT_SUNWSTACK 0x6ffffffb /* Stack segment */
++#define PT_HISUNW 0x6fffffff
++#define PT_HIOS 0x6fffffff /* End of OS-specific */
++#define PT_LOPROC 0x70000000 /* Start of processor-specific */
++#define PT_HIPROC 0x7fffffff /* End of processor-specific */
++
++/* Legal values for p_flags (segment flags). */
++
++#define PF_X (1 << 0) /* Segment is executable */
++#define PF_W (1 << 1) /* Segment is writable */
++#define PF_R (1 << 2) /* Segment is readable */
++#define PF_MASKOS 0x0ff00000 /* OS-specific */
++#define PF_MASKPROC 0xf0000000 /* Processor-specific */
++
++/* Legal values for note segment descriptor types for core files. */
++
++#define NT_PRSTATUS 1 /* Contains copy of prstatus struct */
++#define NT_FPREGSET 2 /* Contains copy of fpregset struct */
++#define NT_PRPSINFO 3 /* Contains copy of prpsinfo struct */
++#define NT_PRXREG 4 /* Contains copy of prxregset struct */
++#define NT_TASKSTRUCT 4 /* Contains copy of task structure */
++#define NT_PLATFORM 5 /* String from sysinfo(SI_PLATFORM) */
++#define NT_AUXV 6 /* Contains copy of auxv array */
++#define NT_GWINDOWS 7 /* Contains copy of gwindows struct */
++#define NT_ASRS 8 /* Contains copy of asrset struct */
++#define NT_PSTATUS 10 /* Contains copy of pstatus struct */
++#define NT_PSINFO 13 /* Contains copy of psinfo struct */
++#define NT_PRCRED 14 /* Contains copy of prcred struct */
++#define NT_UTSNAME 15 /* Contains copy of utsname struct */
++#define NT_LWPSTATUS 16 /* Contains copy of lwpstatus struct */
++#define NT_LWPSINFO 17 /* Contains copy of lwpinfo struct */
++#define NT_PRFPXREG 20 /* Contains copy of fprxregset struct*/
++
++/* Legal values for the note segment descriptor types for object files. */
++
++#define NT_VERSION 1 /* Contains a version string. */
++
++
++/* Dynamic section entry. */
++
++typedef struct
++{
++ Elf32_Sword d_tag; /* Dynamic entry type */
++ union
++ {
++ Elf32_Word d_val; /* Integer value */
++ Elf32_Addr d_ptr; /* Address value */
++ } d_un;
++} Elf32_Dyn;
++
++typedef struct
++{
++ Elf64_Sxword d_tag; /* Dynamic entry type */
++ union
++ {
++ Elf64_Xword d_val; /* Integer value */
++ Elf64_Addr d_ptr; /* Address value */
++ } d_un;
++} Elf64_Dyn;
++
++/* Legal values for d_tag (dynamic entry type). */
++
++#define DT_NULL 0 /* Marks end of dynamic section */
++#define DT_NEEDED 1 /* Name of needed library */
++#define DT_PLTRELSZ 2 /* Size in bytes of PLT relocs */
++#define DT_PLTGOT 3 /* Processor defined value */
++#define DT_HASH 4 /* Address of symbol hash table */
++#define DT_STRTAB 5 /* Address of string table */
++#define DT_SYMTAB 6 /* Address of symbol table */
++#define DT_RELA 7 /* Address of Rela relocs */
++#define DT_RELASZ 8 /* Total size of Rela relocs */
++#define DT_RELAENT 9 /* Size of one Rela reloc */
++#define DT_STRSZ 10 /* Size of string table */
++#define DT_SYMENT 11 /* Size of one symbol table entry */
++#define DT_INIT 12 /* Address of init function */
++#define DT_FINI 13 /* Address of termination function */
++#define DT_SONAME 14 /* Name of shared object */
++#define DT_RPATH 15 /* Library search path (deprecated) */
++#define DT_SYMBOLIC 16 /* Start symbol search here */
++#define DT_REL 17 /* Address of Rel relocs */
++#define DT_RELSZ 18 /* Total size of Rel relocs */
++#define DT_RELENT 19 /* Size of one Rel reloc */
++#define DT_PLTREL 20 /* Type of reloc in PLT */
++#define DT_DEBUG 21 /* For debugging; unspecified */
++#define DT_TEXTREL 22 /* Reloc might modify .text */
++#define DT_JMPREL 23 /* Address of PLT relocs */
++#define DT_BIND_NOW 24 /* Process relocations of object */
++#define DT_INIT_ARRAY 25 /* Array with addresses of init fct */
++#define DT_FINI_ARRAY 26 /* Array with addresses of fini fct */
++#define DT_INIT_ARRAYSZ 27 /* Size in bytes of DT_INIT_ARRAY */
++#define DT_FINI_ARRAYSZ 28 /* Size in bytes of DT_FINI_ARRAY */
++#define DT_RUNPATH 29 /* Library search path */
++#define DT_FLAGS 30 /* Flags for the object being loaded */
++#define DT_ENCODING 32 /* Start of encoded range */
++#define DT_PREINIT_ARRAY 32 /* Array with addresses of preinit fct*/
++#define DT_PREINIT_ARRAYSZ 33 /* size in bytes of DT_PREINIT_ARRAY */
++#define DT_NUM 34 /* Number used */
++#define DT_LOOS 0x6000000d /* Start of OS-specific */
++#define DT_HIOS 0x6ffff000 /* End of OS-specific */
++#define DT_LOPROC 0x70000000 /* Start of processor-specific */
++#define DT_HIPROC 0x7fffffff /* End of processor-specific */
++#define DT_PROCNUM DT_MIPS_NUM /* Most used by any processor */
++
++/* DT_* entries which fall between DT_VALRNGHI & DT_VALRNGLO use the
++ Dyn.d_un.d_val field of the Elf*_Dyn structure. This follows Sun's
++ approach. */
++#define DT_VALRNGLO 0x6ffffd00
++#define DT_GNU_PRELINKED 0x6ffffdf5 /* Prelinking timestamp */
++#define DT_GNU_CONFLICTSZ 0x6ffffdf6 /* Size of conflict section */
++#define DT_GNU_LIBLISTSZ 0x6ffffdf7 /* Size of library list */
++#define DT_CHECKSUM 0x6ffffdf8
++#define DT_PLTPADSZ 0x6ffffdf9
++#define DT_MOVEENT 0x6ffffdfa
++#define DT_MOVESZ 0x6ffffdfb
++#define DT_FEATURE_1 0x6ffffdfc /* Feature selection (DTF_*). */
++#define DT_POSFLAG_1 0x6ffffdfd /* Flags for DT_* entries, effecting
++ the following DT_* entry. */
++#define DT_SYMINSZ 0x6ffffdfe /* Size of syminfo table (in bytes) */
++#define DT_SYMINENT 0x6ffffdff /* Entry size of syminfo */
++#define DT_VALRNGHI 0x6ffffdff
++#define DT_VALTAGIDX(tag) (DT_VALRNGHI - (tag)) /* Reverse order! */
++#define DT_VALNUM 12
++
++/* DT_* entries which fall between DT_ADDRRNGHI & DT_ADDRRNGLO use the
++ Dyn.d_un.d_ptr field of the Elf*_Dyn structure.
++
++ If any adjustment is made to the ELF object after it has been
++ built these entries will need to be adjusted. */
++#define DT_ADDRRNGLO 0x6ffffe00
++#define DT_GNU_HASH 0x6ffffef5 /* GNU-style hash table. */
++#define DT_TLSDESC_PLT 0x6ffffef6
++#define DT_TLSDESC_GOT 0x6ffffef7
++#define DT_GNU_CONFLICT 0x6ffffef8 /* Start of conflict section */
++#define DT_GNU_LIBLIST 0x6ffffef9 /* Library list */
++#define DT_CONFIG 0x6ffffefa /* Configuration information. */
++#define DT_DEPAUDIT 0x6ffffefb /* Dependency auditing. */
++#define DT_AUDIT 0x6ffffefc /* Object auditing. */
++#define DT_PLTPAD 0x6ffffefd /* PLT padding. */
++#define DT_MOVETAB 0x6ffffefe /* Move table. */
++#define DT_SYMINFO 0x6ffffeff /* Syminfo table. */
++#define DT_ADDRRNGHI 0x6ffffeff
++#define DT_ADDRTAGIDX(tag) (DT_ADDRRNGHI - (tag)) /* Reverse order! */
++#define DT_ADDRNUM 11
++
++/* The versioning entry types. The next are defined as part of the
++ GNU extension. */
++#define DT_VERSYM 0x6ffffff0
++
++#define DT_RELACOUNT 0x6ffffff9
++#define DT_RELCOUNT 0x6ffffffa
++
++/* These were chosen by Sun. */
++#define DT_FLAGS_1 0x6ffffffb /* State flags, see DF_1_* below. */
++#define DT_VERDEF 0x6ffffffc /* Address of version definition
++ table */
++#define DT_VERDEFNUM 0x6ffffffd /* Number of version definitions */
++#define DT_VERNEED 0x6ffffffe /* Address of table with needed
++ versions */
++#define DT_VERNEEDNUM 0x6fffffff /* Number of needed versions */
++#define DT_VERSIONTAGIDX(tag) (DT_VERNEEDNUM - (tag)) /* Reverse order! */
++#define DT_VERSIONTAGNUM 16
++
++/* Sun added these machine-independent extensions in the "processor-specific"
++ range. Be compatible. */
++#define DT_AUXILIARY 0x7ffffffd /* Shared object to load before self */
++#define DT_FILTER 0x7fffffff /* Shared object to get values from */
++#define DT_EXTRATAGIDX(tag) ((Elf32_Word)-((Elf32_Sword) (tag) <<1>>1)-1)
++#define DT_EXTRANUM 3
++
++/* Values of `d_un.d_val' in the DT_FLAGS entry. */
++#define DF_ORIGIN 0x00000001 /* Object may use DF_ORIGIN */
++#define DF_SYMBOLIC 0x00000002 /* Symbol resolutions starts here */
++#define DF_TEXTREL 0x00000004 /* Object contains text relocations */
++#define DF_BIND_NOW 0x00000008 /* No lazy binding for this object */
++#define DF_STATIC_TLS 0x00000010 /* Module uses the static TLS model */
++
++/* State flags selectable in the `d_un.d_val' element of the DT_FLAGS_1
++ entry in the dynamic section. */
++#define DF_1_NOW 0x00000001 /* Set RTLD_NOW for this object. */
++#define DF_1_GLOBAL 0x00000002 /* Set RTLD_GLOBAL for this object. */
++#define DF_1_GROUP 0x00000004 /* Set RTLD_GROUP for this object. */
++#define DF_1_NODELETE 0x00000008 /* Set RTLD_NODELETE for this object.*/
++#define DF_1_LOADFLTR 0x00000010 /* Trigger filtee loading at runtime.*/
++#define DF_1_INITFIRST 0x00000020 /* Set RTLD_INITFIRST for this object*/
++#define DF_1_NOOPEN 0x00000040 /* Set RTLD_NOOPEN for this object. */
++#define DF_1_ORIGIN 0x00000080 /* $ORIGIN must be handled. */
++#define DF_1_DIRECT 0x00000100 /* Direct binding enabled. */
++#define DF_1_TRANS 0x00000200
++#define DF_1_INTERPOSE 0x00000400 /* Object is used to interpose. */
++#define DF_1_NODEFLIB 0x00000800 /* Ignore default lib search path. */
++#define DF_1_NODUMP 0x00001000 /* Object can't be dldump'ed. */
++#define DF_1_CONFALT 0x00002000 /* Configuration alternative created.*/
++#define DF_1_ENDFILTEE 0x00004000 /* Filtee terminates filters search. */
++#define DF_1_DISPRELDNE 0x00008000 /* Disp reloc applied at build time. */
++#define DF_1_DISPRELPND 0x00010000 /* Disp reloc applied at run-time. */
++
++/* Flags for the feature selection in DT_FEATURE_1. */
++#define DTF_1_PARINIT 0x00000001
++#define DTF_1_CONFEXP 0x00000002
++
++/* Flags in the DT_POSFLAG_1 entry effecting only the next DT_* entry. */
++#define DF_P1_LAZYLOAD 0x00000001 /* Lazyload following object. */
++#define DF_P1_GROUPPERM 0x00000002 /* Symbols from next object are not
++ generally available. */
++
++/* Version definition sections. */
++
++typedef struct
++{
++ Elf32_Half vd_version; /* Version revision */
++ Elf32_Half vd_flags; /* Version information */
++ Elf32_Half vd_ndx; /* Version Index */
++ Elf32_Half vd_cnt; /* Number of associated aux entries */
++ Elf32_Word vd_hash; /* Version name hash value */
++ Elf32_Word vd_aux; /* Offset in bytes to verdaux array */
++ Elf32_Word vd_next; /* Offset in bytes to next verdef
++ entry */
++} Elf32_Verdef;
++
++typedef struct
++{
++ Elf64_Half vd_version; /* Version revision */
++ Elf64_Half vd_flags; /* Version information */
++ Elf64_Half vd_ndx; /* Version Index */
++ Elf64_Half vd_cnt; /* Number of associated aux entries */
++ Elf64_Word vd_hash; /* Version name hash value */
++ Elf64_Word vd_aux; /* Offset in bytes to verdaux array */
++ Elf64_Word vd_next; /* Offset in bytes to next verdef
++ entry */
++} Elf64_Verdef;
++
++
++/* Legal values for vd_version (version revision). */
++#define VER_DEF_NONE 0 /* No version */
++#define VER_DEF_CURRENT 1 /* Current version */
++#define VER_DEF_NUM 2 /* Given version number */
++
++/* Legal values for vd_flags (version information flags). */
++#define VER_FLG_BASE 0x1 /* Version definition of file itself */
++#define VER_FLG_WEAK 0x2 /* Weak version identifier */
++
++/* Versym symbol index values. */
++#define VER_NDX_LOCAL 0 /* Symbol is local. */
++#define VER_NDX_GLOBAL 1 /* Symbol is global. */
++#define VER_NDX_LORESERVE 0xff00 /* Beginning of reserved entries. */
++#define VER_NDX_ELIMINATE 0xff01 /* Symbol is to be eliminated. */
++
++/* Auxialiary version information. */
++
++typedef struct
++{
++ Elf32_Word vda_name; /* Version or dependency names */
++ Elf32_Word vda_next; /* Offset in bytes to next verdaux
++ entry */
++} Elf32_Verdaux;
++
++typedef struct
++{
++ Elf64_Word vda_name; /* Version or dependency names */
++ Elf64_Word vda_next; /* Offset in bytes to next verdaux
++ entry */
++} Elf64_Verdaux;
++
++
++/* Version dependency section. */
++
++typedef struct
++{
++ Elf32_Half vn_version; /* Version of structure */
++ Elf32_Half vn_cnt; /* Number of associated aux entries */
++ Elf32_Word vn_file; /* Offset of filename for this
++ dependency */
++ Elf32_Word vn_aux; /* Offset in bytes to vernaux array */
++ Elf32_Word vn_next; /* Offset in bytes to next verneed
++ entry */
++} Elf32_Verneed;
++
++typedef struct
++{
++ Elf64_Half vn_version; /* Version of structure */
++ Elf64_Half vn_cnt; /* Number of associated aux entries */
++ Elf64_Word vn_file; /* Offset of filename for this
++ dependency */
++ Elf64_Word vn_aux; /* Offset in bytes to vernaux array */
++ Elf64_Word vn_next; /* Offset in bytes to next verneed
++ entry */
++} Elf64_Verneed;
++
++
++/* Legal values for vn_version (version revision). */
++#define VER_NEED_NONE 0 /* No version */
++#define VER_NEED_CURRENT 1 /* Current version */
++#define VER_NEED_NUM 2 /* Given version number */
++
++/* Auxiliary needed version information. */
++
++typedef struct
++{
++ Elf32_Word vna_hash; /* Hash value of dependency name */
++ Elf32_Half vna_flags; /* Dependency specific information */
++ Elf32_Half vna_other; /* Unused */
++ Elf32_Word vna_name; /* Dependency name string offset */
++ Elf32_Word vna_next; /* Offset in bytes to next vernaux
++ entry */
++} Elf32_Vernaux;
++
++typedef struct
++{
++ Elf64_Word vna_hash; /* Hash value of dependency name */
++ Elf64_Half vna_flags; /* Dependency specific information */
++ Elf64_Half vna_other; /* Unused */
++ Elf64_Word vna_name; /* Dependency name string offset */
++ Elf64_Word vna_next; /* Offset in bytes to next vernaux
++ entry */
++} Elf64_Vernaux;
++
++
++/* Legal values for vna_flags. */
++#define VER_FLG_WEAK 0x2 /* Weak version identifier */
++
++
++/* Auxiliary vector. */
++
++/* This vector is normally only used by the program interpreter. The
++ usual definition in an ABI supplement uses the name auxv_t. The
++ vector is not usually defined in a standard <elf.h> file, but it
++ can't hurt. We rename it to avoid conflicts. The sizes of these
++ types are an arrangement between the exec server and the program
++ interpreter, so we don't fully specify them here. */
++
++typedef struct
++{
++ uint32_t a_type; /* Entry type */
++ union
++ {
++ uint32_t a_val; /* Integer value */
++ /* We use to have pointer elements added here. We cannot do that,
++ though, since it does not work when using 32-bit definitions
++ on 64-bit platforms and vice versa. */
++ } a_un;
++} Elf32_auxv_t;
++
++typedef struct
++{
++ uint64_t a_type; /* Entry type */
++ union
++ {
++ uint64_t a_val; /* Integer value */
++ /* We use to have pointer elements added here. We cannot do that,
++ though, since it does not work when using 32-bit definitions
++ on 64-bit platforms and vice versa. */
++ } a_un;
++} Elf64_auxv_t;
++
++/* Legal values for a_type (entry type). */
++
++#define AT_NULL 0 /* End of vector */
++#define AT_IGNORE 1 /* Entry should be ignored */
++#define AT_EXECFD 2 /* File descriptor of program */
++#define AT_PHDR 3 /* Program headers for program */
++#define AT_PHENT 4 /* Size of program header entry */
++#define AT_PHNUM 5 /* Number of program headers */
++#define AT_PAGESZ 6 /* System page size */
++#define AT_BASE 7 /* Base address of interpreter */
++#define AT_FLAGS 8 /* Flags */
++#define AT_ENTRY 9 /* Entry point of program */
++#define AT_NOTELF 10 /* Program is not ELF */
++#define AT_UID 11 /* Real uid */
++#define AT_EUID 12 /* Effective uid */
++#define AT_GID 13 /* Real gid */
++#define AT_EGID 14 /* Effective gid */
++#define AT_CLKTCK 17 /* Frequency of times() */
++
++/* Some more special a_type values describing the hardware. */
++#define AT_PLATFORM 15 /* String identifying platform. */
++#define AT_HWCAP 16 /* Machine dependent hints about
++ processor capabilities. */
++
++/* This entry gives some information about the FPU initialization
++ performed by the kernel. */
++#define AT_FPUCW 18 /* Used FPU control word. */
++
++/* Cache block sizes. */
++#define AT_DCACHEBSIZE 19 /* Data cache block size. */
++#define AT_ICACHEBSIZE 20 /* Instruction cache block size. */
++#define AT_UCACHEBSIZE 21 /* Unified cache block size. */
++
++/* A special ignored value for PPC, used by the kernel to control the
++ interpretation of the AUXV. Must be > 16. */
++#define AT_IGNOREPPC 22 /* Entry should be ignored. */
++
++#define AT_SECURE 23 /* Boolean, was exec setuid-like? */
++
++/* Pointer to the global system page used for system calls and other
++ nice things. */
++#define AT_SYSINFO 32
++#define AT_SYSINFO_EHDR 33
++
++/* Shapes of the caches. Bits 0-3 contains associativity; bits 4-7 contains
++ log2 of line size; mask those to get cache size. */
++#define AT_L1I_CACHESHAPE 34
++#define AT_L1D_CACHESHAPE 35
++#define AT_L2_CACHESHAPE 36
++#define AT_L3_CACHESHAPE 37
++
++/* Note section contents. Each entry in the note section begins with
++ a header of a fixed form. */
++
++typedef struct
++{
++ Elf32_Word n_namesz; /* Length of the note's name. */
++ Elf32_Word n_descsz; /* Length of the note's descriptor. */
++ Elf32_Word n_type; /* Type of the note. */
++} Elf32_Nhdr;
++
++typedef struct
++{
++ Elf64_Word n_namesz; /* Length of the note's name. */
++ Elf64_Word n_descsz; /* Length of the note's descriptor. */
++ Elf64_Word n_type; /* Type of the note. */
++} Elf64_Nhdr;
++
++/* Known names of notes. */
++
++/* Solaris entries in the note section have this name. */
++#define ELF_NOTE_SOLARIS "SUNW Solaris"
++
++/* Note entries for GNU systems have this name. */
++#define ELF_NOTE_GNU "GNU"
++
++
++/* Defined types of notes for Solaris. */
++
++/* Value of descriptor (one word) is desired pagesize for the binary. */
++#define ELF_NOTE_PAGESIZE_HINT 1
++
++
++/* Defined note types for GNU systems. */
++
++/* ABI information. The descriptor consists of words:
++ word 0: OS descriptor
++ word 1: major version of the ABI
++ word 2: minor version of the ABI
++ word 3: subminor version of the ABI
++*/
++#define ELF_NOTE_ABI 1
++
++/* Known OSes. These value can appear in word 0 of an ELF_NOTE_ABI
++ note section entry. */
++#define ELF_NOTE_OS_LINUX 0
++#define ELF_NOTE_OS_GNU 1
++#define ELF_NOTE_OS_SOLARIS2 2
++#define ELF_NOTE_OS_FREEBSD 3
++
++
++/* Move records. */
++typedef struct
++{
++ Elf32_Xword m_value; /* Symbol value. */
++ Elf32_Word m_info; /* Size and index. */
++ Elf32_Word m_poffset; /* Symbol offset. */
++ Elf32_Half m_repeat; /* Repeat count. */
++ Elf32_Half m_stride; /* Stride info. */
++} Elf32_Move;
++
++typedef struct
++{
++ Elf64_Xword m_value; /* Symbol value. */
++ Elf64_Xword m_info; /* Size and index. */
++ Elf64_Xword m_poffset; /* Symbol offset. */
++ Elf64_Half m_repeat; /* Repeat count. */
++ Elf64_Half m_stride; /* Stride info. */
++} Elf64_Move;
++
++/* Macro to construct move records. */
++#define ELF32_M_SYM(info) ((info) >> 8)
++#define ELF32_M_SIZE(info) ((unsigned char) (info))
++#define ELF32_M_INFO(sym, size) (((sym) << 8) + (unsigned char) (size))
++
++#define ELF64_M_SYM(info) ELF32_M_SYM (info)
++#define ELF64_M_SIZE(info) ELF32_M_SIZE (info)
++#define ELF64_M_INFO(sym, size) ELF32_M_INFO (sym, size)
++
++
++/* Motorola 68k specific definitions. */
++
++/* Values for Elf32_Ehdr.e_flags. */
++#define EF_CPU32 0x00810000
++
++/* m68k relocs. */
++
++#define R_68K_NONE 0 /* No reloc */
++#define R_68K_32 1 /* Direct 32 bit */
++#define R_68K_16 2 /* Direct 16 bit */
++#define R_68K_8 3 /* Direct 8 bit */
++#define R_68K_PC32 4 /* PC relative 32 bit */
++#define R_68K_PC16 5 /* PC relative 16 bit */
++#define R_68K_PC8 6 /* PC relative 8 bit */
++#define R_68K_GOT32 7 /* 32 bit PC relative GOT entry */
++#define R_68K_GOT16 8 /* 16 bit PC relative GOT entry */
++#define R_68K_GOT8 9 /* 8 bit PC relative GOT entry */
++#define R_68K_GOT32O 10 /* 32 bit GOT offset */
++#define R_68K_GOT16O 11 /* 16 bit GOT offset */
++#define R_68K_GOT8O 12 /* 8 bit GOT offset */
++#define R_68K_PLT32 13 /* 32 bit PC relative PLT address */
++#define R_68K_PLT16 14 /* 16 bit PC relative PLT address */
++#define R_68K_PLT8 15 /* 8 bit PC relative PLT address */
++#define R_68K_PLT32O 16 /* 32 bit PLT offset */
++#define R_68K_PLT16O 17 /* 16 bit PLT offset */
++#define R_68K_PLT8O 18 /* 8 bit PLT offset */
++#define R_68K_COPY 19 /* Copy symbol at runtime */
++#define R_68K_GLOB_DAT 20 /* Create GOT entry */
++#define R_68K_JMP_SLOT 21 /* Create PLT entry */
++#define R_68K_RELATIVE 22 /* Adjust by program base */
++/* Keep this the last entry. */
++#define R_68K_NUM 23
++
++/* Intel 80386 specific definitions. */
++
++/* i386 relocs. */
++
++#define R_386_NONE 0 /* No reloc */
++#define R_386_32 1 /* Direct 32 bit */
++#define R_386_PC32 2 /* PC relative 32 bit */
++#define R_386_GOT32 3 /* 32 bit GOT entry */
++#define R_386_PLT32 4 /* 32 bit PLT address */
++#define R_386_COPY 5 /* Copy symbol at runtime */
++#define R_386_GLOB_DAT 6 /* Create GOT entry */
++#define R_386_JMP_SLOT 7 /* Create PLT entry */
++#define R_386_RELATIVE 8 /* Adjust by program base */
++#define R_386_GOTOFF 9 /* 32 bit offset to GOT */
++#define R_386_GOTPC 10 /* 32 bit PC relative offset to GOT */
++#define R_386_32PLT 11
++#define R_386_TLS_TPOFF 14 /* Offset in static TLS block */
++#define R_386_TLS_IE 15 /* Address of GOT entry for static TLS
++ block offset */
++#define R_386_TLS_GOTIE 16 /* GOT entry for static TLS block
++ offset */
++#define R_386_TLS_LE 17 /* Offset relative to static TLS
++ block */
++#define R_386_TLS_GD 18 /* Direct 32 bit for GNU version of
++ general dynamic thread local data */
++#define R_386_TLS_LDM 19 /* Direct 32 bit for GNU version of
++ local dynamic thread local data
++ in LE code */
++#define R_386_16 20
++#define R_386_PC16 21
++#define R_386_8 22
++#define R_386_PC8 23
++#define R_386_TLS_GD_32 24 /* Direct 32 bit for general dynamic
++ thread local data */
++#define R_386_TLS_GD_PUSH 25 /* Tag for pushl in GD TLS code */
++#define R_386_TLS_GD_CALL 26 /* Relocation for call to
++ __tls_get_addr() */
++#define R_386_TLS_GD_POP 27 /* Tag for popl in GD TLS code */
++#define R_386_TLS_LDM_32 28 /* Direct 32 bit for local dynamic
++ thread local data in LE code */
++#define R_386_TLS_LDM_PUSH 29 /* Tag for pushl in LDM TLS code */
++#define R_386_TLS_LDM_CALL 30 /* Relocation for call to
++ __tls_get_addr() in LDM code */
++#define R_386_TLS_LDM_POP 31 /* Tag for popl in LDM TLS code */
++#define R_386_TLS_LDO_32 32 /* Offset relative to TLS block */
++#define R_386_TLS_IE_32 33 /* GOT entry for negated static TLS
++ block offset */
++#define R_386_TLS_LE_32 34 /* Negated offset relative to static
++ TLS block */
++#define R_386_TLS_DTPMOD32 35 /* ID of module containing symbol */
++#define R_386_TLS_DTPOFF32 36 /* Offset in TLS block */
++#define R_386_TLS_TPOFF32 37 /* Negated offset in static TLS block */
++/* Keep this the last entry. */
++#define R_386_NUM 38
++
++/* SUN SPARC specific definitions. */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type). */
++
++#define STT_SPARC_REGISTER 13 /* Global register reserved to app. */
++
++/* Values for Elf64_Ehdr.e_flags. */
++
++#define EF_SPARCV9_MM 3
++#define EF_SPARCV9_TSO 0
++#define EF_SPARCV9_PSO 1
++#define EF_SPARCV9_RMO 2
++#define EF_SPARC_LEDATA 0x800000 /* little endian data */
++#define EF_SPARC_EXT_MASK 0xFFFF00
++#define EF_SPARC_32PLUS 0x000100 /* generic V8+ features */
++#define EF_SPARC_SUN_US1 0x000200 /* Sun UltraSPARC1 extensions */
++#define EF_SPARC_HAL_R1 0x000400 /* HAL R1 extensions */
++#define EF_SPARC_SUN_US3 0x000800 /* Sun UltraSPARCIII extensions */
++
++/* SPARC relocs. */
++
++#define R_SPARC_NONE 0 /* No reloc */
++#define R_SPARC_8 1 /* Direct 8 bit */
++#define R_SPARC_16 2 /* Direct 16 bit */
++#define R_SPARC_32 3 /* Direct 32 bit */
++#define R_SPARC_DISP8 4 /* PC relative 8 bit */
++#define R_SPARC_DISP16 5 /* PC relative 16 bit */
++#define R_SPARC_DISP32 6 /* PC relative 32 bit */
++#define R_SPARC_WDISP30 7 /* PC relative 30 bit shifted */
++#define R_SPARC_WDISP22 8 /* PC relative 22 bit shifted */
++#define R_SPARC_HI22 9 /* High 22 bit */
++#define R_SPARC_22 10 /* Direct 22 bit */
++#define R_SPARC_13 11 /* Direct 13 bit */
++#define R_SPARC_LO10 12 /* Truncated 10 bit */
++#define R_SPARC_GOT10 13 /* Truncated 10 bit GOT entry */
++#define R_SPARC_GOT13 14 /* 13 bit GOT entry */
++#define R_SPARC_GOT22 15 /* 22 bit GOT entry shifted */
++#define R_SPARC_PC10 16 /* PC relative 10 bit truncated */
++#define R_SPARC_PC22 17 /* PC relative 22 bit shifted */
++#define R_SPARC_WPLT30 18 /* 30 bit PC relative PLT address */
++#define R_SPARC_COPY 19 /* Copy symbol at runtime */
++#define R_SPARC_GLOB_DAT 20 /* Create GOT entry */
++#define R_SPARC_JMP_SLOT 21 /* Create PLT entry */
++#define R_SPARC_RELATIVE 22 /* Adjust by program base */
++#define R_SPARC_UA32 23 /* Direct 32 bit unaligned */
++
++/* Additional Sparc64 relocs. */
++
++#define R_SPARC_PLT32 24 /* Direct 32 bit ref to PLT entry */
++#define R_SPARC_HIPLT22 25 /* High 22 bit PLT entry */
++#define R_SPARC_LOPLT10 26 /* Truncated 10 bit PLT entry */
++#define R_SPARC_PCPLT32 27 /* PC rel 32 bit ref to PLT entry */
++#define R_SPARC_PCPLT22 28 /* PC rel high 22 bit PLT entry */
++#define R_SPARC_PCPLT10 29 /* PC rel trunc 10 bit PLT entry */
++#define R_SPARC_10 30 /* Direct 10 bit */
++#define R_SPARC_11 31 /* Direct 11 bit */
++#define R_SPARC_64 32 /* Direct 64 bit */
++#define R_SPARC_OLO10 33 /* 10bit with secondary 13bit addend */
++#define R_SPARC_HH22 34 /* Top 22 bits of direct 64 bit */
++#define R_SPARC_HM10 35 /* High middle 10 bits of ... */
++#define R_SPARC_LM22 36 /* Low middle 22 bits of ... */
++#define R_SPARC_PC_HH22 37 /* Top 22 bits of pc rel 64 bit */
++#define R_SPARC_PC_HM10 38 /* High middle 10 bit of ... */
++#define R_SPARC_PC_LM22 39 /* Low miggle 22 bits of ... */
++#define R_SPARC_WDISP16 40 /* PC relative 16 bit shifted */
++#define R_SPARC_WDISP19 41 /* PC relative 19 bit shifted */
++#define R_SPARC_7 43 /* Direct 7 bit */
++#define R_SPARC_5 44 /* Direct 5 bit */
++#define R_SPARC_6 45 /* Direct 6 bit */
++#define R_SPARC_DISP64 46 /* PC relative 64 bit */
++#define R_SPARC_PLT64 47 /* Direct 64 bit ref to PLT entry */
++#define R_SPARC_HIX22 48 /* High 22 bit complemented */
++#define R_SPARC_LOX10 49 /* Truncated 11 bit complemented */
++#define R_SPARC_H44 50 /* Direct high 12 of 44 bit */
++#define R_SPARC_M44 51 /* Direct mid 22 of 44 bit */
++#define R_SPARC_L44 52 /* Direct low 10 of 44 bit */
++#define R_SPARC_REGISTER 53 /* Global register usage */
++#define R_SPARC_UA64 54 /* Direct 64 bit unaligned */
++#define R_SPARC_UA16 55 /* Direct 16 bit unaligned */
++#define R_SPARC_TLS_GD_HI22 56
++#define R_SPARC_TLS_GD_LO10 57
++#define R_SPARC_TLS_GD_ADD 58
++#define R_SPARC_TLS_GD_CALL 59
++#define R_SPARC_TLS_LDM_HI22 60
++#define R_SPARC_TLS_LDM_LO10 61
++#define R_SPARC_TLS_LDM_ADD 62
++#define R_SPARC_TLS_LDM_CALL 63
++#define R_SPARC_TLS_LDO_HIX22 64
++#define R_SPARC_TLS_LDO_LOX10 65
++#define R_SPARC_TLS_LDO_ADD 66
++#define R_SPARC_TLS_IE_HI22 67
++#define R_SPARC_TLS_IE_LO10 68
++#define R_SPARC_TLS_IE_LD 69
++#define R_SPARC_TLS_IE_LDX 70
++#define R_SPARC_TLS_IE_ADD 71
++#define R_SPARC_TLS_LE_HIX22 72
++#define R_SPARC_TLS_LE_LOX10 73
++#define R_SPARC_TLS_DTPMOD32 74
++#define R_SPARC_TLS_DTPMOD64 75
++#define R_SPARC_TLS_DTPOFF32 76
++#define R_SPARC_TLS_DTPOFF64 77
++#define R_SPARC_TLS_TPOFF32 78
++#define R_SPARC_TLS_TPOFF64 79
++/* Keep this the last entry. */
++#define R_SPARC_NUM 80
++
++/* For Sparc64, legal values for d_tag of Elf64_Dyn. */
++
++#define DT_SPARC_REGISTER 0x70000001
++#define DT_SPARC_NUM 2
++
++/* Bits present in AT_HWCAP on SPARC. */
++
++#define HWCAP_SPARC_FLUSH 1 /* The CPU supports flush insn. */
++#define HWCAP_SPARC_STBAR 2
++#define HWCAP_SPARC_SWAP 4
++#define HWCAP_SPARC_MULDIV 8
++#define HWCAP_SPARC_V9 16 /* The CPU is v9, so v8plus is ok. */
++#define HWCAP_SPARC_ULTRA3 32
++#define HWCAP_SPARC_BLKINIT 64 /* Sun4v with block-init/load-twin. */
++
++/* MIPS R3000 specific definitions. */
++
++/* Legal values for e_flags field of Elf32_Ehdr. */
++
++#define EF_MIPS_NOREORDER 1 /* A .noreorder directive was used */
++#define EF_MIPS_PIC 2 /* Contains PIC code */
++#define EF_MIPS_CPIC 4 /* Uses PIC calling sequence */
++#define EF_MIPS_XGOT 8
++#define EF_MIPS_64BIT_WHIRL 16
++#define EF_MIPS_ABI2 32
++#define EF_MIPS_ABI_ON32 64
++#define EF_MIPS_ARCH 0xf0000000 /* MIPS architecture level */
++
++/* Legal values for MIPS architecture level. */
++
++#define EF_MIPS_ARCH_1 0x00000000 /* -mips1 code. */
++#define EF_MIPS_ARCH_2 0x10000000 /* -mips2 code. */
++#define EF_MIPS_ARCH_3 0x20000000 /* -mips3 code. */
++#define EF_MIPS_ARCH_4 0x30000000 /* -mips4 code. */
++#define EF_MIPS_ARCH_5 0x40000000 /* -mips5 code. */
++#define EF_MIPS_ARCH_32 0x60000000 /* MIPS32 code. */
++#define EF_MIPS_ARCH_64 0x70000000 /* MIPS64 code. */
++
++/* The following are non-official names and should not be used. */
++
++#define E_MIPS_ARCH_1 0x00000000 /* -mips1 code. */
++#define E_MIPS_ARCH_2 0x10000000 /* -mips2 code. */
++#define E_MIPS_ARCH_3 0x20000000 /* -mips3 code. */
++#define E_MIPS_ARCH_4 0x30000000 /* -mips4 code. */
++#define E_MIPS_ARCH_5 0x40000000 /* -mips5 code. */
++#define E_MIPS_ARCH_32 0x60000000 /* MIPS32 code. */
++#define E_MIPS_ARCH_64 0x70000000 /* MIPS64 code. */
++
++/* Special section indices. */
++
++#define SHN_MIPS_ACOMMON 0xff00 /* Allocated common symbols */
++#define SHN_MIPS_TEXT 0xff01 /* Allocated test symbols. */
++#define SHN_MIPS_DATA 0xff02 /* Allocated data symbols. */
++#define SHN_MIPS_SCOMMON 0xff03 /* Small common symbols */
++#define SHN_MIPS_SUNDEFINED 0xff04 /* Small undefined symbols */
++
++/* Legal values for sh_type field of Elf32_Shdr. */
++
++#define SHT_MIPS_LIBLIST 0x70000000 /* Shared objects used in link */
++#define SHT_MIPS_MSYM 0x70000001
++#define SHT_MIPS_CONFLICT 0x70000002 /* Conflicting symbols */
++#define SHT_MIPS_GPTAB 0x70000003 /* Global data area sizes */
++#define SHT_MIPS_UCODE 0x70000004 /* Reserved for SGI/MIPS compilers */
++#define SHT_MIPS_DEBUG 0x70000005 /* MIPS ECOFF debugging information*/
++#define SHT_MIPS_REGINFO 0x70000006 /* Register usage information */
++#define SHT_MIPS_PACKAGE 0x70000007
++#define SHT_MIPS_PACKSYM 0x70000008
++#define SHT_MIPS_RELD 0x70000009
++#define SHT_MIPS_IFACE 0x7000000b
++#define SHT_MIPS_CONTENT 0x7000000c
++#define SHT_MIPS_OPTIONS 0x7000000d /* Miscellaneous options. */
++#define SHT_MIPS_SHDR 0x70000010
++#define SHT_MIPS_FDESC 0x70000011
++#define SHT_MIPS_EXTSYM 0x70000012
++#define SHT_MIPS_DENSE 0x70000013
++#define SHT_MIPS_PDESC 0x70000014
++#define SHT_MIPS_LOCSYM 0x70000015
++#define SHT_MIPS_AUXSYM 0x70000016
++#define SHT_MIPS_OPTSYM 0x70000017
++#define SHT_MIPS_LOCSTR 0x70000018
++#define SHT_MIPS_LINE 0x70000019
++#define SHT_MIPS_RFDESC 0x7000001a
++#define SHT_MIPS_DELTASYM 0x7000001b
++#define SHT_MIPS_DELTAINST 0x7000001c
++#define SHT_MIPS_DELTACLASS 0x7000001d
++#define SHT_MIPS_DWARF 0x7000001e /* DWARF debugging information. */
++#define SHT_MIPS_DELTADECL 0x7000001f
++#define SHT_MIPS_SYMBOL_LIB 0x70000020
++#define SHT_MIPS_EVENTS 0x70000021 /* Event section. */
++#define SHT_MIPS_TRANSLATE 0x70000022
++#define SHT_MIPS_PIXIE 0x70000023
++#define SHT_MIPS_XLATE 0x70000024
++#define SHT_MIPS_XLATE_DEBUG 0x70000025
++#define SHT_MIPS_WHIRL 0x70000026
++#define SHT_MIPS_EH_REGION 0x70000027
++#define SHT_MIPS_XLATE_OLD 0x70000028
++#define SHT_MIPS_PDR_EXCEPTION 0x70000029
++
++/* Legal values for sh_flags field of Elf32_Shdr. */
++
++#define SHF_MIPS_GPREL 0x10000000 /* Must be part of global data area */
++#define SHF_MIPS_MERGE 0x20000000
++#define SHF_MIPS_ADDR 0x40000000
++#define SHF_MIPS_STRINGS 0x80000000
++#define SHF_MIPS_NOSTRIP 0x08000000
++#define SHF_MIPS_LOCAL 0x04000000
++#define SHF_MIPS_NAMES 0x02000000
++#define SHF_MIPS_NODUPE 0x01000000
++
++
++/* Symbol tables. */
++
++/* MIPS specific values for `st_other'. */
++#define STO_MIPS_DEFAULT 0x0
++#define STO_MIPS_INTERNAL 0x1
++#define STO_MIPS_HIDDEN 0x2
++#define STO_MIPS_PROTECTED 0x3
++#define STO_MIPS_SC_ALIGN_UNUSED 0xff
++
++/* MIPS specific values for `st_info'. */
++#define STB_MIPS_SPLIT_COMMON 13
++
++/* Entries found in sections of type SHT_MIPS_GPTAB. */
++
++typedef union
++{
++ struct
++ {
++ Elf32_Word gt_current_g_value; /* -G value used for compilation */
++ Elf32_Word gt_unused; /* Not used */
++ } gt_header; /* First entry in section */
++ struct
++ {
++ Elf32_Word gt_g_value; /* If this value were used for -G */
++ Elf32_Word gt_bytes; /* This many bytes would be used */
++ } gt_entry; /* Subsequent entries in section */
++} Elf32_gptab;
++
++/* Entry found in sections of type SHT_MIPS_REGINFO. */
++
++typedef struct
++{
++ Elf32_Word ri_gprmask; /* General registers used */
++ Elf32_Word ri_cprmask[4]; /* Coprocessor registers used */
++ Elf32_Sword ri_gp_value; /* $gp register value */
++} Elf32_RegInfo;
++
++/* Entries found in sections of type SHT_MIPS_OPTIONS. */
++
++typedef struct
++{
++ unsigned char kind; /* Determines interpretation of the
++ variable part of descriptor. */
++ unsigned char size; /* Size of descriptor, including header. */
++ Elf32_Section section; /* Section header index of section affected,
++ 0 for global options. */
++ Elf32_Word info; /* Kind-specific information. */
++} Elf_Options;
++
++/* Values for `kind' field in Elf_Options. */
++
++#define ODK_NULL 0 /* Undefined. */
++#define ODK_REGINFO 1 /* Register usage information. */
++#define ODK_EXCEPTIONS 2 /* Exception processing options. */
++#define ODK_PAD 3 /* Section padding options. */
++#define ODK_HWPATCH 4 /* Hardware workarounds performed */
++#define ODK_FILL 5 /* record the fill value used by the linker. */
++#define ODK_TAGS 6 /* reserve space for desktop tools to write. */
++#define ODK_HWAND 7 /* HW workarounds. 'AND' bits when merging. */
++#define ODK_HWOR 8 /* HW workarounds. 'OR' bits when merging. */
++
++/* Values for `info' in Elf_Options for ODK_EXCEPTIONS entries. */
++
++#define OEX_FPU_MIN 0x1f /* FPE's which MUST be enabled. */
++#define OEX_FPU_MAX 0x1f00 /* FPE's which MAY be enabled. */
++#define OEX_PAGE0 0x10000 /* page zero must be mapped. */
++#define OEX_SMM 0x20000 /* Force sequential memory mode? */
++#define OEX_FPDBUG 0x40000 /* Force floating point debug mode? */
++#define OEX_PRECISEFP OEX_FPDBUG
++#define OEX_DISMISS 0x80000 /* Dismiss invalid address faults? */
++
++#define OEX_FPU_INVAL 0x10
++#define OEX_FPU_DIV0 0x08
++#define OEX_FPU_OFLO 0x04
++#define OEX_FPU_UFLO 0x02
++#define OEX_FPU_INEX 0x01
++
++/* Masks for `info' in Elf_Options for an ODK_HWPATCH entry. */
++
++#define OHW_R4KEOP 0x1 /* R4000 end-of-page patch. */
++#define OHW_R8KPFETCH 0x2 /* may need R8000 prefetch patch. */
++#define OHW_R5KEOP 0x4 /* R5000 end-of-page patch. */
++#define OHW_R5KCVTL 0x8 /* R5000 cvt.[ds].l bug. clean=1. */
++
++#define OPAD_PREFIX 0x1
++#define OPAD_POSTFIX 0x2
++#define OPAD_SYMBOL 0x4
++
++/* Entry found in `.options' section. */
++
++typedef struct
++{
++ Elf32_Word hwp_flags1; /* Extra flags. */
++ Elf32_Word hwp_flags2; /* Extra flags. */
++} Elf_Options_Hw;
++
++/* Masks for `info' in ElfOptions for ODK_HWAND and ODK_HWOR entries. */
++
++#define OHWA0_R4KEOP_CHECKED 0x00000001
++#define OHWA1_R4KEOP_CLEAN 0x00000002
++
++/* MIPS relocs. */
++
++#define R_MIPS_NONE 0 /* No reloc */
++#define R_MIPS_16 1 /* Direct 16 bit */
++#define R_MIPS_32 2 /* Direct 32 bit */
++#define R_MIPS_REL32 3 /* PC relative 32 bit */
++#define R_MIPS_26 4 /* Direct 26 bit shifted */
++#define R_MIPS_HI16 5 /* High 16 bit */
++#define R_MIPS_LO16 6 /* Low 16 bit */
++#define R_MIPS_GPREL16 7 /* GP relative 16 bit */
++#define R_MIPS_LITERAL 8 /* 16 bit literal entry */
++#define R_MIPS_GOT16 9 /* 16 bit GOT entry */
++#define R_MIPS_PC16 10 /* PC relative 16 bit */
++#define R_MIPS_CALL16 11 /* 16 bit GOT entry for function */
++#define R_MIPS_GPREL32 12 /* GP relative 32 bit */
++
++#define R_MIPS_SHIFT5 16
++#define R_MIPS_SHIFT6 17
++#define R_MIPS_64 18
++#define R_MIPS_GOT_DISP 19
++#define R_MIPS_GOT_PAGE 20
++#define R_MIPS_GOT_OFST 21
++#define R_MIPS_GOT_HI16 22
++#define R_MIPS_GOT_LO16 23
++#define R_MIPS_SUB 24
++#define R_MIPS_INSERT_A 25
++#define R_MIPS_INSERT_B 26
++#define R_MIPS_DELETE 27
++#define R_MIPS_HIGHER 28
++#define R_MIPS_HIGHEST 29
++#define R_MIPS_CALL_HI16 30
++#define R_MIPS_CALL_LO16 31
++#define R_MIPS_SCN_DISP 32
++#define R_MIPS_REL16 33
++#define R_MIPS_ADD_IMMEDIATE 34
++#define R_MIPS_PJUMP 35
++#define R_MIPS_RELGOT 36
++#define R_MIPS_JALR 37
++#define R_MIPS_TLS_DTPMOD32 38 /* Module number 32 bit */
++#define R_MIPS_TLS_DTPREL32 39 /* Module-relative offset 32 bit */
++#define R_MIPS_TLS_DTPMOD64 40 /* Module number 64 bit */
++#define R_MIPS_TLS_DTPREL64 41 /* Module-relative offset 64 bit */
++#define R_MIPS_TLS_GD 42 /* 16 bit GOT offset for GD */
++#define R_MIPS_TLS_LDM 43 /* 16 bit GOT offset for LDM */
++#define R_MIPS_TLS_DTPREL_HI16 44 /* Module-relative offset, high 16 bits */
++#define R_MIPS_TLS_DTPREL_LO16 45 /* Module-relative offset, low 16 bits */
++#define R_MIPS_TLS_GOTTPREL 46 /* 16 bit GOT offset for IE */
++#define R_MIPS_TLS_TPREL32 47 /* TP-relative offset, 32 bit */
++#define R_MIPS_TLS_TPREL64 48 /* TP-relative offset, 64 bit */
++#define R_MIPS_TLS_TPREL_HI16 49 /* TP-relative offset, high 16 bits */
++#define R_MIPS_TLS_TPREL_LO16 50 /* TP-relative offset, low 16 bits */
++/* Keep this the last entry. */
++#define R_MIPS_NUM 51
++
++/* Legal values for p_type field of Elf32_Phdr. */
++
++#define PT_MIPS_REGINFO 0x70000000 /* Register usage information */
++#define PT_MIPS_RTPROC 0x70000001 /* Runtime procedure table. */
++#define PT_MIPS_OPTIONS 0x70000002
++
++/* Special program header types. */
++
++#define PF_MIPS_LOCAL 0x10000000
++
++/* Legal values for d_tag field of Elf32_Dyn. */
++
++#define DT_MIPS_RLD_VERSION 0x70000001 /* Runtime linker interface version */
++#define DT_MIPS_TIME_STAMP 0x70000002 /* Timestamp */
++#define DT_MIPS_ICHECKSUM 0x70000003 /* Checksum */
++#define DT_MIPS_IVERSION 0x70000004 /* Version string (string tbl index) */
++#define DT_MIPS_FLAGS 0x70000005 /* Flags */
++#define DT_MIPS_BASE_ADDRESS 0x70000006 /* Base address */
++#define DT_MIPS_MSYM 0x70000007
++#define DT_MIPS_CONFLICT 0x70000008 /* Address of CONFLICT section */
++#define DT_MIPS_LIBLIST 0x70000009 /* Address of LIBLIST section */
++#define DT_MIPS_LOCAL_GOTNO 0x7000000a /* Number of local GOT entries */
++#define DT_MIPS_CONFLICTNO 0x7000000b /* Number of CONFLICT entries */
++#define DT_MIPS_LIBLISTNO 0x70000010 /* Number of LIBLIST entries */
++#define DT_MIPS_SYMTABNO 0x70000011 /* Number of DYNSYM entries */
++#define DT_MIPS_UNREFEXTNO 0x70000012 /* First external DYNSYM */
++#define DT_MIPS_GOTSYM 0x70000013 /* First GOT entry in DYNSYM */
++#define DT_MIPS_HIPAGENO 0x70000014 /* Number of GOT page table entries */
++#define DT_MIPS_RLD_MAP 0x70000016 /* Address of run time loader map. */
++#define DT_MIPS_DELTA_CLASS 0x70000017 /* Delta C++ class definition. */
++#define DT_MIPS_DELTA_CLASS_NO 0x70000018 /* Number of entries in
++ DT_MIPS_DELTA_CLASS. */
++#define DT_MIPS_DELTA_INSTANCE 0x70000019 /* Delta C++ class instances. */
++#define DT_MIPS_DELTA_INSTANCE_NO 0x7000001a /* Number of entries in
++ DT_MIPS_DELTA_INSTANCE. */
++#define DT_MIPS_DELTA_RELOC 0x7000001b /* Delta relocations. */
++#define DT_MIPS_DELTA_RELOC_NO 0x7000001c /* Number of entries in
++ DT_MIPS_DELTA_RELOC. */
++#define DT_MIPS_DELTA_SYM 0x7000001d /* Delta symbols that Delta
++ relocations refer to. */
++#define DT_MIPS_DELTA_SYM_NO 0x7000001e /* Number of entries in
++ DT_MIPS_DELTA_SYM. */
++#define DT_MIPS_DELTA_CLASSSYM 0x70000020 /* Delta symbols that hold the
++ class declaration. */
++#define DT_MIPS_DELTA_CLASSSYM_NO 0x70000021 /* Number of entries in
++ DT_MIPS_DELTA_CLASSSYM. */
++#define DT_MIPS_CXX_FLAGS 0x70000022 /* Flags indicating for C++ flavor. */
++#define DT_MIPS_PIXIE_INIT 0x70000023
++#define DT_MIPS_SYMBOL_LIB 0x70000024
++#define DT_MIPS_LOCALPAGE_GOTIDX 0x70000025
++#define DT_MIPS_LOCAL_GOTIDX 0x70000026
++#define DT_MIPS_HIDDEN_GOTIDX 0x70000027
++#define DT_MIPS_PROTECTED_GOTIDX 0x70000028
++#define DT_MIPS_OPTIONS 0x70000029 /* Address of .options. */
++#define DT_MIPS_INTERFACE 0x7000002a /* Address of .interface. */
++#define DT_MIPS_DYNSTR_ALIGN 0x7000002b
++#define DT_MIPS_INTERFACE_SIZE 0x7000002c /* Size of the .interface section. */
++#define DT_MIPS_RLD_TEXT_RESOLVE_ADDR 0x7000002d /* Address of rld_text_rsolve
++ function stored in GOT. */
++#define DT_MIPS_PERF_SUFFIX 0x7000002e /* Default suffix of dso to be added
++ by rld on dlopen() calls. */
++#define DT_MIPS_COMPACT_SIZE 0x7000002f /* (O32)Size of compact rel section. */
++#define DT_MIPS_GP_VALUE 0x70000030 /* GP value for aux GOTs. */
++#define DT_MIPS_AUX_DYNAMIC 0x70000031 /* Address of aux .dynamic. */
++#define DT_MIPS_NUM 0x32
++
++/* Legal values for DT_MIPS_FLAGS Elf32_Dyn entry. */
++
++#define RHF_NONE 0 /* No flags */
++#define RHF_QUICKSTART (1 << 0) /* Use quickstart */
++#define RHF_NOTPOT (1 << 1) /* Hash size not power of 2 */
++#define RHF_NO_LIBRARY_REPLACEMENT (1 << 2) /* Ignore LD_LIBRARY_PATH */
++#define RHF_NO_MOVE (1 << 3)
++#define RHF_SGI_ONLY (1 << 4)
++#define RHF_GUARANTEE_INIT (1 << 5)
++#define RHF_DELTA_C_PLUS_PLUS (1 << 6)
++#define RHF_GUARANTEE_START_INIT (1 << 7)
++#define RHF_PIXIE (1 << 8)
++#define RHF_DEFAULT_DELAY_LOAD (1 << 9)
++#define RHF_REQUICKSTART (1 << 10)
++#define RHF_REQUICKSTARTED (1 << 11)
++#define RHF_CORD (1 << 12)
++#define RHF_NO_UNRES_UNDEF (1 << 13)
++#define RHF_RLD_ORDER_SAFE (1 << 14)
++
++/* Entries found in sections of type SHT_MIPS_LIBLIST. */
++
++typedef struct
++{
++ Elf32_Word l_name; /* Name (string table index) */
++ Elf32_Word l_time_stamp; /* Timestamp */
++ Elf32_Word l_checksum; /* Checksum */
++ Elf32_Word l_version; /* Interface version */
++ Elf32_Word l_flags; /* Flags */
++} Elf32_Lib;
++
++typedef struct
++{
++ Elf64_Word l_name; /* Name (string table index) */
++ Elf64_Word l_time_stamp; /* Timestamp */
++ Elf64_Word l_checksum; /* Checksum */
++ Elf64_Word l_version; /* Interface version */
++ Elf64_Word l_flags; /* Flags */
++} Elf64_Lib;
++
++
++/* Legal values for l_flags. */
++
++#define LL_NONE 0
++#define LL_EXACT_MATCH (1 << 0) /* Require exact match */
++#define LL_IGNORE_INT_VER (1 << 1) /* Ignore interface version */
++#define LL_REQUIRE_MINOR (1 << 2)
++#define LL_EXPORTS (1 << 3)
++#define LL_DELAY_LOAD (1 << 4)
++#define LL_DELTA (1 << 5)
++
++/* Entries found in sections of type SHT_MIPS_CONFLICT. */
++
++typedef Elf32_Addr Elf32_Conflict;
++
++
++/* HPPA specific definitions. */
++
++/* Legal values for e_flags field of Elf32_Ehdr. */
++
++#define EF_PARISC_TRAPNIL 0x00010000 /* Trap nil pointer dereference. */
++#define EF_PARISC_EXT 0x00020000 /* Program uses arch. extensions. */
++#define EF_PARISC_LSB 0x00040000 /* Program expects little endian. */
++#define EF_PARISC_WIDE 0x00080000 /* Program expects wide mode. */
++#define EF_PARISC_NO_KABP 0x00100000 /* No kernel assisted branch
++ prediction. */
++#define EF_PARISC_LAZYSWAP 0x00400000 /* Allow lazy swapping. */
++#define EF_PARISC_ARCH 0x0000ffff /* Architecture version. */
++
++/* Defined values for `e_flags & EF_PARISC_ARCH' are: */
++
++#define EFA_PARISC_1_0 0x020b /* PA-RISC 1.0 big-endian. */
++#define EFA_PARISC_1_1 0x0210 /* PA-RISC 1.1 big-endian. */
++#define EFA_PARISC_2_0 0x0214 /* PA-RISC 2.0 big-endian. */
++
++/* Additional section indeces. */
++
++#define SHN_PARISC_ANSI_COMMON 0xff00 /* Section for tenatively declared
++ symbols in ANSI C. */
++#define SHN_PARISC_HUGE_COMMON 0xff01 /* Common blocks in huge model. */
++
++/* Legal values for sh_type field of Elf32_Shdr. */
++
++#define SHT_PARISC_EXT 0x70000000 /* Contains product specific ext. */
++#define SHT_PARISC_UNWIND 0x70000001 /* Unwind information. */
++#define SHT_PARISC_DOC 0x70000002 /* Debug info for optimized code. */
++
++/* Legal values for sh_flags field of Elf32_Shdr. */
++
++#define SHF_PARISC_SHORT 0x20000000 /* Section with short addressing. */
++#define SHF_PARISC_HUGE 0x40000000 /* Section far from gp. */
++#define SHF_PARISC_SBP 0x80000000 /* Static branch prediction code. */
++
++/* Legal values for ST_TYPE subfield of st_info (symbol type). */
++
++#define STT_PARISC_MILLICODE 13 /* Millicode function entry point. */
++
++#define STT_HP_OPAQUE (STT_LOOS + 0x1)
++#define STT_HP_STUB (STT_LOOS + 0x2)
++
++/* HPPA relocs. */
++
++#define R_PARISC_NONE 0 /* No reloc. */
++#define R_PARISC_DIR32 1 /* Direct 32-bit reference. */
++#define R_PARISC_DIR21L 2 /* Left 21 bits of eff. address. */
++#define R_PARISC_DIR17R 3 /* Right 17 bits of eff. address. */
++#define R_PARISC_DIR17F 4 /* 17 bits of eff. address. */
++#define R_PARISC_DIR14R 6 /* Right 14 bits of eff. address. */
++#define R_PARISC_PCREL32 9 /* 32-bit rel. address. */
++#define R_PARISC_PCREL21L 10 /* Left 21 bits of rel. address. */
++#define R_PARISC_PCREL17R 11 /* Right 17 bits of rel. address. */
++#define R_PARISC_PCREL17F 12 /* 17 bits of rel. address. */
++#define R_PARISC_PCREL14R 14 /* Right 14 bits of rel. address. */
++#define R_PARISC_DPREL21L 18 /* Left 21 bits of rel. address. */
++#define R_PARISC_DPREL14R 22 /* Right 14 bits of rel. address. */
++#define R_PARISC_GPREL21L 26 /* GP-relative, left 21 bits. */
++#define R_PARISC_GPREL14R 30 /* GP-relative, right 14 bits. */
++#define R_PARISC_LTOFF21L 34 /* LT-relative, left 21 bits. */
++#define R_PARISC_LTOFF14R 38 /* LT-relative, right 14 bits. */
++#define R_PARISC_SECREL32 41 /* 32 bits section rel. address. */
++#define R_PARISC_SEGBASE 48 /* No relocation, set segment base. */
++#define R_PARISC_SEGREL32 49 /* 32 bits segment rel. address. */
++#define R_PARISC_PLTOFF21L 50 /* PLT rel. address, left 21 bits. */
++#define R_PARISC_PLTOFF14R 54 /* PLT rel. address, right 14 bits. */
++#define R_PARISC_LTOFF_FPTR32 57 /* 32 bits LT-rel. function pointer. */
++#define R_PARISC_LTOFF_FPTR21L 58 /* LT-rel. fct ptr, left 21 bits. */
++#define R_PARISC_LTOFF_FPTR14R 62 /* LT-rel. fct ptr, right 14 bits. */
++#define R_PARISC_FPTR64 64 /* 64 bits function address. */
++#define R_PARISC_PLABEL32 65 /* 32 bits function address. */
++#define R_PARISC_PCREL64 72 /* 64 bits PC-rel. address. */
++#define R_PARISC_PCREL22F 74 /* 22 bits PC-rel. address. */
++#define R_PARISC_PCREL14WR 75 /* PC-rel. address, right 14 bits. */
++#define R_PARISC_PCREL14DR 76 /* PC rel. address, right 14 bits. */
++#define R_PARISC_PCREL16F 77 /* 16 bits PC-rel. address. */
++#define R_PARISC_PCREL16WF 78 /* 16 bits PC-rel. address. */
++#define R_PARISC_PCREL16DF 79 /* 16 bits PC-rel. address. */
++#define R_PARISC_DIR64 80 /* 64 bits of eff. address. */
++#define R_PARISC_DIR14WR 83 /* 14 bits of eff. address. */
++#define R_PARISC_DIR14DR 84 /* 14 bits of eff. address. */
++#define R_PARISC_DIR16F 85 /* 16 bits of eff. address. */
++#define R_PARISC_DIR16WF 86 /* 16 bits of eff. address. */
++#define R_PARISC_DIR16DF 87 /* 16 bits of eff. address. */
++#define R_PARISC_GPREL64 88 /* 64 bits of GP-rel. address. */
++#define R_PARISC_GPREL14WR 91 /* GP-rel. address, right 14 bits. */
++#define R_PARISC_GPREL14DR 92 /* GP-rel. address, right 14 bits. */
++#define R_PARISC_GPREL16F 93 /* 16 bits GP-rel. address. */
++#define R_PARISC_GPREL16WF 94 /* 16 bits GP-rel. address. */
++#define R_PARISC_GPREL16DF 95 /* 16 bits GP-rel. address. */
++#define R_PARISC_LTOFF64 96 /* 64 bits LT-rel. address. */
++#define R_PARISC_LTOFF14WR 99 /* LT-rel. address, right 14 bits. */
++#define R_PARISC_LTOFF14DR 100 /* LT-rel. address, right 14 bits. */
++#define R_PARISC_LTOFF16F 101 /* 16 bits LT-rel. address. */
++#define R_PARISC_LTOFF16WF 102 /* 16 bits LT-rel. address. */
++#define R_PARISC_LTOFF16DF 103 /* 16 bits LT-rel. address. */
++#define R_PARISC_SECREL64 104 /* 64 bits section rel. address. */
++#define R_PARISC_SEGREL64 112 /* 64 bits segment rel. address. */
++#define R_PARISC_PLTOFF14WR 115 /* PLT-rel. address, right 14 bits. */
++#define R_PARISC_PLTOFF14DR 116 /* PLT-rel. address, right 14 bits. */
++#define R_PARISC_PLTOFF16F 117 /* 16 bits LT-rel. address. */
++#define R_PARISC_PLTOFF16WF 118 /* 16 bits PLT-rel. address. */
++#define R_PARISC_PLTOFF16DF 119 /* 16 bits PLT-rel. address. */
++#define R_PARISC_LTOFF_FPTR64 120 /* 64 bits LT-rel. function ptr. */
++#define R_PARISC_LTOFF_FPTR14WR 123 /* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR14DR 124 /* LT-rel. fct. ptr., right 14 bits. */
++#define R_PARISC_LTOFF_FPTR16F 125 /* 16 bits LT-rel. function ptr. */
++#define R_PARISC_LTOFF_FPTR16WF 126 /* 16 bits LT-rel. function ptr. */
++#define R_PARISC_LTOFF_FPTR16DF 127 /* 16 bits LT-rel. function ptr. */
++#define R_PARISC_LORESERVE 128
++#define R_PARISC_COPY 128 /* Copy relocation. */
++#define R_PARISC_IPLT 129 /* Dynamic reloc, imported PLT */
++#define R_PARISC_EPLT 130 /* Dynamic reloc, exported PLT */
++#define R_PARISC_TPREL32 153 /* 32 bits TP-rel. address. */
++#define R_PARISC_TPREL21L 154 /* TP-rel. address, left 21 bits. */
++#define R_PARISC_TPREL14R 158 /* TP-rel. address, right 14 bits. */
++#define R_PARISC_LTOFF_TP21L 162 /* LT-TP-rel. address, left 21 bits. */
++#define R_PARISC_LTOFF_TP14R 166 /* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14F 167 /* 14 bits LT-TP-rel. address. */
++#define R_PARISC_TPREL64 216 /* 64 bits TP-rel. address. */
++#define R_PARISC_TPREL14WR 219 /* TP-rel. address, right 14 bits. */
++#define R_PARISC_TPREL14DR 220 /* TP-rel. address, right 14 bits. */
++#define R_PARISC_TPREL16F 221 /* 16 bits TP-rel. address. */
++#define R_PARISC_TPREL16WF 222 /* 16 bits TP-rel. address. */
++#define R_PARISC_TPREL16DF 223 /* 16 bits TP-rel. address. */
++#define R_PARISC_LTOFF_TP64 224 /* 64 bits LT-TP-rel. address. */
++#define R_PARISC_LTOFF_TP14WR 227 /* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP14DR 228 /* LT-TP-rel. address, right 14 bits.*/
++#define R_PARISC_LTOFF_TP16F 229 /* 16 bits LT-TP-rel. address. */
++#define R_PARISC_LTOFF_TP16WF 230 /* 16 bits LT-TP-rel. address. */
++#define R_PARISC_LTOFF_TP16DF 231 /* 16 bits LT-TP-rel. address. */
++#define R_PARISC_HIRESERVE 255
++
++/* Legal values for p_type field of Elf32_Phdr/Elf64_Phdr. */
++
++#define PT_HP_TLS (PT_LOOS + 0x0)
++#define PT_HP_CORE_NONE (PT_LOOS + 0x1)
++#define PT_HP_CORE_VERSION (PT_LOOS + 0x2)
++#define PT_HP_CORE_KERNEL (PT_LOOS + 0x3)
++#define PT_HP_CORE_COMM (PT_LOOS + 0x4)
++#define PT_HP_CORE_PROC (PT_LOOS + 0x5)
++#define PT_HP_CORE_LOADABLE (PT_LOOS + 0x6)
++#define PT_HP_CORE_STACK (PT_LOOS + 0x7)
++#define PT_HP_CORE_SHM (PT_LOOS + 0x8)
++#define PT_HP_CORE_MMF (PT_LOOS + 0x9)
++#define PT_HP_PARALLEL (PT_LOOS + 0x10)
++#define PT_HP_FASTBIND (PT_LOOS + 0x11)
++#define PT_HP_OPT_ANNOT (PT_LOOS + 0x12)
++#define PT_HP_HSL_ANNOT (PT_LOOS + 0x13)
++#define PT_HP_STACK (PT_LOOS + 0x14)
++
++#define PT_PARISC_ARCHEXT 0x70000000
++#define PT_PARISC_UNWIND 0x70000001
++
++/* Legal values for p_flags field of Elf32_Phdr/Elf64_Phdr. */
++
++#define PF_PARISC_SBP 0x08000000
++
++#define PF_HP_PAGE_SIZE 0x00100000
++#define PF_HP_FAR_SHARED 0x00200000
++#define PF_HP_NEAR_SHARED 0x00400000
++#define PF_HP_CODE 0x01000000
++#define PF_HP_MODIFY 0x02000000
++#define PF_HP_LAZYSWAP 0x04000000
++#define PF_HP_SBP 0x08000000
++
++
++/* Alpha specific definitions. */
++
++/* Legal values for e_flags field of Elf64_Ehdr. */
++
++#define EF_ALPHA_32BIT 1 /* All addresses must be < 2GB. */
++#define EF_ALPHA_CANRELAX 2 /* Relocations for relaxing exist. */
++
++/* Legal values for sh_type field of Elf64_Shdr. */
++
++/* These two are primerily concerned with ECOFF debugging info. */
++#define SHT_ALPHA_DEBUG 0x70000001
++#define SHT_ALPHA_REGINFO 0x70000002
++
++/* Legal values for sh_flags field of Elf64_Shdr. */
++
++#define SHF_ALPHA_GPREL 0x10000000
++
++/* Legal values for st_other field of Elf64_Sym. */
++#define STO_ALPHA_NOPV 0x80 /* No PV required. */
++#define STO_ALPHA_STD_GPLOAD 0x88 /* PV only used for initial ldgp. */
++
++/* Alpha relocs. */
++
++#define R_ALPHA_NONE 0 /* No reloc */
++#define R_ALPHA_REFLONG 1 /* Direct 32 bit */
++#define R_ALPHA_REFQUAD 2 /* Direct 64 bit */
++#define R_ALPHA_GPREL32 3 /* GP relative 32 bit */
++#define R_ALPHA_LITERAL 4 /* GP relative 16 bit w/optimization */
++#define R_ALPHA_LITUSE 5 /* Optimization hint for LITERAL */
++#define R_ALPHA_GPDISP 6 /* Add displacement to GP */
++#define R_ALPHA_BRADDR 7 /* PC+4 relative 23 bit shifted */
++#define R_ALPHA_HINT 8 /* PC+4 relative 16 bit shifted */
++#define R_ALPHA_SREL16 9 /* PC relative 16 bit */
++#define R_ALPHA_SREL32 10 /* PC relative 32 bit */
++#define R_ALPHA_SREL64 11 /* PC relative 64 bit */
++#define R_ALPHA_GPRELHIGH 17 /* GP relative 32 bit, high 16 bits */
++#define R_ALPHA_GPRELLOW 18 /* GP relative 32 bit, low 16 bits */
++#define R_ALPHA_GPREL16 19 /* GP relative 16 bit */
++#define R_ALPHA_COPY 24 /* Copy symbol at runtime */
++#define R_ALPHA_GLOB_DAT 25 /* Create GOT entry */
++#define R_ALPHA_JMP_SLOT 26 /* Create PLT entry */
++#define R_ALPHA_RELATIVE 27 /* Adjust by program base */
++#define R_ALPHA_TLS_GD_HI 28
++#define R_ALPHA_TLSGD 29
++#define R_ALPHA_TLS_LDM 30
++#define R_ALPHA_DTPMOD64 31
++#define R_ALPHA_GOTDTPREL 32
++#define R_ALPHA_DTPREL64 33
++#define R_ALPHA_DTPRELHI 34
++#define R_ALPHA_DTPRELLO 35
++#define R_ALPHA_DTPREL16 36
++#define R_ALPHA_GOTTPREL 37
++#define R_ALPHA_TPREL64 38
++#define R_ALPHA_TPRELHI 39
++#define R_ALPHA_TPRELLO 40
++#define R_ALPHA_TPREL16 41
++/* Keep this the last entry. */
++#define R_ALPHA_NUM 46
++
++/* Magic values of the LITUSE relocation addend. */
++#define LITUSE_ALPHA_ADDR 0
++#define LITUSE_ALPHA_BASE 1
++#define LITUSE_ALPHA_BYTOFF 2
++#define LITUSE_ALPHA_JSR 3
++#define LITUSE_ALPHA_TLS_GD 4
++#define LITUSE_ALPHA_TLS_LDM 5
++
++/* Legal values for d_tag of Elf64_Dyn. */
++#define DT_ALPHA_PLTRO (DT_LOPROC + 0)
++#define DT_ALPHA_NUM 1
++
++/* PowerPC specific declarations */
++
++/* Values for Elf32/64_Ehdr.e_flags. */
++#define EF_PPC_EMB 0x80000000 /* PowerPC embedded flag */
++
++/* Cygnus local bits below */
++#define EF_PPC_RELOCATABLE 0x00010000 /* PowerPC -mrelocatable flag*/
++#define EF_PPC_RELOCATABLE_LIB 0x00008000 /* PowerPC -mrelocatable-lib
++ flag */
++
++/* PowerPC relocations defined by the ABIs */
++#define R_PPC_NONE 0
++#define R_PPC_ADDR32 1 /* 32bit absolute address */
++#define R_PPC_ADDR24 2 /* 26bit address, 2 bits ignored. */
++#define R_PPC_ADDR16 3 /* 16bit absolute address */
++#define R_PPC_ADDR16_LO 4 /* lower 16bit of absolute address */
++#define R_PPC_ADDR16_HI 5 /* high 16bit of absolute address */
++#define R_PPC_ADDR16_HA 6 /* adjusted high 16bit */
++#define R_PPC_ADDR14 7 /* 16bit address, 2 bits ignored */
++#define R_PPC_ADDR14_BRTAKEN 8
++#define R_PPC_ADDR14_BRNTAKEN 9
++#define R_PPC_REL24 10 /* PC relative 26 bit */
++#define R_PPC_REL14 11 /* PC relative 16 bit */
++#define R_PPC_REL14_BRTAKEN 12
++#define R_PPC_REL14_BRNTAKEN 13
++#define R_PPC_GOT16 14
++#define R_PPC_GOT16_LO 15
++#define R_PPC_GOT16_HI 16
++#define R_PPC_GOT16_HA 17
++#define R_PPC_PLTREL24 18
++#define R_PPC_COPY 19
++#define R_PPC_GLOB_DAT 20
++#define R_PPC_JMP_SLOT 21
++#define R_PPC_RELATIVE 22
++#define R_PPC_LOCAL24PC 23
++#define R_PPC_UADDR32 24
++#define R_PPC_UADDR16 25
++#define R_PPC_REL32 26
++#define R_PPC_PLT32 27
++#define R_PPC_PLTREL32 28
++#define R_PPC_PLT16_LO 29
++#define R_PPC_PLT16_HI 30
++#define R_PPC_PLT16_HA 31
++#define R_PPC_SDAREL16 32
++#define R_PPC_SECTOFF 33
++#define R_PPC_SECTOFF_LO 34
++#define R_PPC_SECTOFF_HI 35
++#define R_PPC_SECTOFF_HA 36
++
++/* PowerPC relocations defined for the TLS access ABI. */
++#define R_PPC_TLS 67 /* none (sym+add)@tls */
++#define R_PPC_DTPMOD32 68 /* word32 (sym+add)@dtpmod */
++#define R_PPC_TPREL16 69 /* half16* (sym+add)@tprel */
++#define R_PPC_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
++#define R_PPC_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
++#define R_PPC_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
++#define R_PPC_TPREL32 73 /* word32 (sym+add)@tprel */
++#define R_PPC_DTPREL16 74 /* half16* (sym+add)@dtprel */
++#define R_PPC_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
++#define R_PPC_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
++#define R_PPC_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
++#define R_PPC_DTPREL32 78 /* word32 (sym+add)@dtprel */
++#define R_PPC_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
++#define R_PPC_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
++#define R_PPC_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
++#define R_PPC_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
++#define R_PPC_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
++#define R_PPC_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
++#define R_PPC_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
++#define R_PPC_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
++#define R_PPC_GOT_TPREL16 87 /* half16* (sym+add)@got@tprel */
++#define R_PPC_GOT_TPREL16_LO 88 /* half16 (sym+add)@got@tprel@l */
++#define R_PPC_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
++#define R_PPC_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
++#define R_PPC_GOT_DTPREL16 91 /* half16* (sym+add)@got@dtprel */
++#define R_PPC_GOT_DTPREL16_LO 92 /* half16* (sym+add)@got@dtprel@l */
++#define R_PPC_GOT_DTPREL16_HI 93 /* half16* (sym+add)@got@dtprel@h */
++#define R_PPC_GOT_DTPREL16_HA 94 /* half16* (sym+add)@got@dtprel@ha */
++
++/* Keep this the last entry. */
++#define R_PPC_NUM 95
++
++/* The remaining relocs are from the Embedded ELF ABI, and are not
++ in the SVR4 ELF ABI. */
++#define R_PPC_EMB_NADDR32 101
++#define R_PPC_EMB_NADDR16 102
++#define R_PPC_EMB_NADDR16_LO 103
++#define R_PPC_EMB_NADDR16_HI 104
++#define R_PPC_EMB_NADDR16_HA 105
++#define R_PPC_EMB_SDAI16 106
++#define R_PPC_EMB_SDA2I16 107
++#define R_PPC_EMB_SDA2REL 108
++#define R_PPC_EMB_SDA21 109 /* 16 bit offset in SDA */
++#define R_PPC_EMB_MRKREF 110
++#define R_PPC_EMB_RELSEC16 111
++#define R_PPC_EMB_RELST_LO 112
++#define R_PPC_EMB_RELST_HI 113
++#define R_PPC_EMB_RELST_HA 114
++#define R_PPC_EMB_BIT_FLD 115
++#define R_PPC_EMB_RELSDA 116 /* 16 bit relative offset in SDA */
++
++/* Diab tool relocations. */
++#define R_PPC_DIAB_SDA21_LO 180 /* like EMB_SDA21, but lower 16 bit */
++#define R_PPC_DIAB_SDA21_HI 181 /* like EMB_SDA21, but high 16 bit */
++#define R_PPC_DIAB_SDA21_HA 182 /* like EMB_SDA21, adjusted high 16 */
++#define R_PPC_DIAB_RELSDA_LO 183 /* like EMB_RELSDA, but lower 16 bit */
++#define R_PPC_DIAB_RELSDA_HI 184 /* like EMB_RELSDA, but high 16 bit */
++#define R_PPC_DIAB_RELSDA_HA 185 /* like EMB_RELSDA, adjusted high 16 */
++
++/* GNU relocs used in PIC code sequences. */
++#define R_PPC_REL16 249 /* word32 (sym-.) */
++#define R_PPC_REL16_LO 250 /* half16 (sym-.)@l */
++#define R_PPC_REL16_HI 251 /* half16 (sym-.)@h */
++#define R_PPC_REL16_HA 252 /* half16 (sym-.)@ha */
++
++/* This is a phony reloc to handle any old fashioned TOC16 references
++ that may still be in object files. */
++#define R_PPC_TOC16 255
++
++/* PowerPC specific values for the Dyn d_tag field. */
++#define DT_PPC_GOT (DT_LOPROC + 0)
++#define DT_PPC_NUM 1
++
++/* PowerPC64 relocations defined by the ABIs */
++#define R_PPC64_NONE R_PPC_NONE
++#define R_PPC64_ADDR32 R_PPC_ADDR32 /* 32bit absolute address */
++#define R_PPC64_ADDR24 R_PPC_ADDR24 /* 26bit address, word aligned */
++#define R_PPC64_ADDR16 R_PPC_ADDR16 /* 16bit absolute address */
++#define R_PPC64_ADDR16_LO R_PPC_ADDR16_LO /* lower 16bits of address */
++#define R_PPC64_ADDR16_HI R_PPC_ADDR16_HI /* high 16bits of address. */
++#define R_PPC64_ADDR16_HA R_PPC_ADDR16_HA /* adjusted high 16bits. */
++#define R_PPC64_ADDR14 R_PPC_ADDR14 /* 16bit address, word aligned */
++#define R_PPC64_ADDR14_BRTAKEN R_PPC_ADDR14_BRTAKEN
++#define R_PPC64_ADDR14_BRNTAKEN R_PPC_ADDR14_BRNTAKEN
++#define R_PPC64_REL24 R_PPC_REL24 /* PC-rel. 26 bit, word aligned */
++#define R_PPC64_REL14 R_PPC_REL14 /* PC relative 16 bit */
++#define R_PPC64_REL14_BRTAKEN R_PPC_REL14_BRTAKEN
++#define R_PPC64_REL14_BRNTAKEN R_PPC_REL14_BRNTAKEN
++#define R_PPC64_GOT16 R_PPC_GOT16
++#define R_PPC64_GOT16_LO R_PPC_GOT16_LO
++#define R_PPC64_GOT16_HI R_PPC_GOT16_HI
++#define R_PPC64_GOT16_HA R_PPC_GOT16_HA
++
++#define R_PPC64_COPY R_PPC_COPY
++#define R_PPC64_GLOB_DAT R_PPC_GLOB_DAT
++#define R_PPC64_JMP_SLOT R_PPC_JMP_SLOT
++#define R_PPC64_RELATIVE R_PPC_RELATIVE
++
++#define R_PPC64_UADDR32 R_PPC_UADDR32
++#define R_PPC64_UADDR16 R_PPC_UADDR16
++#define R_PPC64_REL32 R_PPC_REL32
++#define R_PPC64_PLT32 R_PPC_PLT32
++#define R_PPC64_PLTREL32 R_PPC_PLTREL32
++#define R_PPC64_PLT16_LO R_PPC_PLT16_LO
++#define R_PPC64_PLT16_HI R_PPC_PLT16_HI
++#define R_PPC64_PLT16_HA R_PPC_PLT16_HA
++
++#define R_PPC64_SECTOFF R_PPC_SECTOFF
++#define R_PPC64_SECTOFF_LO R_PPC_SECTOFF_LO
++#define R_PPC64_SECTOFF_HI R_PPC_SECTOFF_HI
++#define R_PPC64_SECTOFF_HA R_PPC_SECTOFF_HA
++#define R_PPC64_ADDR30 37 /* word30 (S + A - P) >> 2 */
++#define R_PPC64_ADDR64 38 /* doubleword64 S + A */
++#define R_PPC64_ADDR16_HIGHER 39 /* half16 #higher(S + A) */
++#define R_PPC64_ADDR16_HIGHERA 40 /* half16 #highera(S + A) */
++#define R_PPC64_ADDR16_HIGHEST 41 /* half16 #highest(S + A) */
++#define R_PPC64_ADDR16_HIGHESTA 42 /* half16 #highesta(S + A) */
++#define R_PPC64_UADDR64 43 /* doubleword64 S + A */
++#define R_PPC64_REL64 44 /* doubleword64 S + A - P */
++#define R_PPC64_PLT64 45 /* doubleword64 L + A */
++#define R_PPC64_PLTREL64 46 /* doubleword64 L + A - P */
++#define R_PPC64_TOC16 47 /* half16* S + A - .TOC */
++#define R_PPC64_TOC16_LO 48 /* half16 #lo(S + A - .TOC.) */
++#define R_PPC64_TOC16_HI 49 /* half16 #hi(S + A - .TOC.) */
++#define R_PPC64_TOC16_HA 50 /* half16 #ha(S + A - .TOC.) */
++#define R_PPC64_TOC 51 /* doubleword64 .TOC */
++#define R_PPC64_PLTGOT16 52 /* half16* M + A */
++#define R_PPC64_PLTGOT16_LO 53 /* half16 #lo(M + A) */
++#define R_PPC64_PLTGOT16_HI 54 /* half16 #hi(M + A) */
++#define R_PPC64_PLTGOT16_HA 55 /* half16 #ha(M + A) */
++
++#define R_PPC64_ADDR16_DS 56 /* half16ds* (S + A) >> 2 */
++#define R_PPC64_ADDR16_LO_DS 57 /* half16ds #lo(S + A) >> 2 */
++#define R_PPC64_GOT16_DS 58 /* half16ds* (G + A) >> 2 */
++#define R_PPC64_GOT16_LO_DS 59 /* half16ds #lo(G + A) >> 2 */
++#define R_PPC64_PLT16_LO_DS 60 /* half16ds #lo(L + A) >> 2 */
++#define R_PPC64_SECTOFF_DS 61 /* half16ds* (R + A) >> 2 */
++#define R_PPC64_SECTOFF_LO_DS 62 /* half16ds #lo(R + A) >> 2 */
++#define R_PPC64_TOC16_DS 63 /* half16ds* (S + A - .TOC.) >> 2 */
++#define R_PPC64_TOC16_LO_DS 64 /* half16ds #lo(S + A - .TOC.) >> 2 */
++#define R_PPC64_PLTGOT16_DS 65 /* half16ds* (M + A) >> 2 */
++#define R_PPC64_PLTGOT16_LO_DS 66 /* half16ds #lo(M + A) >> 2 */
++
++/* PowerPC64 relocations defined for the TLS access ABI. */
++#define R_PPC64_TLS 67 /* none (sym+add)@tls */
++#define R_PPC64_DTPMOD64 68 /* doubleword64 (sym+add)@dtpmod */
++#define R_PPC64_TPREL16 69 /* half16* (sym+add)@tprel */
++#define R_PPC64_TPREL16_LO 70 /* half16 (sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HI 71 /* half16 (sym+add)@tprel@h */
++#define R_PPC64_TPREL16_HA 72 /* half16 (sym+add)@tprel@ha */
++#define R_PPC64_TPREL64 73 /* doubleword64 (sym+add)@tprel */
++#define R_PPC64_DTPREL16 74 /* half16* (sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO 75 /* half16 (sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HI 76 /* half16 (sym+add)@dtprel@h */
++#define R_PPC64_DTPREL16_HA 77 /* half16 (sym+add)@dtprel@ha */
++#define R_PPC64_DTPREL64 78 /* doubleword64 (sym+add)@dtprel */
++#define R_PPC64_GOT_TLSGD16 79 /* half16* (sym+add)@got@tlsgd */
++#define R_PPC64_GOT_TLSGD16_LO 80 /* half16 (sym+add)@got@tlsgd@l */
++#define R_PPC64_GOT_TLSGD16_HI 81 /* half16 (sym+add)@got@tlsgd@h */
++#define R_PPC64_GOT_TLSGD16_HA 82 /* half16 (sym+add)@got@tlsgd@ha */
++#define R_PPC64_GOT_TLSLD16 83 /* half16* (sym+add)@got@tlsld */
++#define R_PPC64_GOT_TLSLD16_LO 84 /* half16 (sym+add)@got@tlsld@l */
++#define R_PPC64_GOT_TLSLD16_HI 85 /* half16 (sym+add)@got@tlsld@h */
++#define R_PPC64_GOT_TLSLD16_HA 86 /* half16 (sym+add)@got@tlsld@ha */
++#define R_PPC64_GOT_TPREL16_DS 87 /* half16ds* (sym+add)@got@tprel */
++#define R_PPC64_GOT_TPREL16_LO_DS 88 /* half16ds (sym+add)@got@tprel@l */
++#define R_PPC64_GOT_TPREL16_HI 89 /* half16 (sym+add)@got@tprel@h */
++#define R_PPC64_GOT_TPREL16_HA 90 /* half16 (sym+add)@got@tprel@ha */
++#define R_PPC64_GOT_DTPREL16_DS 91 /* half16ds* (sym+add)@got@dtprel */
++#define R_PPC64_GOT_DTPREL16_LO_DS 92 /* half16ds (sym+add)@got@dtprel@l */
++#define R_PPC64_GOT_DTPREL16_HI 93 /* half16 (sym+add)@got@dtprel@h */
++#define R_PPC64_GOT_DTPREL16_HA 94 /* half16 (sym+add)@got@dtprel@ha */
++#define R_PPC64_TPREL16_DS 95 /* half16ds* (sym+add)@tprel */
++#define R_PPC64_TPREL16_LO_DS 96 /* half16ds (sym+add)@tprel@l */
++#define R_PPC64_TPREL16_HIGHER 97 /* half16 (sym+add)@tprel@higher */
++#define R_PPC64_TPREL16_HIGHERA 98 /* half16 (sym+add)@tprel@highera */
++#define R_PPC64_TPREL16_HIGHEST 99 /* half16 (sym+add)@tprel@highest */
++#define R_PPC64_TPREL16_HIGHESTA 100 /* half16 (sym+add)@tprel@highesta */
++#define R_PPC64_DTPREL16_DS 101 /* half16ds* (sym+add)@dtprel */
++#define R_PPC64_DTPREL16_LO_DS 102 /* half16ds (sym+add)@dtprel@l */
++#define R_PPC64_DTPREL16_HIGHER 103 /* half16 (sym+add)@dtprel@higher */
++#define R_PPC64_DTPREL16_HIGHERA 104 /* half16 (sym+add)@dtprel@highera */
++#define R_PPC64_DTPREL16_HIGHEST 105 /* half16 (sym+add)@dtprel@highest */
++#define R_PPC64_DTPREL16_HIGHESTA 106 /* half16 (sym+add)@dtprel@highesta */
++
++/* Keep this the last entry. */
++#define R_PPC64_NUM 107
++
++/* PowerPC64 specific values for the Dyn d_tag field. */
++#define DT_PPC64_GLINK (DT_LOPROC + 0)
++#define DT_PPC64_OPD (DT_LOPROC + 1)
++#define DT_PPC64_OPDSZ (DT_LOPROC + 2)
++#define DT_PPC64_NUM 3
++
++
++/* ARM specific declarations */
++
++/* Processor specific flags for the ELF header e_flags field. */
++#define EF_ARM_RELEXEC 0x01
++#define EF_ARM_HASENTRY 0x02
++#define EF_ARM_INTERWORK 0x04
++#define EF_ARM_APCS_26 0x08
++#define EF_ARM_APCS_FLOAT 0x10
++#define EF_ARM_PIC 0x20
++#define EF_ARM_ALIGN8 0x40 /* 8-bit structure alignment is in use */
++#define EF_ARM_NEW_ABI 0x80
++#define EF_ARM_OLD_ABI 0x100
++
++/* Other constants defined in the ARM ELF spec. version B-01. */
++/* NB. These conflict with values defined above. */
++#define EF_ARM_SYMSARESORTED 0x04
++#define EF_ARM_DYNSYMSUSESEGIDX 0x08
++#define EF_ARM_MAPSYMSFIRST 0x10
++#define EF_ARM_EABIMASK 0XFF000000
++
++#define EF_ARM_EABI_VERSION(flags) ((flags) & EF_ARM_EABIMASK)
++#define EF_ARM_EABI_UNKNOWN 0x00000000
++#define EF_ARM_EABI_VER1 0x01000000
++#define EF_ARM_EABI_VER2 0x02000000
++
++/* Additional symbol types for Thumb */
++#define STT_ARM_TFUNC 0xd
++
++/* ARM-specific values for sh_flags */
++#define SHF_ARM_ENTRYSECT 0x10000000 /* Section contains an entry point */
++#define SHF_ARM_COMDEF 0x80000000 /* Section may be multiply defined
++ in the input to a link step */
++
++/* ARM-specific program header flags */
++#define PF_ARM_SB 0x10000000 /* Segment contains the location
++ addressed by the static base */
++
++/* Processor specific values for the Phdr p_type field. */
++#define PT_ARM_EXIDX 0x70000001 /* .ARM.exidx segment */
++
++/* ARM relocs. */
++
++#define R_ARM_NONE 0 /* No reloc */
++#define R_ARM_PC24 1 /* PC relative 26 bit branch */
++#define R_ARM_ABS32 2 /* Direct 32 bit */
++#define R_ARM_REL32 3 /* PC relative 32 bit */
++#define R_ARM_PC13 4
++#define R_ARM_ABS16 5 /* Direct 16 bit */
++#define R_ARM_ABS12 6 /* Direct 12 bit */
++#define R_ARM_THM_ABS5 7
++#define R_ARM_ABS8 8 /* Direct 8 bit */
++#define R_ARM_SBREL32 9
++#define R_ARM_THM_PC22 10
++#define R_ARM_THM_PC8 11
++#define R_ARM_AMP_VCALL9 12
++#define R_ARM_SWI24 13
++#define R_ARM_THM_SWI8 14
++#define R_ARM_XPC25 15
++#define R_ARM_THM_XPC22 16
++#define R_ARM_TLS_DTPMOD32 17 /* ID of module containing symbol */
++#define R_ARM_TLS_DTPOFF32 18 /* Offset in TLS block */
++#define R_ARM_TLS_TPOFF32 19 /* Offset in static TLS block */
++#define R_ARM_COPY 20 /* Copy symbol at runtime */
++#define R_ARM_GLOB_DAT 21 /* Create GOT entry */
++#define R_ARM_JUMP_SLOT 22 /* Create PLT entry */
++#define R_ARM_RELATIVE 23 /* Adjust by program base */
++#define R_ARM_GOTOFF 24 /* 32 bit offset to GOT */
++#define R_ARM_GOTPC 25 /* 32 bit PC relative offset to GOT */
++#define R_ARM_GOT32 26 /* 32 bit GOT entry */
++#define R_ARM_PLT32 27 /* 32 bit PLT address */
++#define R_ARM_ALU_PCREL_7_0 32
++#define R_ARM_ALU_PCREL_15_8 33
++#define R_ARM_ALU_PCREL_23_15 34
++#define R_ARM_LDR_SBREL_11_0 35
++#define R_ARM_ALU_SBREL_19_12 36
++#define R_ARM_ALU_SBREL_27_20 37
++#define R_ARM_GNU_VTENTRY 100
++#define R_ARM_GNU_VTINHERIT 101
++#define R_ARM_THM_PC11 102 /* thumb unconditional branch */
++#define R_ARM_THM_PC9 103 /* thumb conditional branch */
++#define R_ARM_TLS_GD32 104 /* PC-rel 32 bit for global dynamic
++ thread local data */
++#define R_ARM_TLS_LDM32 105 /* PC-rel 32 bit for local dynamic
++ thread local data */
++#define R_ARM_TLS_LDO32 106 /* 32 bit offset relative to TLS
++ block */
++#define R_ARM_TLS_IE32 107 /* PC-rel 32 bit for GOT entry of
++ static TLS block offset */
++#define R_ARM_TLS_LE32 108 /* 32 bit offset relative to static
++ TLS block */
++#define R_ARM_RXPC25 249
++#define R_ARM_RSBREL32 250
++#define R_ARM_THM_RPC22 251
++#define R_ARM_RREL32 252
++#define R_ARM_RABS22 253
++#define R_ARM_RPC24 254
++#define R_ARM_RBASE 255
++/* Keep this the last entry. */
++#define R_ARM_NUM 256
++
++/* IA-64 specific declarations. */
++
++/* Processor specific flags for the Ehdr e_flags field. */
++#define EF_IA_64_MASKOS 0x0000000f /* os-specific flags */
++#define EF_IA_64_ABI64 0x00000010 /* 64-bit ABI */
++#define EF_IA_64_ARCH 0xff000000 /* arch. version mask */
++
++/* Processor specific values for the Phdr p_type field. */
++#define PT_IA_64_ARCHEXT (PT_LOPROC + 0) /* arch extension bits */
++#define PT_IA_64_UNWIND (PT_LOPROC + 1) /* ia64 unwind bits */
++#define PT_IA_64_HP_OPT_ANOT (PT_LOOS + 0x12)
++#define PT_IA_64_HP_HSL_ANOT (PT_LOOS + 0x13)
++#define PT_IA_64_HP_STACK (PT_LOOS + 0x14)
++
++/* Processor specific flags for the Phdr p_flags field. */
++#define PF_IA_64_NORECOV 0x80000000 /* spec insns w/o recovery */
++
++/* Processor specific values for the Shdr sh_type field. */
++#define SHT_IA_64_EXT (SHT_LOPROC + 0) /* extension bits */
++#define SHT_IA_64_UNWIND (SHT_LOPROC + 1) /* unwind bits */
++
++/* Processor specific flags for the Shdr sh_flags field. */
++#define SHF_IA_64_SHORT 0x10000000 /* section near gp */
++#define SHF_IA_64_NORECOV 0x20000000 /* spec insns w/o recovery */
++
++/* Processor specific values for the Dyn d_tag field. */
++#define DT_IA_64_PLT_RESERVE (DT_LOPROC + 0)
++#define DT_IA_64_NUM 1
++
++/* IA-64 relocations. */
++#define R_IA64_NONE 0x00 /* none */
++#define R_IA64_IMM14 0x21 /* symbol + addend, add imm14 */
++#define R_IA64_IMM22 0x22 /* symbol + addend, add imm22 */
++#define R_IA64_IMM64 0x23 /* symbol + addend, mov imm64 */
++#define R_IA64_DIR32MSB 0x24 /* symbol + addend, data4 MSB */
++#define R_IA64_DIR32LSB 0x25 /* symbol + addend, data4 LSB */
++#define R_IA64_DIR64MSB 0x26 /* symbol + addend, data8 MSB */
++#define R_IA64_DIR64LSB 0x27 /* symbol + addend, data8 LSB */
++#define R_IA64_GPREL22 0x2a /* @gprel(sym + add), add imm22 */
++#define R_IA64_GPREL64I 0x2b /* @gprel(sym + add), mov imm64 */
++#define R_IA64_GPREL32MSB 0x2c /* @gprel(sym + add), data4 MSB */
++#define R_IA64_GPREL32LSB 0x2d /* @gprel(sym + add), data4 LSB */
++#define R_IA64_GPREL64MSB 0x2e /* @gprel(sym + add), data8 MSB */
++#define R_IA64_GPREL64LSB 0x2f /* @gprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF22 0x32 /* @ltoff(sym + add), add imm22 */
++#define R_IA64_LTOFF64I 0x33 /* @ltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF22 0x3a /* @pltoff(sym + add), add imm22 */
++#define R_IA64_PLTOFF64I 0x3b /* @pltoff(sym + add), mov imm64 */
++#define R_IA64_PLTOFF64MSB 0x3e /* @pltoff(sym + add), data8 MSB */
++#define R_IA64_PLTOFF64LSB 0x3f /* @pltoff(sym + add), data8 LSB */
++#define R_IA64_FPTR64I 0x43 /* @fptr(sym + add), mov imm64 */
++#define R_IA64_FPTR32MSB 0x44 /* @fptr(sym + add), data4 MSB */
++#define R_IA64_FPTR32LSB 0x45 /* @fptr(sym + add), data4 LSB */
++#define R_IA64_FPTR64MSB 0x46 /* @fptr(sym + add), data8 MSB */
++#define R_IA64_FPTR64LSB 0x47 /* @fptr(sym + add), data8 LSB */
++#define R_IA64_PCREL60B 0x48 /* @pcrel(sym + add), brl */
++#define R_IA64_PCREL21B 0x49 /* @pcrel(sym + add), ptb, call */
++#define R_IA64_PCREL21M 0x4a /* @pcrel(sym + add), chk.s */
++#define R_IA64_PCREL21F 0x4b /* @pcrel(sym + add), fchkf */
++#define R_IA64_PCREL32MSB 0x4c /* @pcrel(sym + add), data4 MSB */
++#define R_IA64_PCREL32LSB 0x4d /* @pcrel(sym + add), data4 LSB */
++#define R_IA64_PCREL64MSB 0x4e /* @pcrel(sym + add), data8 MSB */
++#define R_IA64_PCREL64LSB 0x4f /* @pcrel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_FPTR22 0x52 /* @ltoff(@fptr(s+a)), imm22 */
++#define R_IA64_LTOFF_FPTR64I 0x53 /* @ltoff(@fptr(s+a)), imm64 */
++#define R_IA64_LTOFF_FPTR32MSB 0x54 /* @ltoff(@fptr(s+a)), data4 MSB */
++#define R_IA64_LTOFF_FPTR32LSB 0x55 /* @ltoff(@fptr(s+a)), data4 LSB */
++#define R_IA64_LTOFF_FPTR64MSB 0x56 /* @ltoff(@fptr(s+a)), data8 MSB */
++#define R_IA64_LTOFF_FPTR64LSB 0x57 /* @ltoff(@fptr(s+a)), data8 LSB */
++#define R_IA64_SEGREL32MSB 0x5c /* @segrel(sym + add), data4 MSB */
++#define R_IA64_SEGREL32LSB 0x5d /* @segrel(sym + add), data4 LSB */
++#define R_IA64_SEGREL64MSB 0x5e /* @segrel(sym + add), data8 MSB */
++#define R_IA64_SEGREL64LSB 0x5f /* @segrel(sym + add), data8 LSB */
++#define R_IA64_SECREL32MSB 0x64 /* @secrel(sym + add), data4 MSB */
++#define R_IA64_SECREL32LSB 0x65 /* @secrel(sym + add), data4 LSB */
++#define R_IA64_SECREL64MSB 0x66 /* @secrel(sym + add), data8 MSB */
++#define R_IA64_SECREL64LSB 0x67 /* @secrel(sym + add), data8 LSB */
++#define R_IA64_REL32MSB 0x6c /* data 4 + REL */
++#define R_IA64_REL32LSB 0x6d /* data 4 + REL */
++#define R_IA64_REL64MSB 0x6e /* data 8 + REL */
++#define R_IA64_REL64LSB 0x6f /* data 8 + REL */
++#define R_IA64_LTV32MSB 0x74 /* symbol + addend, data4 MSB */
++#define R_IA64_LTV32LSB 0x75 /* symbol + addend, data4 LSB */
++#define R_IA64_LTV64MSB 0x76 /* symbol + addend, data8 MSB */
++#define R_IA64_LTV64LSB 0x77 /* symbol + addend, data8 LSB */
++#define R_IA64_PCREL21BI 0x79 /* @pcrel(sym + add), 21bit inst */
++#define R_IA64_PCREL22 0x7a /* @pcrel(sym + add), 22bit inst */
++#define R_IA64_PCREL64I 0x7b /* @pcrel(sym + add), 64bit inst */
++#define R_IA64_IPLTMSB 0x80 /* dynamic reloc, imported PLT, MSB */
++#define R_IA64_IPLTLSB 0x81 /* dynamic reloc, imported PLT, LSB */
++#define R_IA64_COPY 0x84 /* copy relocation */
++#define R_IA64_SUB 0x85 /* Addend and symbol difference */
++#define R_IA64_LTOFF22X 0x86 /* LTOFF22, relaxable. */
++#define R_IA64_LDXMOV 0x87 /* Use of LTOFF22X. */
++#define R_IA64_TPREL14 0x91 /* @tprel(sym + add), imm14 */
++#define R_IA64_TPREL22 0x92 /* @tprel(sym + add), imm22 */
++#define R_IA64_TPREL64I 0x93 /* @tprel(sym + add), imm64 */
++#define R_IA64_TPREL64MSB 0x96 /* @tprel(sym + add), data8 MSB */
++#define R_IA64_TPREL64LSB 0x97 /* @tprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_TPREL22 0x9a /* @ltoff(@tprel(s+a)), imm2 */
++#define R_IA64_DTPMOD64MSB 0xa6 /* @dtpmod(sym + add), data8 MSB */
++#define R_IA64_DTPMOD64LSB 0xa7 /* @dtpmod(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPMOD22 0xaa /* @ltoff(@dtpmod(sym + add)), imm22 */
++#define R_IA64_DTPREL14 0xb1 /* @dtprel(sym + add), imm14 */
++#define R_IA64_DTPREL22 0xb2 /* @dtprel(sym + add), imm22 */
++#define R_IA64_DTPREL64I 0xb3 /* @dtprel(sym + add), imm64 */
++#define R_IA64_DTPREL32MSB 0xb4 /* @dtprel(sym + add), data4 MSB */
++#define R_IA64_DTPREL32LSB 0xb5 /* @dtprel(sym + add), data4 LSB */
++#define R_IA64_DTPREL64MSB 0xb6 /* @dtprel(sym + add), data8 MSB */
++#define R_IA64_DTPREL64LSB 0xb7 /* @dtprel(sym + add), data8 LSB */
++#define R_IA64_LTOFF_DTPREL22 0xba /* @ltoff(@dtprel(s+a)), imm22 */
++
++/* SH specific declarations */
++
++/* SH relocs. */
++#define R_SH_NONE 0
++#define R_SH_DIR32 1
++#define R_SH_REL32 2
++#define R_SH_DIR8WPN 3
++#define R_SH_IND12W 4
++#define R_SH_DIR8WPL 5
++#define R_SH_DIR8WPZ 6
++#define R_SH_DIR8BP 7
++#define R_SH_DIR8W 8
++#define R_SH_DIR8L 9
++#define R_SH_SWITCH16 25
++#define R_SH_SWITCH32 26
++#define R_SH_USES 27
++#define R_SH_COUNT 28
++#define R_SH_ALIGN 29
++#define R_SH_CODE 30
++#define R_SH_DATA 31
++#define R_SH_LABEL 32
++#define R_SH_SWITCH8 33
++#define R_SH_GNU_VTINHERIT 34
++#define R_SH_GNU_VTENTRY 35
++#define R_SH_TLS_GD_32 144
++#define R_SH_TLS_LD_32 145
++#define R_SH_TLS_LDO_32 146
++#define R_SH_TLS_IE_32 147
++#define R_SH_TLS_LE_32 148
++#define R_SH_TLS_DTPMOD32 149
++#define R_SH_TLS_DTPOFF32 150
++#define R_SH_TLS_TPOFF32 151
++#define R_SH_GOT32 160
++#define R_SH_PLT32 161
++#define R_SH_COPY 162
++#define R_SH_GLOB_DAT 163
++#define R_SH_JMP_SLOT 164
++#define R_SH_RELATIVE 165
++#define R_SH_GOTOFF 166
++#define R_SH_GOTPC 167
++/* Keep this the last entry. */
++#define R_SH_NUM 256
++
++/* Additional s390 relocs */
++
++#define R_390_NONE 0 /* No reloc. */
++#define R_390_8 1 /* Direct 8 bit. */
++#define R_390_12 2 /* Direct 12 bit. */
++#define R_390_16 3 /* Direct 16 bit. */
++#define R_390_32 4 /* Direct 32 bit. */
++#define R_390_PC32 5 /* PC relative 32 bit. */
++#define R_390_GOT12 6 /* 12 bit GOT offset. */
++#define R_390_GOT32 7 /* 32 bit GOT offset. */
++#define R_390_PLT32 8 /* 32 bit PC relative PLT address. */
++#define R_390_COPY 9 /* Copy symbol at runtime. */
++#define R_390_GLOB_DAT 10 /* Create GOT entry. */
++#define R_390_JMP_SLOT 11 /* Create PLT entry. */
++#define R_390_RELATIVE 12 /* Adjust by program base. */
++#define R_390_GOTOFF32 13 /* 32 bit offset to GOT. */
++#define R_390_GOTPC 14 /* 32 bit PC relative offset to GOT. */
++#define R_390_GOT16 15 /* 16 bit GOT offset. */
++#define R_390_PC16 16 /* PC relative 16 bit. */
++#define R_390_PC16DBL 17 /* PC relative 16 bit shifted by 1. */
++#define R_390_PLT16DBL 18 /* 16 bit PC rel. PLT shifted by 1. */
++#define R_390_PC32DBL 19 /* PC relative 32 bit shifted by 1. */
++#define R_390_PLT32DBL 20 /* 32 bit PC rel. PLT shifted by 1. */
++#define R_390_GOTPCDBL 21 /* 32 bit PC rel. GOT shifted by 1. */
++#define R_390_64 22 /* Direct 64 bit. */
++#define R_390_PC64 23 /* PC relative 64 bit. */
++#define R_390_GOT64 24 /* 64 bit GOT offset. */
++#define R_390_PLT64 25 /* 64 bit PC relative PLT address. */
++#define R_390_GOTENT 26 /* 32 bit PC rel. to GOT entry >> 1. */
++#define R_390_GOTOFF16 27 /* 16 bit offset to GOT. */
++#define R_390_GOTOFF64 28 /* 64 bit offset to GOT. */
++#define R_390_GOTPLT12 29 /* 12 bit offset to jump slot. */
++#define R_390_GOTPLT16 30 /* 16 bit offset to jump slot. */
++#define R_390_GOTPLT32 31 /* 32 bit offset to jump slot. */
++#define R_390_GOTPLT64 32 /* 64 bit offset to jump slot. */
++#define R_390_GOTPLTENT 33 /* 32 bit rel. offset to jump slot. */
++#define R_390_PLTOFF16 34 /* 16 bit offset from GOT to PLT. */
++#define R_390_PLTOFF32 35 /* 32 bit offset from GOT to PLT. */
++#define R_390_PLTOFF64 36 /* 16 bit offset from GOT to PLT. */
++#define R_390_TLS_LOAD 37 /* Tag for load insn in TLS code. */
++#define R_390_TLS_GDCALL 38 /* Tag for function call in general
++ dynamic TLS code. */
++#define R_390_TLS_LDCALL 39 /* Tag for function call in local
++ dynamic TLS code. */
++#define R_390_TLS_GD32 40 /* Direct 32 bit for general dynamic
++ thread local data. */
++#define R_390_TLS_GD64 41 /* Direct 64 bit for general dynamic
++ thread local data. */
++#define R_390_TLS_GOTIE12 42 /* 12 bit GOT offset for static TLS
++ block offset. */
++#define R_390_TLS_GOTIE32 43 /* 32 bit GOT offset for static TLS
++ block offset. */
++#define R_390_TLS_GOTIE64 44 /* 64 bit GOT offset for static TLS
++ block offset. */
++#define R_390_TLS_LDM32 45 /* Direct 32 bit for local dynamic
++ thread local data in LE code. */
++#define R_390_TLS_LDM64 46 /* Direct 64 bit for local dynamic
++ thread local data in LE code. */
++#define R_390_TLS_IE32 47 /* 32 bit address of GOT entry for
++ negated static TLS block offset. */
++#define R_390_TLS_IE64 48 /* 64 bit address of GOT entry for
++ negated static TLS block offset. */
++#define R_390_TLS_IEENT 49 /* 32 bit rel. offset to GOT entry for
++ negated static TLS block offset. */
++#define R_390_TLS_LE32 50 /* 32 bit negated offset relative to
++ static TLS block. */
++#define R_390_TLS_LE64 51 /* 64 bit negated offset relative to
++ static TLS block. */
++#define R_390_TLS_LDO32 52 /* 32 bit offset relative to TLS
++ block. */
++#define R_390_TLS_LDO64 53 /* 64 bit offset relative to TLS
++ block. */
++#define R_390_TLS_DTPMOD 54 /* ID of module containing symbol. */
++#define R_390_TLS_DTPOFF 55 /* Offset in TLS block. */
++#define R_390_TLS_TPOFF 56 /* Negated offset in static TLS
++ block. */
++#define R_390_20 57 /* Direct 20 bit. */
++#define R_390_GOT20 58 /* 20 bit GOT offset. */
++#define R_390_GOTPLT20 59 /* 20 bit offset to jump slot. */
++#define R_390_TLS_GOTIE20 60 /* 20 bit GOT offset for static TLS
++ block offset. */
++/* Keep this the last entry. */
++#define R_390_NUM 61
++
++
++/* CRIS relocations. */
++#define R_CRIS_NONE 0
++#define R_CRIS_8 1
++#define R_CRIS_16 2
++#define R_CRIS_32 3
++#define R_CRIS_8_PCREL 4
++#define R_CRIS_16_PCREL 5
++#define R_CRIS_32_PCREL 6
++#define R_CRIS_GNU_VTINHERIT 7
++#define R_CRIS_GNU_VTENTRY 8
++#define R_CRIS_COPY 9
++#define R_CRIS_GLOB_DAT 10
++#define R_CRIS_JUMP_SLOT 11
++#define R_CRIS_RELATIVE 12
++#define R_CRIS_16_GOT 13
++#define R_CRIS_32_GOT 14
++#define R_CRIS_16_GOTPLT 15
++#define R_CRIS_32_GOTPLT 16
++#define R_CRIS_32_GOTREL 17
++#define R_CRIS_32_PLT_GOTREL 18
++#define R_CRIS_32_PLT_PCREL 19
++
++#define R_CRIS_NUM 20
++
++
++/* AMD x86-64 relocations. */
++#define R_X86_64_NONE 0 /* No reloc */
++#define R_X86_64_64 1 /* Direct 64 bit */
++#define R_X86_64_PC32 2 /* PC relative 32 bit signed */
++#define R_X86_64_GOT32 3 /* 32 bit GOT entry */
++#define R_X86_64_PLT32 4 /* 32 bit PLT address */
++#define R_X86_64_COPY 5 /* Copy symbol at runtime */
++#define R_X86_64_GLOB_DAT 6 /* Create GOT entry */
++#define R_X86_64_JUMP_SLOT 7 /* Create PLT entry */
++#define R_X86_64_RELATIVE 8 /* Adjust by program base */
++#define R_X86_64_GOTPCREL 9 /* 32 bit signed PC relative
++ offset to GOT */
++#define R_X86_64_32 10 /* Direct 32 bit zero extended */
++#define R_X86_64_32S 11 /* Direct 32 bit sign extended */
++#define R_X86_64_16 12 /* Direct 16 bit zero extended */
++#define R_X86_64_PC16 13 /* 16 bit sign extended pc relative */
++#define R_X86_64_8 14 /* Direct 8 bit sign extended */
++#define R_X86_64_PC8 15 /* 8 bit sign extended pc relative */
++#define R_X86_64_DTPMOD64 16 /* ID of module containing symbol */
++#define R_X86_64_DTPOFF64 17 /* Offset in module's TLS block */
++#define R_X86_64_TPOFF64 18 /* Offset in initial TLS block */
++#define R_X86_64_TLSGD 19 /* 32 bit signed PC relative offset
++ to two GOT entries for GD symbol */
++#define R_X86_64_TLSLD 20 /* 32 bit signed PC relative offset
++ to two GOT entries for LD symbol */
++#define R_X86_64_DTPOFF32 21 /* Offset in TLS block */
++#define R_X86_64_GOTTPOFF 22 /* 32 bit signed PC relative offset
++ to GOT entry for IE symbol */
++#define R_X86_64_TPOFF32 23 /* Offset in initial TLS block */
++
++#define R_X86_64_NUM 24
++
++
++/* AM33 relocations. */
++#define R_MN10300_NONE 0 /* No reloc. */
++#define R_MN10300_32 1 /* Direct 32 bit. */
++#define R_MN10300_16 2 /* Direct 16 bit. */
++#define R_MN10300_8 3 /* Direct 8 bit. */
++#define R_MN10300_PCREL32 4 /* PC-relative 32-bit. */
++#define R_MN10300_PCREL16 5 /* PC-relative 16-bit signed. */
++#define R_MN10300_PCREL8 6 /* PC-relative 8-bit signed. */
++#define R_MN10300_GNU_VTINHERIT 7 /* Ancient C++ vtable garbage... */
++#define R_MN10300_GNU_VTENTRY 8 /* ... collection annotation. */
++#define R_MN10300_24 9 /* Direct 24 bit. */
++#define R_MN10300_GOTPC32 10 /* 32-bit PCrel offset to GOT. */
++#define R_MN10300_GOTPC16 11 /* 16-bit PCrel offset to GOT. */
++#define R_MN10300_GOTOFF32 12 /* 32-bit offset from GOT. */
++#define R_MN10300_GOTOFF24 13 /* 24-bit offset from GOT. */
++#define R_MN10300_GOTOFF16 14 /* 16-bit offset from GOT. */
++#define R_MN10300_PLT32 15 /* 32-bit PCrel to PLT entry. */
++#define R_MN10300_PLT16 16 /* 16-bit PCrel to PLT entry. */
++#define R_MN10300_GOT32 17 /* 32-bit offset to GOT entry. */
++#define R_MN10300_GOT24 18 /* 24-bit offset to GOT entry. */
++#define R_MN10300_GOT16 19 /* 16-bit offset to GOT entry. */
++#define R_MN10300_COPY 20 /* Copy symbol at runtime. */
++#define R_MN10300_GLOB_DAT 21 /* Create GOT entry. */
++#define R_MN10300_JMP_SLOT 22 /* Create PLT entry. */
++#define R_MN10300_RELATIVE 23 /* Adjust by program base. */
++
++#define R_MN10300_NUM 24
++
++
++/* M32R relocs. */
++#define R_M32R_NONE 0 /* No reloc. */
++#define R_M32R_16 1 /* Direct 16 bit. */
++#define R_M32R_32 2 /* Direct 32 bit. */
++#define R_M32R_24 3 /* Direct 24 bit. */
++#define R_M32R_10_PCREL 4 /* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL 5 /* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL 6 /* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO 7 /* High 16 bit with unsigned low. */
++#define R_M32R_HI16_SLO 8 /* High 16 bit with signed low. */
++#define R_M32R_LO16 9 /* Low 16 bit. */
++#define R_M32R_SDA16 10 /* 16 bit offset in SDA. */
++#define R_M32R_GNU_VTINHERIT 11
++#define R_M32R_GNU_VTENTRY 12
++/* M32R relocs use SHT_RELA. */
++#define R_M32R_16_RELA 33 /* Direct 16 bit. */
++#define R_M32R_32_RELA 34 /* Direct 32 bit. */
++#define R_M32R_24_RELA 35 /* Direct 24 bit. */
++#define R_M32R_10_PCREL_RELA 36 /* PC relative 10 bit shifted. */
++#define R_M32R_18_PCREL_RELA 37 /* PC relative 18 bit shifted. */
++#define R_M32R_26_PCREL_RELA 38 /* PC relative 26 bit shifted. */
++#define R_M32R_HI16_ULO_RELA 39 /* High 16 bit with unsigned low */
++#define R_M32R_HI16_SLO_RELA 40 /* High 16 bit with signed low */
++#define R_M32R_LO16_RELA 41 /* Low 16 bit */
++#define R_M32R_SDA16_RELA 42 /* 16 bit offset in SDA */
++#define R_M32R_RELA_GNU_VTINHERIT 43
++#define R_M32R_RELA_GNU_VTENTRY 44
++#define R_M32R_REL32 45 /* PC relative 32 bit. */
++
++#define R_M32R_GOT24 48 /* 24 bit GOT entry */
++#define R_M32R_26_PLTREL 49 /* 26 bit PC relative to PLT shifted */
++#define R_M32R_COPY 50 /* Copy symbol at runtime */
++#define R_M32R_GLOB_DAT 51 /* Create GOT entry */
++#define R_M32R_JMP_SLOT 52 /* Create PLT entry */
++#define R_M32R_RELATIVE 53 /* Adjust by program base */
++#define R_M32R_GOTOFF 54 /* 24 bit offset to GOT */
++#define R_M32R_GOTPC24 55 /* 24 bit PC relative offset to GOT */
++#define R_M32R_GOT16_HI_ULO 56 /* High 16 bit GOT entry with unsigned
++ low */
++#define R_M32R_GOT16_HI_SLO 57 /* High 16 bit GOT entry with signed
++ low */
++#define R_M32R_GOT16_LO 58 /* Low 16 bit GOT entry */
++#define R_M32R_GOTPC_HI_ULO 59 /* High 16 bit PC relative offset to
++ GOT with unsigned low */
++#define R_M32R_GOTPC_HI_SLO 60 /* High 16 bit PC relative offset to
++ GOT with signed low */
++#define R_M32R_GOTPC_LO 61 /* Low 16 bit PC relative offset to
++ GOT */
++#define R_M32R_GOTOFF_HI_ULO 62 /* High 16 bit offset to GOT
++ with unsigned low */
++#define R_M32R_GOTOFF_HI_SLO 63 /* High 16 bit offset to GOT
++ with signed low */
++#define R_M32R_GOTOFF_LO 64 /* Low 16 bit offset to GOT */
++#define R_M32R_NUM 256 /* Keep this the last entry. */
++
++__END_DECLS
++
++#endif /* elf.h */
+--- ./hotspot/src/share/vm/utilities/elfFile.hpp 2011-05-26 17:33:59.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/elfFile.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -27,7 +27,13 @@
+
+ #ifndef _WINDOWS
+
++#ifdef __APPLE__
++#include "elf.hpp"
++#elif defined(__OpenBSD__)
++#include <sys/exec_elf.h>
++#else
+ #include <elf.h>
++#endif
+ #include <stdio.h>
+
+ #ifdef _LP64
+@@ -41,7 +47,9 @@
+ typedef Elf64_Shdr Elf_Shdr;
+ typedef Elf64_Sym Elf_Sym;
+
++#if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
+ #define ELF_ST_TYPE ELF64_ST_TYPE
++#endif
+
+ #else
+
+@@ -55,8 +63,10 @@
+ typedef Elf32_Shdr Elf_Shdr;
+ typedef Elf32_Sym Elf_Sym;
+
++#if !defined(_ALLBSD_SOURCE) || defined(__APPLE__)
+ #define ELF_ST_TYPE ELF32_ST_TYPE
+ #endif
++#endif
+
+ #include "globalDefinitions.hpp"
+ #include "memory/allocation.hpp"
+--- ./hotspot/src/share/vm/utilities/events.cpp 2011-05-26 17:34:00.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/events.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -38,6 +38,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ #ifndef PRODUCT
+--- ./hotspot/src/share/vm/utilities/exceptions.cpp 2011-05-26 17:34:00.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/exceptions.cpp 2011-05-07 21:53:42.000000000 -0700
+@@ -42,6 +42,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+
+ // Implementation of ThreadShadow
+--- ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-05-26 17:34:01.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/globalDefinitions.hpp 2011-04-23 12:09:39.000000000 -0700
+@@ -25,6 +25,8 @@
+ #ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+ #define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_HPP
+
++#define __STDC_FORMAT_MACROS
++
+ #ifdef TARGET_COMPILER_gcc
+ # include "utilities/globalDefinitions_gcc.hpp"
+ #endif
+@@ -37,6 +39,8 @@
+
+ #include "utilities/macros.hpp"
+
++#include <inttypes.h>
++
+ // This file holds all globally used constants & types, class (forward)
+ // declarations and a few frequently used utility functions.
+
+@@ -1188,20 +1192,20 @@
+ #define BOOL_TO_STR(_b_) ((_b_) ? "true" : "false")
+
+ // Format 32-bit quantities.
+-#define INT32_FORMAT "%d"
+-#define UINT32_FORMAT "%u"
++#define INT32_FORMAT "%" PRId32
++#define UINT32_FORMAT "%" PRIu32
+ #define INT32_FORMAT_W(width) "%" #width "d"
+ #define UINT32_FORMAT_W(width) "%" #width "u"
+
+-#define PTR32_FORMAT "0x%08x"
++#define PTR32_FORMAT "0x%08" PRIx32
+
+ // Format 64-bit quantities.
+-#define INT64_FORMAT "%" FORMAT64_MODIFIER "d"
+-#define UINT64_FORMAT "%" FORMAT64_MODIFIER "u"
+-#define PTR64_FORMAT "0x%016" FORMAT64_MODIFIER "x"
++#define INT64_FORMAT "%" PRId64
++#define UINT64_FORMAT "%" PRIu64
++#define PTR64_FORMAT "0x%016" PRIx64
+
+-#define INT64_FORMAT_W(width) "%" #width FORMAT64_MODIFIER "d"
+-#define UINT64_FORMAT_W(width) "%" #width FORMAT64_MODIFIER "u"
++#define INT64_FORMAT_W(width) "%" #width PRId64
++#define UINT64_FORMAT_W(width) "%" #width PRIu64
+
+ // Format macros that allow the field width to be specified. The width must be
+ // a string literal (e.g., "8") or a macro that evaluates to one.
+@@ -1226,19 +1230,17 @@
+ // using "%x".
+ #ifdef _LP64
+ #define PTR_FORMAT PTR64_FORMAT
+-#define UINTX_FORMAT UINT64_FORMAT
+-#define INTX_FORMAT INT64_FORMAT
+ #define SIZE_FORMAT UINT64_FORMAT
+ #define SSIZE_FORMAT INT64_FORMAT
+ #else // !_LP64
+ #define PTR_FORMAT PTR32_FORMAT
+-#define UINTX_FORMAT UINT32_FORMAT
+-#define INTX_FORMAT INT32_FORMAT
+ #define SIZE_FORMAT UINT32_FORMAT
+ #define SSIZE_FORMAT INT32_FORMAT
+ #endif // _LP64
++#define UINTX_FORMAT "%" PRIuPTR
++#define INTX_FORMAT "%" PRIdPTR
+
+-#define INTPTR_FORMAT PTR_FORMAT
++#define INTPTR_FORMAT "%" PRIdPTR
+
+ // Enable zap-a-lot if in debug version.
+
+--- ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-05-26 17:34:01.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp 2011-04-23 12:13:39.000000000 -0700
+@@ -76,15 +76,28 @@
# include <sys/procfs.h>
# endif
-#ifdef LINUX
+#if defined(LINUX) || defined(_ALLBSD_SOURCE)
+ #ifndef __STDC_LIMIT_MACROS
+ #define __STDC_LIMIT_MACROS
+ #endif // __STDC_LIMIT_MACROS
#include <inttypes.h>
#include <signal.h>
+#ifndef __OpenBSD__
@@ -10326,7 +14751,7 @@ $FreeBSD$
// 4810578: varargs unsafe on 32-bit integer/64-bit pointer architectures
// When __cplusplus is defined, NULL is defined as 0 (32-bit constant) in
-@@ -112,7 +125,7 @@
+@@ -120,7 +133,7 @@
// pointer is stored as integer value. On some platforms, sizeof(intptr_t) >
// sizeof(void*), so here we want something which is integer type, but has the
// same size as a pointer.
@@ -10335,7 +14760,7 @@ $FreeBSD$
#ifdef _LP64
#define NULL_WORD 0L
#else
-@@ -124,7 +137,7 @@
+@@ -132,7 +145,7 @@
#define NULL_WORD NULL
#endif
@@ -10344,7 +14769,7 @@ $FreeBSD$
// Compiler-specific primitive types
typedef unsigned short uint16_t;
#ifndef _UINT32_T
-@@ -144,7 +157,7 @@
+@@ -152,7 +165,7 @@
// prior definition of intptr_t, and add "&& !defined(XXX)" above.
#endif // _SYS_INT_TYPES_H
@@ -10353,7 +14778,7 @@ $FreeBSD$
// Additional Java basic types
-@@ -236,7 +249,9 @@
+@@ -244,7 +257,9 @@
inline int g_isnan(float f) { return isnand(f); }
#endif
inline int g_isnan(double f) { return isnand(f); }
@@ -10364,9 +14789,33 @@ $FreeBSD$
inline int g_isnan(float f) { return isnanf(f); }
inline int g_isnan(double f) { return isnan(f); }
#else
---- ./hotspot/src/share/vm/utilities/macros.hpp 2010-12-16 13:53:14.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/macros.hpp 2010-10-31 14:03:02.000000000 -0700
-@@ -158,6 +158,14 @@
+--- ./hotspot/src/share/vm/utilities/growableArray.cpp 2011-05-26 17:34:01.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/growableArray.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -34,6 +34,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+ #ifdef ASSERT
+ void GenericGrowableArray::set_nesting() {
+ if (on_stack()) {
+--- ./hotspot/src/share/vm/utilities/histogram.hpp 2011-05-26 17:34:02.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/histogram.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ // This class provides a framework for collecting various statistics.
+ // The current implementation is oriented towards counting invocations
+--- ./hotspot/src/share/vm/utilities/macros.hpp 2011-05-26 17:34:03.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/macros.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -161,6 +161,14 @@
#define NOT_WINDOWS(code) code
#endif
@@ -10378,12 +14827,22 @@ $FreeBSD$
+#define NOT_BSD(code) code
+#endif
+
- #if defined(IA32) || defined(AMD64)
- #define X86
- #define X86_ONLY(code) code
---- ./hotspot/src/share/vm/utilities/ostream.cpp 2010-12-16 13:53:14.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/ostream.cpp 2010-06-15 22:03:33.000000000 -0700
-@@ -848,7 +848,7 @@
+ #ifdef _WIN64
+ #define WIN64_ONLY(code) code
+ #define NOT_WIN64(code)
+--- ./hotspot/src/share/vm/utilities/ostream.cpp 2011-05-26 17:34:04.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/ostream.cpp 2011-04-22 22:28:37.000000000 -0700
+@@ -39,6 +39,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "os_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "os_bsd.inline.hpp"
++#endif
+
+ extern "C" void jio_print(const char* s); // Declarationtion of jvm method
+
+@@ -909,7 +912,7 @@
#ifndef PRODUCT
@@ -10392,9 +14851,48 @@ $FreeBSD$
#include <sys/types.h>
#include <sys/socket.h>
#include <netinet/in.h>
---- ./hotspot/src/share/vm/utilities/vmError.cpp 2010-12-16 13:53:14.000000000 -0800
-+++ ./hotspot/src/share/vm/utilities/vmError.cpp 2010-12-04 08:27:38.000000000 -0800
-@@ -31,13 +31,18 @@
+--- ./hotspot/src/share/vm/utilities/preserveException.hpp 2011-05-26 17:34:04.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/preserveException.hpp 2011-04-22 22:28:37.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // This file provides more support for exception handling; see also exceptions.hpp
+ class PreserveExceptionMark {
+--- ./hotspot/src/share/vm/utilities/taskqueue.cpp 2011-05-26 17:34:05.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/taskqueue.cpp 2011-04-22 22:28:38.000000000 -0700
+@@ -37,6 +37,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ #ifdef TRACESPINNING
+ uint ParallelTaskTerminator::_total_yields = 0;
+--- ./hotspot/src/share/vm/utilities/taskqueue.hpp 2011-05-26 17:34:05.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/taskqueue.hpp 2011-04-22 22:28:38.000000000 -0700
+@@ -53,6 +53,12 @@
+ #ifdef TARGET_OS_ARCH_linux_ppc
+ # include "orderAccess_linux_ppc.inline.hpp"
+ #endif
++#ifdef TARGET_OS_ARCH_bsd_x86
++# include "orderAccess_bsd_x86.inline.hpp"
++#endif
++#ifdef TARGET_OS_ARCH_bsd_zero
++# include "orderAccess_bsd_zero.inline.hpp"
++#endif
+
+ // Simple TaskQueue stats that are collected by default in debug builds.
+
+--- ./hotspot/src/share/vm/utilities/vmError.cpp 2011-05-26 17:34:07.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/vmError.cpp 2011-04-22 22:28:38.000000000 -0700
+@@ -45,13 +45,18 @@
"JAVA_HOME", "JRE_HOME", "JAVA_TOOL_OPTIONS", "_JAVA_OPTIONS", "CLASSPATH",
"JAVA_COMPILER", "PATH", "USERNAME",
@@ -10414,7 +14912,7 @@ $FreeBSD$
// defined on Windows
"OS", "PROCESSOR_IDENTIFIER", "_ALT_JAVA_HOME_DIR",
-@@ -875,7 +880,7 @@
+@@ -958,7 +963,7 @@
const char* ptr = OnError;
while ((cmd = next_OnError_command(buffer, sizeof(buffer), &ptr)) != NULL){
out.print_raw ("# Executing ");
@@ -10423,8 +14921,20 @@ $FreeBSD$
out.print_raw ("/bin/sh -c ");
#elif defined(SOLARIS)
out.print_raw ("/usr/bin/sh -c ");
---- ./hotspot/test/Makefile 2010-12-16 13:53:15.000000000 -0800
-+++ ./hotspot/test/Makefile 2010-12-04 08:29:05.000000000 -0800
+--- ./hotspot/src/share/vm/utilities/workgroup.hpp 2011-05-26 17:34:08.000000000 -0700
++++ ./hotspot/src/share/vm/utilities/workgroup.hpp 2011-04-22 22:28:38.000000000 -0700
+@@ -35,6 +35,9 @@
+ #ifdef TARGET_OS_FAMILY_windows
+ # include "thread_windows.inline.hpp"
+ #endif
++#ifdef TARGET_OS_FAMILY_bsd
++# include "thread_bsd.inline.hpp"
++#endif
+
+ // Task class hierarchy:
+ // AbstractGangTask
+--- ./hotspot/test/Makefile 2011-05-26 17:34:08.000000000 -0700
++++ ./hotspot/test/Makefile 2011-04-22 22:28:38.000000000 -0700
@@ -44,6 +44,22 @@
ARCH = i586
endif
@@ -10457,8 +14967,8 @@ $FreeBSD$
ifdef TESTDIRS
JTREG_TESTDIRS = $(TESTDIRS)
endif
---- ./hotspot/test/jprt.config 2010-12-16 13:53:18.000000000 -0800
-+++ ./hotspot/test/jprt.config 2010-06-15 22:03:33.000000000 -0700
+--- ./hotspot/test/jprt.config 2011-05-26 17:34:32.000000000 -0700
++++ ./hotspot/test/jprt.config 2011-04-22 22:28:38.000000000 -0700
@@ -75,8 +75,8 @@
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -10526,8 +15036,8 @@ $FreeBSD$
# Export PATH setting
PATH="${path4sdk}"
---- ./hotspot/test/runtime/6929067/Test6929067.sh 2010-12-16 13:53:18.000000000 -0800
-+++ ./hotspot/test/runtime/6929067/Test6929067.sh 2010-04-20 20:10:00.000000000 -0700
+--- ./hotspot/test/runtime/6929067/Test6929067.sh 2011-05-26 17:34:35.000000000 -0700
++++ ./hotspot/test/runtime/6929067/Test6929067.sh 2011-04-22 22:28:38.000000000 -0700
@@ -29,7 +29,7 @@
PS=":"
FS="/"
@@ -10537,50 +15047,50 @@ $FreeBSD$
NULL=NUL
PS=";"
FS="\\"
---- ./jaxp/.hgtags 2010-12-16 13:54:43.000000000 -0800
-+++ ./jaxp/.hgtags 2010-12-17 23:33:00.000000000 -0800
-@@ -96,3 +96,4 @@
- 9ee900f01c5872551c06f33ae909662ffd8463ac jdk7-b119
- 4821de0908defe647fcdaab4485f98873e24dea0 jdk7-b120
- 63dae40fa19fd3bf4689ea2f3c1d9d690e1abcee jdk7-b121
-+03ff13d19c8fa983cbab6542930a7f352e9b5b33 jdk7-b122
---- ./jaxp/.jcheck/conf 2010-12-16 13:54:43.000000000 -0800
+--- ./jaxp/.hgtags 2011-05-26 17:46:21.000000000 -0700
++++ ./jaxp/.hgtags 2011-05-27 00:00:49.000000000 -0700
+@@ -118,3 +118,4 @@
+ e1b5ef243445bf836d095fd44866e1771ef99374 jdk7-b141
+ 7d067af4b25e4b7e6b28bef48527d67f8650e6c5 jdk7-b142
+ 16b847e9bbd747f9d27785b2fc20d4d720cca893 jdk7-b143
++39bf6dcaab2336326b21743cef7042d0a2de9ba0 jdk7-b144
+--- ./jaxp/.jcheck/conf 2011-05-26 17:46:21.000000000 -0700
+++ ./jaxp/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jaxws/.hgtags 2010-12-16 14:00:38.000000000 -0800
-+++ ./jaxws/.hgtags 2010-12-17 23:33:03.000000000 -0800
-@@ -96,3 +96,4 @@
- 41fa02b3663795ddf529690df7aa6714210093ec jdk7-b119
- a4f2e1ca67163ef79555082809d7cd719893c338 jdk7-b120
- 0fa950117faac7bdbc94e6c46b88f6f892031c17 jdk7-b121
-+17b6c48a344968880925dcef1178fec282feb335 jdk7-b122
---- ./jaxws/.jcheck/conf 2010-12-16 14:00:39.000000000 -0800
+--- ./jaxws/.hgtags 2011-05-26 17:53:54.000000000 -0700
++++ ./jaxws/.hgtags 2011-05-27 00:00:52.000000000 -0700
+@@ -118,3 +118,4 @@
+ 66826b0aec5a1834da3821c35cf85ac154e9b04d jdk7-b141
+ 0ef3ef823c39eee3d670e58027c3219cb66f0283 jdk7-b142
+ 569d1e7ea980d172046c4aba79d96b5c3afabbba jdk7-b143
++6bd683f2d527c9afd47beac1cbf614506929598d jdk7-b144
+--- ./jaxws/.jcheck/conf 2011-05-26 17:53:54.000000000 -0700
+++ ./jaxws/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/.hgtags 2010-12-16 14:09:53.000000000 -0800
-+++ ./jdk/.hgtags 2010-12-17 23:33:08.000000000 -0800
-@@ -96,3 +96,4 @@
- ecab7eefb8f2326fd90fb632f47f1b6f81e928f8 jdk7-b119
- 37d74e29687cf07c2bf9411af58c7e42440855c3 jdk7-b120
- a661d8587b5d8986aacae086f5df66af9e1a96b1 jdk7-b121
-+ac311eb325bfc763698219252bf3cee9e091f3af jdk7-b122
---- ./jdk/.jcheck/conf 2010-12-16 14:09:53.000000000 -0800
+--- ./jdk/.hgtags 2011-05-26 18:33:40.000000000 -0700
++++ ./jdk/.hgtags 2011-05-27 00:01:00.000000000 -0700
+@@ -118,3 +118,4 @@
+ 63eeefe118da18c75ba3d36266768cd1ccaaca6b jdk7-b141
+ 312612e89ece62633f4809706dec00bcd5fe7c2d jdk7-b142
+ efbf75c24b0f31847c9c403f6dc07dc80551908d jdk7-b143
++23bdcede4e3945894574892e80b848bd9f15b5f3 jdk7-b144
+--- ./jdk/.jcheck/conf 2011-05-26 18:33:40.000000000 -0700
+++ ./jdk/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./jdk/make/com/sun/java/pack/Makefile 2010-12-16 14:09:54.000000000 -0800
-+++ ./jdk/make/com/sun/java/pack/Makefile 2010-06-15 22:06:15.000000000 -0700
-@@ -62,6 +62,7 @@
-
+--- ./jdk/make/com/sun/java/pack/Makefile 2011-05-26 18:33:44.000000000 -0700
++++ ./jdk/make/com/sun/java/pack/Makefile 2011-05-07 21:54:09.000000000 -0700
+@@ -57,6 +57,7 @@
+ vpath %.cpp $(SHARE_SRC)/native/$(PKGDIR)
ifeq ($(STANDALONE),true)
+ ifneq ($(SYSTEM_ZLIB),true)
ZIPOBJDIR = $(OUTPUTDIR)/tmp/sun/java.util.zip/zip/$(OBJDIRNAME)
ZIPOBJS = $(ZIPOBJDIR)/zcrc32.$(OBJECT_SUFFIX) \
-@@ -78,6 +79,10 @@
+@@ -73,6 +74,10 @@
ZINCLUDE=-I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
OTHER_CXXFLAGS += $(ZINCLUDE)
LDDFLAGS += $(ZIPOBJS)
@@ -10591,7 +15101,7 @@ $FreeBSD$
else
OTHER_CXXFLAGS += -DNO_ZLIB -DUNPACK_JNI
OTHER_LDLIBS += $(JVMLIB)
-@@ -99,7 +104,11 @@
+@@ -94,7 +99,11 @@
RES = $(OBJDIR)/$(PGRM).res
else
LDOUTPUT = -o #Have a space
@@ -10603,8 +15113,8 @@ $FreeBSD$
OTHER_LDLIBS += $(LIBCXX)
# setup the list of libraries to link in...
ifeq ($(PLATFORM), linux)
---- ./jdk/make/com/sun/nio/Makefile 2010-12-16 14:09:54.000000000 -0800
-+++ ./jdk/make/com/sun/nio/Makefile 2010-06-15 22:06:16.000000000 -0700
+--- ./jdk/make/com/sun/nio/Makefile 2011-05-26 18:33:46.000000000 -0700
++++ ./jdk/make/com/sun/nio/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -30,7 +30,16 @@
BUILDDIR = ../../..
include $(BUILDDIR)/common/Defs.gmk
@@ -10622,9 +15132,9 @@ $FreeBSD$
include $(BUILDDIR)/common/Subdirs.gmk
all build clean clobber::
---- ./jdk/make/com/sun/nio/sctp/Makefile 2010-12-16 14:09:54.000000000 -0800
-+++ ./jdk/make/com/sun/nio/sctp/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -60,15 +60,11 @@
+--- ./jdk/make/com/sun/nio/sctp/Makefile 2011-05-26 18:33:47.000000000 -0700
++++ ./jdk/make/com/sun/nio/sctp/Makefile 2011-04-22 23:08:15.000000000 -0700
+@@ -59,15 +59,11 @@
-I$(PLATFORM_SRC)/native/java/net \
-I$(CLASSHDRDIR)/../../../../java/java.nio/nio/CClassHeaders
@@ -10642,9 +15152,9 @@ $FreeBSD$
else # windows
include $(BUILDDIR)/common/Classes.gmk
---- ./jdk/make/com/sun/security/auth/module/Makefile 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/com/sun/security/auth/module/Makefile 2010-06-15 22:06:16.000000000 -0700
-@@ -68,7 +68,7 @@
+--- ./jdk/make/com/sun/security/auth/module/Makefile 2011-05-26 18:33:49.000000000 -0700
++++ ./jdk/make/com/sun/security/auth/module/Makefile 2011-04-22 23:08:15.000000000 -0700
+@@ -67,7 +67,7 @@
include FILES_c_solaris.gmk
endif # solaris
@@ -10653,8 +15163,8 @@ $FreeBSD$
LIBRARY = jaas_unix
include FILES_export_unix.gmk
include FILES_c_unix.gmk
---- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2010-06-15 22:06:16.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2011-05-26 18:33:51.000000000 -0700
++++ ./jdk/make/com/sun/tools/attach/Exportedfiles.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,5 +43,7 @@
sun/tools/attach/LinuxVirtualMachine.java
endif
@@ -10665,8 +15175,8 @@ $FreeBSD$
+FILES_export = \
+ sun/tools/attach/BsdVirtualMachine.java
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2010-06-15 22:06:16.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2011-05-26 18:33:51.000000000 -0700
++++ ./jdk/make/com/sun/tools/attach/FILES_c.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -39,4 +39,7 @@
LinuxVirtualMachine.c
endif
@@ -10676,8 +15186,8 @@ $FreeBSD$
+FILES_c = \
+ BsdVirtualMachine.c
+endif
---- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2010-06-15 22:06:16.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2011-05-26 18:33:51.000000000 -0700
++++ ./jdk/make/com/sun/tools/attach/FILES_java.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,6 +43,11 @@
sun/tools/attach/LinuxAttachProvider.java
endif
@@ -10690,9 +15200,9 @@ $FreeBSD$
#
# Files that need to be copied
#
---- ./jdk/make/com/sun/tools/attach/Makefile 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/Makefile 2010-06-15 22:06:16.000000000 -0700
-@@ -37,6 +37,9 @@
+--- ./jdk/make/com/sun/tools/attach/Makefile 2011-05-26 18:33:51.000000000 -0700
++++ ./jdk/make/com/sun/tools/attach/Makefile 2011-04-22 23:08:15.000000000 -0700
+@@ -36,6 +36,9 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
endif
@@ -10702,8 +15212,8 @@ $FreeBSD$
include $(BUILDDIR)/common/Mapfile-vers.gmk
#
---- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2010-07-04 12:38:37.000000000 -0700
+--- ./jdk/make/com/sun/tools/attach/mapfile-bsd 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/make/com/sun/tools/attach/mapfile-bsd 2011-04-22 23:08:15.000000000 -0700
@@ -30,14 +30,12 @@
Java_sun_tools_attach_BsdVirtualMachine_checkPermissions;
Java_sun_tools_attach_BsdVirtualMachine_close;
@@ -10720,8 +15230,8 @@ $FreeBSD$
local:
*;
};
---- ./jdk/make/common/Defs-bsd.gmk 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/make/common/Defs-bsd.gmk 2010-07-10 13:11:34.000000000 -0700
+--- ./jdk/make/common/Defs-bsd.gmk 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/make/common/Defs-bsd.gmk 2011-05-07 22:01:55.000000000 -0700
@@ -25,7 +25,7 @@
#
@@ -10740,7 +15250,7 @@ $FreeBSD$
PLATFORM_INCLUDE = $(INCLUDEDIR)/$(PLATFORM_INCLUDE_NAME)
# suffix used for make dependencies files.
-@@ -109,9 +109,11 @@
+@@ -100,9 +100,11 @@
# We need this frame pointer to make it easy to walk the stacks.
# This should be the default on X86, but ia64 and amd64 may not have this
# as the default.
@@ -10755,7 +15265,7 @@ $FreeBSD$
CFLAGS_REQUIRED_sparcv9 += -m64 -mcpu=v9
LDFLAGS_COMMON_sparcv9 += -m64 -mcpu=v9
CFLAGS_REQUIRED_sparc += -m32 -mcpu=v9
-@@ -126,9 +128,13 @@
+@@ -119,9 +121,13 @@
CFLAGS_REQUIRED = $(CFLAGS_REQUIRED_$(ARCH))
LDFLAGS_COMMON += $(LDFLAGS_COMMON_$(ARCH))
endif
@@ -10770,7 +15280,7 @@ $FreeBSD$
_HAS_HASH_STYLE_GNU:=$(shell $(CC) -dumpspecs | $(GREP) -- '--hash-style=gnu')
ifneq ($(_HAS_HASH_STYLE_GNU),)
LDFLAGS_HASH_STYLE = -Wl,--hash-style=both
-@@ -165,7 +171,7 @@
+@@ -156,7 +162,7 @@
CFLAGS_COMMON += -pipe
endif
@@ -10779,7 +15289,7 @@ $FreeBSD$
DEBUG_FLAG = -g
ifeq ($(FASTDEBUG), true)
ifeq ($(ARCH_DATA_MODEL), 64)
-@@ -202,8 +208,7 @@
+@@ -193,8 +199,7 @@
else
CPP_ARCH_FLAGS += -D_$(ARCH)_
endif
@@ -10789,7 +15299,7 @@ $FreeBSD$
-D_LARGEFILE64_SOURCE -D_GNU_SOURCE -D_REENTRANT
ifeq ($(ARCH_DATA_MODEL), 64)
-@@ -216,33 +221,37 @@
+@@ -207,44 +212,37 @@
CPPFLAGS_DBG += -DLOGGING
endif
@@ -10805,6 +15315,19 @@ $FreeBSD$
- # The environment variable LD_LIBRARY_PATH will over-ride these runpaths.
- # Try: 'readelf -d lib*.so' to see these settings in a library.
- #
+- Z_ORIGIN_FLAG/sparc = -Xlinker -z -Xlinker origin
+- Z_ORIGIN_FLAG/i586 = -Xlinker -z -Xlinker origin
+- Z_ORIGIN_FLAG/amd64 = -Xlinker -z -Xlinker origin
+- Z_ORIGIN_FLAG/ia64 = -Xlinker -z -Xlinker origin
+- Z_ORIGIN_FLAG/arm =
+- Z_ORIGIN_FLAG/ppc =
+- Z_ORIGIN_FLAG/zero = -Xlinker -z -Xlinker origin
+-
+- LDFLAG_Z_ORIGIN = $(Z_ORIGIN_FLAG/$(ARCH_FAMILY))
+-
+- LDFLAGS_COMMON += $(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN
+- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=$(LDFLAG_Z_ORIGIN) -Xlinker -rpath -Xlinker \$$ORIGIN/%)
+-
+# Libraries need to locate other libraries at runtime, and you can tell
+# a library where to look by way of the dynamic runpaths (RPATH or RUNPATH)
+# buried inside the .{so,dylib}. The {$ORIGIN,@loader_path/} says to look
@@ -10823,8 +15346,8 @@ $FreeBSD$
+ LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -rpath -Xlinker @loader_path/%)
+ LDFLAGS_COMMON += -Xlinker -install_name -Xlinker @rpath/$(@F)
+else
- LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN
- LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%)
++ LDFLAGS_COMMON += -Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN
++ LDFLAGS_COMMON += $(LD_RUNPATH_EXTRAS:%=-Xlinker -z -Xlinker origin -Xlinker -rpath -Xlinker \$$ORIGIN/%)
endif
-EXTRA_LIBS += -lc
@@ -10845,7 +15368,7 @@ $FreeBSD$
#
# -static-libgcc is a gcc-3 flag to statically link libgcc, gcc-2.9x always
-@@ -264,9 +273,9 @@
+@@ -265,9 +263,9 @@
ifeq ($(VARIANT), OPT)
ifneq ($(NO_STRIP), true)
ifneq ($(DEBUG_BINARIES), true)
@@ -10857,7 +15380,7 @@ $FreeBSD$
endif
endif
endif
-@@ -285,6 +294,11 @@
+@@ -286,6 +284,11 @@
LINK_PRE_CMD = $(QUANTIFY_CMD) $(QUANTIFY_OPTIONS)
endif
@@ -10869,7 +15392,19 @@ $FreeBSD$
#
# Path and option to link against the VM, if you have to. Note that
# there are libraries that link against only -ljava, but they do get
-@@ -311,7 +325,9 @@
+@@ -293,7 +296,11 @@
+ # the library itself should not.
+ #
+ VM_NAME = server
++ifeq ($(OS_VENDOR),Apple)
+ JVMLIB = -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
++else
++JVMLIB = -Xlinker -rpath -Xlinker $(LIBDIR)/$(LIBARCH)/$(VM_NAME) -L$(LIBDIR)/$(LIBARCH)/$(VM_NAME) -ljvm
++endif
+ JAVALIB = -ljava $(JVMLIB)
+
+ #
+@@ -312,7 +319,9 @@
override HAVE_FILIOH = false
override HAVE_GETHRTIME = false
override HAVE_GETHRVTIME = false
@@ -10879,14 +15414,13 @@ $FreeBSD$
override LEX_LIBRARY = -lfl
ifeq ($(STATIC_CXX),true)
override LIBCXX = -Wl,-Bstatic -lstdc++ -lgcc -Wl,-Bdynamic
-@@ -322,14 +338,11 @@
+@@ -323,13 +332,11 @@
override LIBSOCKET =
override LIBNSL =
override LIBTHREAD =
+override LIBDL =
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = true
--override OPENWIN_HOME = /usr/X11R6
-ifeq ($(ARCH), amd64)
-override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
-else
@@ -10896,7 +15430,7 @@ $FreeBSD$
override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
override SUN_CMM_SUBDIR =
override THREADS_FLAG = native
-@@ -350,6 +363,14 @@
+@@ -350,6 +357,14 @@
# DPS (Displayable PostScript) is available on Solaris machines
HAVE_DPS = no
@@ -10911,7 +15445,7 @@ $FreeBSD$
#
# Japanese manpages
#
-@@ -361,7 +382,7 @@
+@@ -361,7 +376,7 @@
SALIB_NAME = $(LIB_PREFIX)saproc.$(LIBRARY_SUFFIX)
# The JDI - Serviceability Agent binding is not currently supported
@@ -10920,22 +15454,21 @@ $FreeBSD$
ifeq ($(ARCH), ia64)
INCLUDE_SA = false
else
---- ./jdk/make/common/Defs-linux.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/common/Defs-linux.gmk 2010-07-10 13:10:56.000000000 -0700
-@@ -322,9 +322,10 @@
+--- ./jdk/make/common/Defs-linux.gmk 2011-05-26 18:33:52.000000000 -0700
++++ ./jdk/make/common/Defs-linux.gmk 2011-05-07 21:54:09.000000000 -0700
+@@ -323,8 +323,10 @@
override LIBSOCKET =
override LIBNSL =
override LIBTHREAD =
+override LIBDL = -ldl
override MOOT_PRIORITIES = true
override NO_INTERRUPTIBLE_IO = true
--override OPENWIN_HOME = /usr/X11R6
+override OPENWIN_HOME = $(X11_PATH)
ifeq ($(ARCH), amd64)
override OPENWIN_LIB = $(OPENWIN_HOME)/lib64
else
---- ./jdk/make/common/Defs-solaris.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/common/Defs-solaris.gmk 2010-07-10 13:11:24.000000000 -0700
+--- ./jdk/make/common/Defs-solaris.gmk 2011-05-26 18:33:52.000000000 -0700
++++ ./jdk/make/common/Defs-solaris.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -648,6 +648,9 @@
# Network Services library
LIBNSL = -lnsl
@@ -10946,11 +15479,11 @@ $FreeBSD$
# GLOBAL_KPIC: If set means all libraries are PIC, position independent code
# EXCEPT for select compiles
# If a .o file is compiled non-PIC then it should be forced
---- ./jdk/make/common/Defs.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/common/Defs.gmk 2010-12-11 09:07:22.000000000 -0800
-@@ -186,6 +186,36 @@
+--- ./jdk/make/common/Defs.gmk 2011-05-26 18:33:52.000000000 -0700
++++ ./jdk/make/common/Defs.gmk 2011-04-22 23:08:15.000000000 -0700
+@@ -109,6 +109,49 @@
endif
- endif # OPENJDK
+ endif
+ifneq ($(PLATFORM), windows)
+ ifdef ALT_X11_PATH
@@ -10961,7 +15494,7 @@ $FreeBSD$
+ else
+ X11_PATH = /usr/X11R7
+ endif
-+ endif
++ endif
+
+ ifdef ALT_PACKAGE_PATH
+ PACKAGE_PATH = $(ALT_PACKAGE_PATH)
@@ -10980,12 +15513,25 @@ $FreeBSD$
+ endif
+ endif
+ endif
++
++ # ALSA
++ ifdef ALT_ALSA_LIB_PATH
++ ALSA_LIB_PATH = $(ALT_ALSA_LIB_PATH)
++ else
++ ALSA_LIB_PATH = $(PACKAGE_PATH)/lib
++ endif
++
++ ifdef ALT_ALSA_HEADERS_PATH
++ ALSA_HEADERS_PATH = $(ALT_ALSA_HEADERS_PATH)
++ else
++ ALSA_HEADERS_PATH = $(PACKAGE_PATH)/include
++ endif
+endif
+
#
# Get platform definitions
#
-@@ -221,6 +251,7 @@
+@@ -179,6 +222,7 @@
ifdef ALT_FREETYPE_LIB_PATH
FREETYPE_LIB_PATH = $(ALT_FREETYPE_LIB_PATH)
@@ -10993,7 +15539,7 @@ $FreeBSD$
else
ifeq ($(DEVTOOLS_FT_DIR_EXISTS), true)
FREETYPE_LIB_PATH = $(DEVTOOLS_FT_DIR)/lib
-@@ -285,6 +316,10 @@
+@@ -243,6 +287,10 @@
LDLIBS_COMMON = -ldl
endif
@@ -11004,9 +15550,9 @@ $FreeBSD$
endif # PROGRAM
LDLIBS_COMMON += $(EXTRA_LIBS)
---- ./jdk/make/common/Program.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/common/Program.gmk 2010-06-15 22:06:16.000000000 -0700
-@@ -65,11 +65,27 @@
+--- ./jdk/make/common/Program.gmk 2011-05-26 18:33:53.000000000 -0700
++++ ./jdk/make/common/Program.gmk 2011-05-07 21:54:09.000000000 -0700
+@@ -73,11 +73,27 @@
# Create a dependency on libjli (Java Launcher Infrastructure)
#
# On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to
@@ -11035,7 +15581,7 @@ $FreeBSD$
ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
OTHER_LDLIBS += -ljli
-@@ -178,6 +194,10 @@
+@@ -183,6 +199,10 @@
THREADLIBS = $(LIBTHREAD)
endif # USE_PTHREADS
@@ -11046,7 +15592,7 @@ $FreeBSD$
#
# This rule only applies on unix. It supports quantify and its ilk.
#
-@@ -247,15 +267,19 @@
+@@ -239,15 +259,19 @@
ifneq ($(PLATFORM), windows)
@@ -11066,17 +15612,9 @@ $FreeBSD$
OTHER_CPPFLAGS += -DPROGNAME='"$(PROGRAM)"'
VERSION_DEFINES += -DFULL_VERSION='"$(FULL_VERSION)"'
---- ./jdk/make/common/Release.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/common/Release.gmk 2010-10-31 14:12:34.000000000 -0700
-@@ -154,14 +154,13 @@
- tnameserv.1 \
- unpack200.1
-
--ifeq ($(ARCH_DATA_MODEL),32)
-+ifeq ($(BUILD_DEPLOY), true)
- JRE_MAN_PAGES += javaws.1
- endif
-
+--- ./jdk/make/common/Release.gmk 2011-05-26 18:33:53.000000000 -0700
++++ ./jdk/make/common/Release.gmk 2011-05-12 20:55:05.000000000 -0700
+@@ -128,7 +128,6 @@
JDK_MAN_PAGES = \
$(JRE_MAN_PAGES) \
appletviewer.1 \
@@ -11084,19 +15622,20 @@ $FreeBSD$
extcheck.1 \
idlj.1 \
jar.1 \
-@@ -200,6 +199,11 @@
- JA_DIRNAME=ja_JP.$(JA_SOURCE_ENCODING)
+@@ -167,6 +166,12 @@
+ JA_DIRNAME=ja_JP.UTF-8
endif # linux
+ifeq ($(PLATFORM), bsd)
+ MANBASEDIRS=$(JDK_TOPDIR)/src/bsd/doc $(IMPORTDOCDIR)
+ MAN1SUBDIR = man
++ JA_DIRNAME=ja_JP.UTF-8
+endif
+
define copy-man-pages
$(MKDIR) -p $1/man/man1
for manbase in $(MANBASEDIRS:%=%/$(MAN1SUBDIR)) ; do \
-@@ -332,6 +336,12 @@
+@@ -300,6 +305,12 @@
SOURCE_DIRS += $(CLOSED_SRC)/share/classes
endif
@@ -11109,7 +15648,7 @@ $FreeBSD$
#
# Specific files and directories that will be filtered out from above areas.
-@@ -1027,7 +1037,7 @@
+@@ -990,7 +1001,7 @@
@# generated by the more efficient solaris/windows method of copying files.
@# So for Linux, make use of the -T option (like Solaris' -I option) of
@# obtaining the list of files from a file. MKS tar has no such option.
@@ -11118,7 +15657,7 @@ $FreeBSD$
for d in $(SOURCE_DIRS); do \
$(RM) $(ABS_TEMPDIR)/src-files.list; \
($(CD) $$d && \
-@@ -1040,7 +1050,7 @@
+@@ -1003,7 +1014,7 @@
done ; \
) ; \
if [ -f $(ABS_TEMPDIR)/src-files.list ] ; then \
@@ -11127,97 +15666,8 @@ $FreeBSD$
| ($(CD) $(JDK_IMAGE_DIR)/src && $(TAR) xf -); \
fi; \
done
---- ./jdk/make/common/internal/BinaryPlugs.gmk 2010-12-16 14:09:55.000000000 -0800
-+++ ./jdk/make/common/internal/BinaryPlugs.gmk 2010-06-15 22:06:16.000000000 -0700
-@@ -49,8 +49,6 @@
- com/sun/jmx/snmp/SnmpDataTypeEnums.class \
- com/sun/jmx/snmp/SnmpDefinitions.class \
- com/sun/jmx/snmp/SnmpOid.class \
--com/sun/jmx/snmp/SnmpOidDatabase.class \
--com/sun/jmx/snmp/SnmpOidDatabaseSupport.class \
- com/sun/jmx/snmp/SnmpOidRecord.class \
- com/sun/jmx/snmp/SnmpOidTable.class \
- com/sun/jmx/snmp/SnmpOidTableSupport.class \
-@@ -60,22 +58,16 @@
- com/sun/jmx/snmp/SnmpTimeticks.class \
- com/sun/jmx/snmp/SnmpVarBind.class \
- com/sun/jmx/snmp/SnmpVarBindList.class \
--com/sun/jmx/snmp/Timestamp.class \
- com/sun/jmx/snmp/daemon/SendQ.class \
- com/sun/jmx/snmp/daemon/SnmpInformRequest.class \
--com/sun/jmx/snmp/daemon/SnmpQManager.class \
--com/sun/jmx/snmp/daemon/SnmpRequestCounter.class \
--com/sun/jmx/snmp/daemon/SnmpResponseHandler.class \
--com/sun/jmx/snmp/daemon/SnmpSendServer.class \
--com/sun/jmx/snmp/daemon/SnmpSession.class \
--com/sun/jmx/snmp/daemon/SnmpSocket.class \
--com/sun/jmx/snmp/daemon/SnmpTimerServer.class \
--com/sun/jmx/snmp/daemon/WaitQ.class
-+com/sun/jmx/snmp/daemon/SnmpSession.class
-+
-+PLUG_GNU_CLASS_NAMES = gnu
-
- # Class list temp files (used by both import and export of plugs)
-
- PLUG_TEMPDIR=$(ABS_TEMPDIR)/plugs
--PLUG_CLASS_AREAS = jmf
-+PLUG_CLASS_AREAS = jmf gnu
- PLUG_CLISTS = $(PLUG_CLASS_AREAS:%=$(PLUG_TEMPDIR)/%.clist)
-
- # Create jargs file command
-@@ -93,11 +85,18 @@
- @for i in $(PLUG_JMF_CLASS_NAMES) ; do \
- $(ECHO) "$$i" >> $@; \
- done
-+$(PLUG_TEMPDIR)/gnu.clist:
-+ @$(prep-target)
-+ @for i in $(PLUG_GNU_CLASS_NAMES) ; do \
-+ $(ECHO) "$$i" >> $@ ; \
-+ done
- $(PLUG_TEMPDIR)/all.clist: $(PLUG_CLISTS)
- @$(prep-target)
- $(CAT) $(PLUG_CLISTS) > $@
- $(PLUG_TEMPDIR)/jmf.jargs: $(PLUG_TEMPDIR)/jmf.clist
- $(plug-create-jargs)
-+$(PLUG_TEMPDIR)/gnu.jargs: $(PLUG_TEMPDIR)/gnu.clist
-+ $(plug-create-jargs)
- $(PLUG_TEMPDIR)/all.jargs: $(PLUG_TEMPDIR)/all.clist
- $(plug-create-jargs)
-
-@@ -133,10 +132,14 @@
- import-binary-plug-jmf-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/jmf.clist
- $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/jmf.clist)
-
-+import-binary-plug-gnu-classes: $(PLUG_IMPORT_JARFILE) $(PLUG_TEMPDIR)/gnu.clist
-+ $(call import-binary-plug-classes,$(PLUG_TEMPDIR)/gnu.clist)
-+
- # Import all classes from the jar file
-
- import-binary-plug-jar: \
-- import-binary-plug-jmf-classes
-+ import-binary-plug-jmf-classes \
-+ import-binary-plug-gnu-classes
-
- # Binary plug start/complete messages
-
-@@ -148,14 +151,12 @@
-
- # Import lib files (only if they don't exist already)
-
--import-binary-plugs-libs: \
-- $(PLUG_LIBRARY_NAMES:%=$(LIB_LOCATION)/%)
-+import-binary-plugs-libs:
-
- # Import everything
-
- import-binary-plugs: \
- import-binary-plugs-started \
-- import-binary-plugs-libs \
- import-binary-plug-jar \
- import-binary-plugs-completed
-
---- ./jdk/make/common/shared/Compiler-gcc.gmk 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/common/shared/Compiler-gcc.gmk 2010-06-15 22:06:16.000000000 -0700
+--- ./jdk/make/common/shared/Compiler-gcc.gmk 2011-05-26 18:33:54.000000000 -0700
++++ ./jdk/make/common/shared/Compiler-gcc.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -72,6 +72,24 @@
endif
@@ -11243,8 +15693,8 @@ $FreeBSD$
ifeq ($(PLATFORM), solaris)
# Settings specific to Solaris
---- ./jdk/make/common/shared/Defs-bsd.gmk 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/make/common/shared/Defs-bsd.gmk 2010-07-04 12:38:37.000000000 -0700
+--- ./jdk/make/common/shared/Defs-bsd.gmk 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/make/common/shared/Defs-bsd.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -54,7 +54,7 @@
endef
@@ -11255,6 +15705,15 @@ $FreeBSD$
# UNIXCOMMAND_PATH: path to where the most common Unix commands are.
# NOTE: Must end with / so that it could be empty, allowing PATH usage.
@@ -107,7 +107,7 @@
+ ifneq ($(ALT_OPENWIN_HOME),)
+ OPENWIN_HOME :=$(call PrefixPath,$(ALT_OPENWIN_HOME))
+ else
+- OPENWIN_HOME =/usr/X11R6/
++ OPENWIN_HOME =$(X11_PATH)
+ endif
+
+ # DEVTOOLS_PATH: for other tools required for building (such as zip, etc.)
+@@ -115,7 +115,7 @@
ifneq "$(origin ALT_DEVTOOLS_PATH)" "undefined"
DEVTOOLS_PATH :=$(call PrefixPath,$(ALT_DEVTOOLS_PATH))
else
@@ -11263,13 +15722,13 @@ $FreeBSD$
endif
# _BOOTDIR1: First choice for a Bootstrap JDK, previous released JDK.
-@@ -121,16 +121,12 @@
+@@ -129,16 +129,12 @@
BUILD_HEADLESS = true
LIBM=-lm
-# GCC29_COMPILER_PATH: is the path to where the gcc 2.9 compiler is installed
-# NOTE: Must end with / so that it could be empty, allowing PATH usage.
--ifneq "$(origin ALT_GCC29_COMPILER_PATH)" "undefined"
+-ifdef ALT_GCC29_COMPILER_PATH
- GCC29_COMPILER_PATH :=$(call PrefixPath,$(ALT_GCC29_COMPILER_PATH))
+ifeq ($(OS_VENDOR), Apple)
+ _CUPS_HEADERS_PATH=/usr/include
@@ -11283,8 +15742,37 @@ $FreeBSD$
# Import JDK images allow for partial builds, components not built are
# imported (or copied from) these import areas when needed.
---- ./jdk/make/common/shared/Defs-utils.gmk 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/common/shared/Defs-utils.gmk 2010-10-31 14:12:34.000000000 -0700
+@@ -196,6 +192,20 @@
+ # Macro to check it's input file for banned dependencies and verify the
+ # binary built properly. Relies on process exit code.
+ ifndef CROSS_COMPILE_ARCH
++ifeq ($(OS_VENDOR), Apple)
++define binary_file_verification # binary_file
++( \
++ $(ECHO) "Checking for mapfile use in: $1" && \
++ if [ "`$(NM) -g $1 | $(EGREP) 'SUNWprivate'`" = "" ] ; then \
++ $(ECHO) "WARNING: File was not built with a mapfile: $1"; \
++ fi && \
++ $(ECHO) "Library loads for: $1" && \
++ $(OTOOL) -L $1 && \
++ $(ECHO) "RUNPATH for: $1" && \
++ ( $(OTOOL) -l $1 | $(EGREP) 'path ' ) \
++) || true
++endef
++else
+ define binary_file_verification # binary_file
+ ( \
+ $(ECHO) "Checking for mapfile use in: $1" && \
+@@ -208,6 +218,7 @@
+ ( $(READELF) -d $1 | $(EGREP) 'NEEDED|RUNPATH|RPATH' ) \
+ )
+ endef
++endif # OS_VENDOR == Apple
+ else
+ define binary_file_verification
+ ( \
+--- ./jdk/make/common/shared/Defs-utils.gmk 2011-05-26 18:33:55.000000000 -0700
++++ ./jdk/make/common/shared/Defs-utils.gmk 2011-05-07 21:54:09.000000000 -0700
@@ -67,6 +67,13 @@
UTILS_DEVTOOL_PATH=$(DEVTOOLS_PATH)
endif
@@ -11297,9 +15785,18 @@ $FreeBSD$
+endif
+
# Utilities
- ADB = $(UTILS_COMMAND_PATH)adb
- AR = $(UTILS_CCS_BIN_PATH)ar
-@@ -202,3 +209,39 @@
+ ifdef CROSS_COMPILE_ARCH
+ AR = $(COMPILER_PATH)ar
+@@ -126,6 +133,8 @@
+ MSGFMT = $(UTILS_USR_BIN_PATH)msgfmt
+ MV = $(UTILS_COMMAND_PATH)mv
+ NAWK = $(UTILS_USR_BIN_PATH)nawk
++NM = $(UTILS_CCS_BIN_PATH)nm
++OTOOL = $(UTILS_USR_BIN_PATH)otool
+ PKGMK = $(UTILS_COMMAND_PATH)pkgmk
+ PRINTF = $(UTILS_USR_BIN_PATH)printf
+ PWD = $(UTILS_COMMAND_PATH)pwd
+@@ -220,3 +229,39 @@
ECHO = /usr/bin/echo
endif
@@ -11339,22 +15836,23 @@ $FreeBSD$
+ UNZIP = $(UTILS_DEVTOOL_PATH)unzip
+ endif
+endif
---- ./jdk/make/common/shared/Defs.gmk 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/common/shared/Defs.gmk 2010-10-31 14:12:34.000000000 -0700
-@@ -613,8 +613,8 @@
- override CC_VERSION = sun
- endif
-
--# Linux uses GNU compilers by default
--ifeq ($(PLATFORM), linux)
-+# Linux & BSD uses GNU compilers by default
-+ifneq (,$(findstring $(PLATFORM), linux bsd))
+--- ./jdk/make/common/shared/Defs-versions.gmk 2011-05-26 18:33:55.000000000 -0700
++++ ./jdk/make/common/shared/Defs-versions.gmk 2011-05-07 21:54:09.000000000 -0700
+@@ -44,6 +44,11 @@
override CC_VERSION = gcc
endif
---- ./jdk/make/common/shared/Platform.gmk 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/common/shared/Platform.gmk 2010-06-15 22:06:17.000000000 -0700
-@@ -82,7 +82,7 @@
++# BSD uses GNU compilers by default
++ifeq ($(PLATFORM), bsd)
++ override CC_VERSION = gcc
++endif
++
+ ##########################################################################
+ #
+ # List of JDK official minimum, expected, or required versions:
+--- ./jdk/make/common/shared/Platform.gmk 2011-05-26 18:33:55.000000000 -0700
++++ ./jdk/make/common/shared/Platform.gmk 2011-05-07 21:54:09.000000000 -0700
+@@ -86,7 +86,7 @@
SCM_DIRs = .hg .svn CVS RCS SCCS Codemgr_wsdata deleted_files .hgignore .hgtags
# When changing SCM_DIRs also change SCM_DIRS_rexp and SCM_DIRS_prune:
SCM_DIRS_rexp = ".hg|.svn|CVS|RCS|SCCS|Codemgr_wsdata|deleted_files|.hgignore|.hgtags"
@@ -11363,7 +15861,7 @@ $FreeBSD$
# Don't define this unless it's not defined
ifndef VARIANT
-@@ -214,6 +214,101 @@
+@@ -224,6 +224,101 @@
MB_OF_MEMORY := $(shell free -m | fgrep Mem: | awk '{print $$2;}' )
endif
@@ -11465,7 +15963,7 @@ $FreeBSD$
# Windows with and without CYGWIN will be slightly different
ifeq ($(SYSTEM_UNAME), Windows_NT)
PLATFORM = windows
-@@ -404,6 +499,14 @@
+@@ -425,6 +520,14 @@
ARCH_VM_SUBDIR=jre/lib/$(LIBARCH)
endif
@@ -11480,7 +15978,7 @@ $FreeBSD$
# Machines with 512Mb or less of real memory are considered low memory
# build machines and adjustments will be made to prevent excessing
# system swapping during the build.
-@@ -443,6 +546,18 @@
+@@ -452,6 +555,18 @@
export MIN_VM_MEMORY
endif
@@ -11499,31 +15997,19 @@ $FreeBSD$
# If blanks in the username, use the first 4 words and pack them together
_USER1:=$(subst ', ,$(_USER))
_USER2:=$(subst ", ,$(_USER1))
---- ./jdk/make/common/shared/Sanity-Settings.gmk 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/common/shared/Sanity-Settings.gmk 2010-06-15 22:06:17.000000000 -0700
-@@ -244,6 +244,7 @@
- ALL_SETTINGS+=$(call addHeading,OpenJDK-specific settings)
- ALL_SETTINGS+=$(call addAltSetting,FREETYPE_HEADERS_PATH)
- ALL_SETTINGS+=$(call addAltSetting,FREETYPE_LIB_PATH)
-+ ALL_SETTINGS+=$(call addAltSetting,X11_PATH)
- ALL_SETTINGS+=$(call addHeading,OPENJDK Import Binary Plug Settings)
- ALL_SETTINGS+=$(call addOptionalSetting,IMPORT_BINARY_PLUGS)
- ALL_SETTINGS+=$(call addAltSetting,BINARY_PLUGS_JARFILE)
---- ./jdk/make/common/shared/Sanity.gmk 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/common/shared/Sanity.gmk 2010-12-11 09:07:22.000000000 -0800
-@@ -142,6 +142,11 @@
+--- ./jdk/make/common/shared/Sanity.gmk 2011-05-26 18:33:55.000000000 -0700
++++ ./jdk/make/common/shared/Sanity.gmk 2011-05-07 23:39:41.000000000 -0700
+@@ -140,6 +140,9 @@
$(EGREP) "\#define" | $(NAWK) '{print $$3}')
endif
+ifeq ($(PLATFORM), bsd)
-+ FREE_SPACE := $(shell BLOCKSIZE=512 $(DF) $(OUTPUTDIR) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
-+ TEMP_FREE_SPACE := $(shell BLOCKSIZE=512 $(DF) $(TEMP_DISK) | $(TAIL) -1 | $(NAWK) '{print $$2;}')
+endif
+
# Get the version numbers of what we are using
_MAKE_VER :=$(shell $(MAKE) --version 2>&1 | $(HEAD) -n 1)
_ZIP_VER :=$(shell $(ZIPEXE) -help 2>&1 | $(HEAD) -n 4 | $(EGREP) '^Zip')
-@@ -878,8 +883,10 @@
+@@ -839,8 +842,10 @@
######################################################
# Check for existence of DEVTOOLS_PATH
@@ -11534,7 +16020,7 @@ $FreeBSD$
@if [ "$(DEVTOOLS_PATH)" != "" -a ! -r "$(DEVTOOLS_PATH)" ]; then \
$(ECHO) "ERROR: You do not have a valid DEVTOOLS_PATH setting. \n" \
" Please check your access to \n" \
-@@ -887,6 +894,7 @@
+@@ -848,6 +853,7 @@
" and/or check your value of ALT_DEVTOOLS_PATH. \n" \
"" >> $(ERROR_FILE) ; \
fi
@@ -11542,8 +16028,8 @@ $FreeBSD$
######################################################
# Check for existence of MS_RUNTIME_LIBRARIES
---- ./jdk/make/java/Makefile 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/java/Makefile 2010-06-15 22:06:17.000000000 -0700
+--- ./jdk/make/java/Makefile 2011-05-26 18:33:56.000000000 -0700
++++ ./jdk/make/java/Makefile 2011-04-22 23:08:15.000000000 -0700
@@ -53,7 +53,7 @@
endif
endif # PLATFORM
@@ -11553,46 +16039,9 @@ $FreeBSD$
SUBDIRS += jexec
endif # PLATFORM
---- ./jdk/make/java/hpi/hpi_common.gmk 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/java/hpi/hpi_common.gmk 2010-07-10 12:44:13.000000000 -0700
-@@ -86,5 +86,5 @@
- # Things that must be linked in.
- #
- ifneq ($(PLATFORM), windows)
--OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) -ldl
-+OTHER_LDLIBS += $(LIBSOCKET) $(LIBNSL) $(LIBM) $(LIBDL)
- endif
---- ./jdk/make/java/hpi/native/Makefile 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/java/hpi/native/Makefile 2010-06-15 22:06:17.000000000 -0700
-@@ -73,16 +73,25 @@
- ifeq ($(MOOT_PRIORITIES),true)
- OTHER_CPPFLAGS += -DMOOT_PRIORITIES
- endif
-+ifeq ($(PLATFORM), bsd)
-+LIBPOSIX4 =
-+OTHER_LDLIBS += -pthread
-+else
- LIBPOSIX4 = -lposix4
- OTHER_LDLIBS += -lpthread $(LIBPOSIX4)
- endif
-+endif
-
-+ifneq ($(PLATFORM), bsd)
- HAVE_GETHRVTIME=true
-+endif
- ifeq ($(HAVE_GETHRVTIME),true)
- OTHER_CPPFLAGS += -DHAVE_GETHRVTIME
- endif
-
-+ifneq ($(OS_VENDOR), OpenBSD)
- HAVE_FILIOH=true
-+endif
- ifeq ($(HAVE_FILIOH),true)
- OTHER_CPPFLAGS += -DHAVE_FILIOH
- endif
---- ./jdk/make/java/instrument/Makefile 2010-12-16 14:09:56.000000000 -0800
-+++ ./jdk/make/java/instrument/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -103,9 +103,29 @@
+--- ./jdk/make/java/instrument/Makefile 2011-05-26 18:33:57.000000000 -0700
++++ ./jdk/make/java/instrument/Makefile 2011-04-22 23:08:15.000000000 -0700
+@@ -102,9 +102,29 @@
# equivalent of strcasecmp is stricmp on Windows
CPPFLAGS_COMMON += -Dstrcasecmp=stricmp
else
@@ -11623,7 +16072,7 @@ $FreeBSD$
ifeq ($(PLATFORM), solaris)
LDFLAGS += -R \$$ORIGIN/jli
endif
-@@ -115,6 +135,7 @@
+@@ -114,6 +134,7 @@
LDFLAGS += -Wl,-rpath -Wl,\$$ORIGIN/jli
endif
endif
@@ -11631,9 +16080,9 @@ $FreeBSD$
#
# Library to compile.
---- ./jdk/make/java/java/Makefile 2010-12-16 14:09:57.000000000 -0800
-+++ ./jdk/make/java/java/Makefile 2010-07-10 12:44:56.000000000 -0700
-@@ -166,8 +166,10 @@
+--- ./jdk/make/java/java/Makefile 2011-05-26 18:33:58.000000000 -0700
++++ ./jdk/make/java/java/Makefile 2011-05-12 20:55:05.000000000 -0700
+@@ -165,8 +165,10 @@
# Is the altzone extern documented in ctime(3C) available?
#
ifneq ($(PLATFORM), windows)
@@ -11644,17 +16093,17 @@ $FreeBSD$
ifeq ($(HAVE_ALTZONE),true)
OTHER_CPPFLAGS += -DHAVE_ALTZONE
-@@ -204,7 +206,7 @@
- OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
- -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
+@@ -205,7 +207,7 @@
+ -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib \
+ shell32.lib delayimp.lib /DELAYLOAD:shell32.dll
else
-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) -ldl \
+OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) $(LIBNSL) $(LIBDL) \
-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
endif
---- ./jdk/make/java/java/genlocales.gmk 2010-12-16 14:09:57.000000000 -0800
-+++ ./jdk/make/java/java/genlocales.gmk 2010-06-15 22:06:17.000000000 -0700
+--- ./jdk/make/java/java/genlocales.gmk 2011-05-26 18:33:58.000000000 -0700
++++ ./jdk/make/java/java/genlocales.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -76,10 +76,14 @@
$(LocaleDataMetaInfo_Dest):$(LocaleDataMetaInfo_Src) $(LOCALEGEN_SH)
@$(RM) $@.tmp.euro $@.tmp.noneuro;
@@ -11674,8 +16123,8 @@ $FreeBSD$
NAWK="$(NAWK)" SED="$(SED)" SORT="$(SORT)" \
$(SH) $(LOCALEGEN_SH) $(RESOURCE_NAMES) $@.tmp.euro \
$@.tmp.noneuro $< $@
---- ./jdk/make/java/java/localegen.sh 2010-12-16 14:09:57.000000000 -0800
-+++ ./jdk/make/java/java/localegen.sh 2010-06-15 22:06:17.000000000 -0700
+--- ./jdk/make/java/java/localegen.sh 2011-05-26 18:33:58.000000000 -0700
++++ ./jdk/make/java/java/localegen.sh 2011-04-22 23:08:15.000000000 -0700
@@ -55,9 +55,9 @@
for FILE in $RESOURCE_NAMES
do
@@ -11688,9 +16137,9 @@ $FreeBSD$
done
sed_script=$sed_script"$INPUT_FILE > $OUTPUT_FILE"
---- ./jdk/make/java/java_hprof_demo/Makefile 2010-12-16 14:09:57.000000000 -0800
-+++ ./jdk/make/java/java_hprof_demo/Makefile 2010-07-10 12:45:09.000000000 -0700
-@@ -84,7 +84,7 @@
+--- ./jdk/make/java/java_hprof_demo/Makefile 2011-05-26 18:33:59.000000000 -0700
++++ ./jdk/make/java/java_hprof_demo/Makefile 2011-04-22 23:08:15.000000000 -0700
+@@ -83,7 +83,7 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS += wsock32.lib winmm.lib
else
@@ -11699,9 +16148,9 @@ $FreeBSD$
endif
#
---- ./jdk/make/java/jli/Makefile 2010-12-16 14:09:57.000000000 -0800
-+++ ./jdk/make/java/jli/Makefile 2010-11-13 12:00:16.000000000 -0800
-@@ -45,7 +45,9 @@
+--- ./jdk/make/java/jli/Makefile 2011-05-26 18:33:59.000000000 -0700
++++ ./jdk/make/java/jli/Makefile 2011-04-22 23:08:15.000000000 -0700
+@@ -44,7 +44,9 @@
include $(BUILDDIR)/common/Defs.gmk
@@ -11711,7 +16160,7 @@ $FreeBSD$
LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
-@@ -70,13 +72,17 @@
+@@ -69,13 +71,17 @@
parse_manifest.c \
version_comp.c \
wildcard.c \
@@ -11729,8 +16178,8 @@ $FreeBSD$
+endif
ifneq ($(PLATFORM), windows)
-
-@@ -93,7 +99,7 @@
+ FILES_c += ergo.c
+@@ -96,7 +102,7 @@
LIBARCH_DEFINES += -DLIBARCH64NAME='"$(LIBARCH64)"'
endif
@@ -11739,7 +16188,7 @@ $FreeBSD$
ifneq ($(PLATFORM), windows) # UNIX systems
-@@ -102,7 +108,7 @@
+@@ -105,7 +111,7 @@
# Note: its important to keep this order meaning -lc is the
# last library otherwise it could cause compatibility issues
# by pulling in SUNW_private symbols from libc
@@ -11748,7 +16197,7 @@ $FreeBSD$
ifeq ($(USE_PTHREADS),true)
LDLIBS += -lpthread
endif # USE_PTHREADS
-@@ -126,7 +132,11 @@
+@@ -129,7 +135,11 @@
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
@@ -11761,7 +16210,7 @@ $FreeBSD$
#
# Library to compile.
-@@ -158,7 +168,28 @@
+@@ -161,7 +171,28 @@
endif # PLATFORM
@@ -11791,22 +16240,8 @@ $FreeBSD$
+ vpath %.c $(ZIP_SRC)
+endif
+
---- ./jdk/make/java/management/Makefile 2010-12-16 14:09:58.000000000 -0800
-+++ ./jdk/make/java/management/Makefile 2010-06-15 22:06:17.000000000 -0700
-@@ -86,6 +86,11 @@
- OTHER_INCLUDES += \
- -I$(SHARE_SRC)/native/sun/management
-
-+ifeq ($(PLATFORM),bsd)
-+OTHER_INCLUDES += \
-+ -I$(PLATFORM_SRC)/hpi/include
-+endif
-+
- ifeq ($(PLATFORM),windows)
- OTHER_LDLIBS += $(JVMLIB)
- endif
---- ./jdk/make/java/net/FILES_c.gmk 2010-12-16 14:09:58.000000000 -0800
-+++ ./jdk/make/java/net/FILES_c.gmk 2010-10-31 14:12:34.000000000 -0700
+--- ./jdk/make/java/net/FILES_c.gmk 2011-05-26 18:34:02.000000000 -0700
++++ ./jdk/make/java/net/FILES_c.gmk 2011-04-22 23:08:15.000000000 -0700
@@ -43,6 +43,10 @@
FILES_c += linux_close.c
endif
@@ -11818,9 +16253,9 @@ $FreeBSD$
ifeq ($(PLATFORM), windows)
FILES_c += TwoStacksPlainSocketImpl.c
FILES_c += DualStackPlainSocketImpl.c
---- ./jdk/make/java/net/Makefile 2010-12-16 14:09:58.000000000 -0800
-+++ ./jdk/make/java/net/Makefile 2010-10-31 14:12:34.000000000 -0700
-@@ -96,14 +96,21 @@
+--- ./jdk/make/java/net/Makefile 2011-05-26 18:34:02.000000000 -0700
++++ ./jdk/make/java/net/Makefile 2011-04-22 23:08:15.000000000 -0700
+@@ -91,16 +91,23 @@
include $(BUILDDIR)/common/Library.gmk
@@ -11831,7 +16266,9 @@ $FreeBSD$
+ OTHER_LDLIBS = $(JVMLIB) -pthread
+else
ifeq ($(PLATFORM), windows)
- OTHER_LDLIBS = ws2_32.lib $(JVMLIB)
+ OTHER_LDLIBS = ws2_32.lib $(JVMLIB) \
+ secur32.lib iphlpapi.lib delayimp.lib \
+ /DELAYLOAD:secur32.dll /DELAYLOAD:iphlpapi.dll
else
- OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) -ldl $(JVMLIB)
+ OTHER_LDLIBS = $(LIBSOCKET) $(LIBNSL) $(LIBDL) $(JVMLIB)
@@ -11843,9 +16280,9 @@ $FreeBSD$
CLASSES.export += java.lang.Integer java.io.FileDescriptor java.net.InetAddressImplFactory java.net.Inet4AddressImpl java.net.Inet6AddressImpl
---- ./jdk/make/java/nio/Makefile 2010-12-16 14:09:58.000000000 -0800
-+++ ./jdk/make/java/nio/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -261,6 +261,69 @@
+--- ./jdk/make/java/nio/Makefile 2011-05-26 18:34:02.000000000 -0700
++++ ./jdk/make/java/nio/Makefile 2011-04-22 23:08:15.000000000 -0700
+@@ -260,6 +260,69 @@
sun/nio/fs/UnixConstants.java
endif # PLATFORM = linux
@@ -11915,41 +16352,23 @@ $FreeBSD$
#
# Find platform-specific C source files
#
-@@ -285,19 +348,28 @@
- -I$(PLATFORM_SRC)/native/java/net \
- -I$(CLASSHDRDIR)/../../../java.lang/java/CClassHeaders
-
-+ifeq ($(PLATFORM), bsd)
-+OTHER_INCLUDES += \
-+ -I$(PLATFORM_SRC)/hpi/include
-+endif
-+
- ifeq ($(PLATFORM),windows)
- OTHER_LDLIBS += $(JVMLIB) ws2_32.lib \
- -libpath:$(LIBDIR) java.lib \
- $(OBJDIR)/../../../../sun/java.net/net/$(OBJDIRNAME)/net.lib \
- $(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/io_util.obj \
+@@ -292,10 +355,13 @@
$(OBJDIR)/../../../java.lang/java/$(OBJDIRNAME)/FileDescriptor_md.obj
--endif
-+else
-+ifeq ($(PLATFORM), solaris)
-+OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL)
-+endif # solaris
-+OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
+ endif
ifeq ($(PLATFORM), linux)
-OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread -ldl
-+OTHER_LDLIBS += -lpthread $(LIBDL)
++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -lpthread $(LIBDL)
+endif
+ifeq ($(PLATFORM), bsd)
-+OTHER_LDLIBS += -pthread
++OTHER_LDLIBS += -L$(LIBDIR)/$(LIBARCH) -ljava -lnet -pthread
endif
--ifeq ($(PLATFORM), solaris)
--OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl \
-- -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
+ ifeq ($(PLATFORM), solaris)
+-OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 -ldl -lsendfile \
++OTHER_LDLIBS += $(JVMLIB) $(LIBSOCKET) -lposix4 $(LIBDL) -lsendfile \
+ -L$(LIBDIR)/$(LIBARCH) -ljava -lnet
endif # PLATFORM
- #
-@@ -321,6 +393,9 @@
+@@ -316,6 +382,9 @@
ifeq ($(PLATFORM), linux)
FILES_m = mapfile-linux
endif
@@ -11959,9 +16378,9 @@ $FreeBSD$
include $(BUILDDIR)/common/Mapfile-vers.gmk
include $(BUILDDIR)/common/Library.gmk
---- ./jdk/make/java/nio/mapfile-bsd 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/make/java/nio/mapfile-bsd 2010-10-31 14:19:20.000000000 -0700
-@@ -36,25 +36,6 @@
+--- ./jdk/make/java/nio/mapfile-bsd 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/make/java/nio/mapfile-bsd 2011-05-12 20:59:33.000000000 -0700
+@@ -36,24 +36,6 @@
Java_sun_nio_ch_DatagramDispatcher_readv0;
Java_sun_nio_ch_DatagramDispatcher_write0;
Java_sun_nio_ch_DatagramDispatcher_writev0;
@@ -11973,7 +16392,6 @@ $FreeBSD$
- Java_sun_nio_ch_EPollArrayWrapper_interrupt;
- Java_sun_nio_ch_EPollArrayWrapper_offsetofData;
- Java_sun_nio_ch_EPollArrayWrapper_sizeofEPollEvent;
-- Java_sun_nio_ch_EPoll_init;
- Java_sun_nio_ch_EPoll_eventSize;
- Java_sun_nio_ch_EPoll_eventsOffset;
- Java_sun_nio_ch_EPoll_dataOffset;
@@ -11987,7 +16405,7 @@ $FreeBSD$
Java_sun_nio_ch_FileChannelImpl_close0;
Java_sun_nio_ch_FileChannelImpl_initIDs;
Java_sun_nio_ch_FileChannelImpl_map0;
-@@ -123,26 +104,14 @@
+@@ -124,25 +106,14 @@
Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_accept0;
Java_sun_nio_ch_UnixAsynchronousServerSocketChannelImpl_initIDs;
Java_sun_nio_ch_UnixAsynchronousSocketChannelImpl_checkConnect;
@@ -11999,7 +16417,6 @@ $FreeBSD$
Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGio;
Java_sun_nio_fs_GnomeFileTypeDetector_initializeGnomeVfs;
Java_sun_nio_fs_GnomeFileTypeDetector_probeUsingGnomeVfs;
-- Java_sun_nio_fs_BsdWatchService_init;
- Java_sun_nio_fs_BsdWatchService_eventSize;
- Java_sun_nio_fs_BsdWatchService_eventOffsets;
- Java_sun_nio_fs_BsdWatchService_inotifyInit;
@@ -12018,9 +16435,9 @@ $FreeBSD$
Java_sun_nio_fs_UnixNativeDispatcher_init;
Java_sun_nio_fs_UnixNativeDispatcher_getcwd;
Java_sun_nio_fs_UnixNativeDispatcher_strerror;
---- ./jdk/make/java/npt/Makefile 2010-12-16 14:09:59.000000000 -0800
-+++ ./jdk/make/java/npt/Makefile 2010-06-15 22:06:18.000000000 -0700
-@@ -68,6 +68,18 @@
+--- ./jdk/make/java/npt/Makefile 2011-05-26 18:34:03.000000000 -0700
++++ ./jdk/make/java/npt/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -67,6 +67,18 @@
OTHER_LCF += -export:nptInitialize -export:nptTerminate
endif
@@ -12039,9 +16456,9 @@ $FreeBSD$
#
# Add to ambient vpath so we pick up the library files
#
---- ./jdk/make/java/redist/fonts/Makefile 2010-12-16 14:09:59.000000000 -0800
-+++ ./jdk/make/java/redist/fonts/Makefile 2010-06-15 22:06:18.000000000 -0700
-@@ -43,7 +43,7 @@
+--- ./jdk/make/java/redist/fonts/Makefile 2011-05-26 18:34:04.000000000 -0700
++++ ./jdk/make/java/redist/fonts/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -42,7 +42,7 @@
$(LIBDIR)/fonts/LucidaSansRegular.ttf \
$(LIBDIR)/fonts/LucidaSansDemiBold.ttf \
@@ -12050,7 +16467,7 @@ $FreeBSD$
# The oblique versions of the font are derived from the base versions
# and since 2D can do this derivation on the fly at run time there is no
-@@ -83,7 +83,7 @@
+@@ -82,7 +82,7 @@
$(FONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.fonts.dir
$(install-file)
@@ -12059,7 +16476,7 @@ $FreeBSD$
# The oblique fonts are only needed/wanted on Linux.
-@@ -97,7 +97,7 @@
+@@ -96,7 +96,7 @@
$(OBLFONTSDIRFILE): $(PLATFORM_SRC)/classes/sun/awt/motif/java.oblique-fonts.dir
$(install-file)
@@ -12068,26 +16485,26 @@ $FreeBSD$
all build : $(INTERNAL_IMPORT_LIST)
---- ./jdk/make/java/security/Makefile 2010-12-16 14:09:59.000000000 -0800
-+++ ./jdk/make/java/security/Makefile 2010-07-24 14:31:27.000000000 -0700
-@@ -50,7 +50,15 @@
- ifneq ($(ARCH_DATA_MODEL), 64)
- PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
- endif
-+
+--- ./jdk/make/java/security/Makefile 2011-05-26 18:34:04.000000000 -0700
++++ ./jdk/make/java/security/Makefile 2011-05-12 20:58:11.000000000 -0700
+@@ -47,7 +47,14 @@
+ # Register Microsoft CryptoAPI provider only on Windows platform.
+ ifeq ($(PLATFORM), windows)
+ PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-windows
+-endif
+else # windows
+
+ifeq ($(PLATFORM), bsd)
+ ifeq ($(OS_VENDOR), OpenBSD)
+ PROPS_SRC = $(TOPDIR)/src/share/lib/security/java.security-openbsd
+ endif
- endif
++endif # bsd
+endif # windows
endif # PLATFORM
---- ./jdk/make/java/zip/FILES_c.gmk 2010-12-16 14:10:00.000000000 -0800
-+++ ./jdk/make/java/zip/FILES_c.gmk 2010-06-15 22:06:18.000000000 -0700
+--- ./jdk/make/java/zip/FILES_c.gmk 2011-05-26 18:34:06.000000000 -0700
++++ ./jdk/make/java/zip/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -29,7 +29,10 @@
Deflater.c \
Inflater.c \
@@ -12107,9 +16524,9 @@ $FreeBSD$
- zutil.c
+ zutil.c
+endif
---- ./jdk/make/java/zip/Makefile 2010-12-16 14:10:00.000000000 -0800
-+++ ./jdk/make/java/zip/Makefile 2010-06-15 22:06:18.000000000 -0700
-@@ -72,16 +72,28 @@
+--- ./jdk/make/java/zip/Makefile 2011-05-26 18:34:06.000000000 -0700
++++ ./jdk/make/java/zip/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -74,16 +74,24 @@
CPPFLAGS += -UDEBUG
endif
@@ -12117,10 +16534,6 @@ $FreeBSD$
CPPFLAGS += -I$(SHARE_SRC)/native/java/io
CPPFLAGS += -I$(PLATFORM_SRC)/native/java/io
-+ifeq ($(PLATFORM),bsd)
-+CPPFLAGS += -I$(PLATFORM_SRC)/hpi/include
-+endif
-+
+ifneq ($(SYSTEM_ZLIB),true)
+CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
+
@@ -12139,8 +16552,8 @@ $FreeBSD$
OTHER_LDLIBS = $(JVMLIB)
+endif
+
---- ./jdk/make/javax/sound/FILES_c.gmk 2010-12-16 14:10:01.000000000 -0800
-+++ ./jdk/make/javax/sound/FILES_c.gmk 2010-06-15 22:06:18.000000000 -0700
+--- ./jdk/make/javax/sound/FILES_c.gmk 2011-05-26 18:34:09.000000000 -0700
++++ ./jdk/make/javax/sound/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -34,6 +34,8 @@
FILES_linux =
@@ -12150,27 +16563,33 @@ $FreeBSD$
FILES_windows = \
PLATFORM_API_WinOS_MidiIn.c \
PLATFORM_API_WinOS_MidiOut.c \
---- ./jdk/make/javax/sound/Makefile 2010-12-16 14:10:01.000000000 -0800
-+++ ./jdk/make/javax/sound/Makefile 2010-06-15 22:06:18.000000000 -0700
-@@ -108,6 +108,16 @@
+--- ./jdk/make/javax/sound/Makefile 2011-05-26 18:34:10.000000000 -0700
++++ ./jdk/make/javax/sound/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -105,6 +105,22 @@
#MXSPP_ADD = $(PLATFORM)-$(ARCH)/
endif # PLATFORM linux
+# XXXBSD: ???
+ifeq ($(PLATFORM), bsd)
++ifeq ($(OS_VENDOR), FreeBSD)
++ # ALSA handles directaudio, ports, and MIDI
++ SUBDIRS += jsoundalsa
++ EXTRA_SOUND_JNI_LIBS += jsoundalsa
++else
+ # build with empty MIDI i/o
+ INCLUDE_MIDI = TRUE
+ # build with empty ports
+ INCLUDE_PORTS = TRUE
+ # build with empty direct audio
+ INCLUDE_DAUDIO = TRUE
++endif
+endif # PLATFORM bsd
+
ifeq ($(PLATFORM), solaris)
# build with ports and direct audio
CPPFLAGS += -DUSE_PORTS=TRUE \
---- ./jdk/make/javax/sound/SoundDefs.gmk 2010-12-16 14:10:01.000000000 -0800
-+++ ./jdk/make/javax/sound/SoundDefs.gmk 2010-06-15 22:06:18.000000000 -0700
+--- ./jdk/make/javax/sound/SoundDefs.gmk 2011-05-26 18:34:10.000000000 -0700
++++ ./jdk/make/javax/sound/SoundDefs.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -40,6 +40,10 @@
CPPFLAGS += -DX_PLATFORM=X_LINUX
endif # PLATFORM linux
@@ -12182,9 +16601,61 @@ $FreeBSD$
ifeq ($(PLATFORM), solaris)
CPPFLAGS += -DX_PLATFORM=X_SOLARIS
---- ./jdk/make/jpda/back/Makefile 2010-12-16 14:10:01.000000000 -0800
-+++ ./jdk/make/jpda/back/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -50,7 +50,7 @@
+--- ./jdk/make/javax/sound/jsoundalsa/Makefile 2011-05-26 18:34:10.000000000 -0700
++++ ./jdk/make/javax/sound/jsoundalsa/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -51,6 +51,7 @@
+ $(PORTFILES_c)
+
+ # platform dependent files
++ifeq ($(PLATFORM), linux)
+ FILES_c += \
+ PLATFORM_API_LinuxOS_ALSA_CommonUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_PCM.c \
+@@ -60,19 +61,37 @@
+ PLATFORM_API_LinuxOS_ALSA_MidiUtils.c \
+ PLATFORM_API_LinuxOS_ALSA_Ports.c
+
++MIDI_CPPFLAGS= \
++ -DUSE_PLATFORM_MIDI_OUT=TRUE \
++ -DUSE_PLATFORM_MIDI_IN=TRUE
++endif
++
++ifeq ($(PLATFORM), bsd)
++FILES_c += \
++ PLATFORM_API_BsdOS_ALSA_CommonUtils.c \
++ PLATFORM_API_BsdOS_ALSA_PCM.c \
++ PLATFORM_API_BsdOS_ALSA_PCMUtils.c \
++ PLATFORM_API_BsdOS_ALSA_MidiIn.c \
++ PLATFORM_API_BsdOS_ALSA_MidiOut.c \
++ PLATFORM_API_BsdOS_ALSA_MidiUtils.c \
++ PLATFORM_API_BsdOS_ALSA_Ports.c
++
++MIDI_CPPFLAGS=
++endif
++
+ FILES_export = \
+ $(DAUDIOFILES_export) \
+ $(MIDIFILES_export) \
+ $(PORTFILES_export)
+
+-LDFLAGS += -lasound
++LDFLAGS += -L$(ALSA_LIB_PATH) -lasound
+
+ CPPFLAGS += \
+ -DUSE_DAUDIO=TRUE \
+ -DUSE_PORTS=TRUE \
+- -DUSE_PLATFORM_MIDI_OUT=TRUE \
+- -DUSE_PLATFORM_MIDI_IN=TRUE \
+- -I$(SHARE_SRC)/native/com/sun/media/sound
++ $(MIDI_CPPFLAGS) \
++ -I$(SHARE_SRC)/native/com/sun/media/sound \
++ -I$(ALSA_HEADERS_PATH)
+
+ #
+ # Add to the ambient VPATH.
+--- ./jdk/make/jpda/back/Makefile 2011-05-26 18:34:11.000000000 -0700
++++ ./jdk/make/jpda/back/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -49,7 +49,7 @@
-I$(GENNATIVESRCDIR)/jdwp
ifneq ($(PLATFORM), windows)
@@ -12193,9 +16664,9 @@ $FreeBSD$
endif # PLATFORM
#
---- ./jdk/make/jpda/transport/socket/Makefile 2010-12-16 14:10:01.000000000 -0800
-+++ ./jdk/make/jpda/transport/socket/Makefile 2010-07-10 12:31:09.000000000 -0700
-@@ -41,6 +41,11 @@
+--- ./jdk/make/jpda/transport/socket/Makefile 2011-05-26 18:34:12.000000000 -0700
++++ ./jdk/make/jpda/transport/socket/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -40,6 +40,11 @@
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET) -lpthread
endif
@@ -12207,8 +16678,8 @@ $FreeBSD$
ifeq ($(PLATFORM), solaris)
OTHER_LDLIBS += $(LIBNSL) $(LIBSOCKET)
endif
---- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-12-16 14:10:03.000000000 -0800
-+++ ./jdk/make/mkdemo/jvmti/hprof/Makefile 2010-08-06 21:58:27.000000000 -0700
+--- ./jdk/make/mkdemo/jvmti/hprof/Makefile 2011-05-26 18:34:19.000000000 -0700
++++ ./jdk/make/mkdemo/jvmti/hprof/Makefile 2011-04-22 23:08:16.000000000 -0700
@@ -37,12 +37,11 @@
ifeq ($(PLATFORM), windows)
@@ -12226,9 +16697,9 @@ $FreeBSD$
endif
#
---- ./jdk/make/sun/awt/Makefile 2010-12-16 14:10:06.000000000 -0800
-+++ ./jdk/make/sun/awt/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -94,7 +94,7 @@
+--- ./jdk/make/sun/awt/Makefile 2011-05-26 18:34:33.000000000 -0700
++++ ./jdk/make/sun/awt/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -93,7 +93,7 @@
ifeq ($(PLATFORM), solaris)
FILES_c = $(FILES_2D_c)
FILES_c += awt_LoadLibrary.c
@@ -12237,7 +16708,7 @@ $FreeBSD$
ifeq ($(CC_VER), 5.8)
ifndef REMOVE_ALL_WORKAROUNDS
ifeq ($(ARCH_FAMILY), i586)
-@@ -121,7 +121,14 @@
+@@ -120,7 +120,14 @@
FILES_c = $(FILES_2D_c)
FILES_c += awt_LoadLibrary.c
OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
@@ -12253,7 +16724,7 @@ $FreeBSD$
endif
FILES_c += initIDs.c
-@@ -237,7 +244,7 @@
+@@ -240,7 +247,7 @@
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ WINDOWS
endif # PLATFORM
@@ -12262,7 +16733,7 @@ $FreeBSD$
# vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv LINUX
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/../java2d/opengl
-@@ -392,6 +399,19 @@
+@@ -390,6 +397,19 @@
# ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
endif # PLATFORM
@@ -12282,7 +16753,7 @@ $FreeBSD$
FONTCONFIGS = $(_FONTCONFIGS:%=$(LIBDIR)/%.src)
BINARYFONTCONFIGS = $(_FONTCONFIGS:%.properties=$(LIBDIR)/%.bfc)
-@@ -485,6 +505,9 @@
+@@ -482,6 +502,9 @@
-I$(OPENWIN_HOME)/include/X11/extensions \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/font
endif
@@ -12292,7 +16763,7 @@ $FreeBSD$
CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
-I$(SHARE_SRC)/native/$(PKGDIR)/../font \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/../font \
-@@ -506,7 +529,13 @@
+@@ -503,7 +526,13 @@
-I$(PLATFORM_SRC)/native/$(PKGDIR) \
$(EVENT_MODEL)
@@ -12307,27 +16778,8 @@ $FreeBSD$
LDFLAGS += -L$(OPENWIN_LIB)
endif
---- ./jdk/make/sun/awt/mapfile-vers-bsd 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/make/sun/awt/mapfile-vers-bsd 2010-07-04 12:38:37.000000000 -0700
-@@ -533,11 +533,11 @@
-
- X11SurfaceData_GetOps;
- getDefaultConfig;
-- Java_sun_font_FontConfigManager_getFontConfig;
-- Java_sun_font_FontConfigManager_getFontConfigAASettings;
-- Java_sun_awt_X11FontManager_getFontPath;
-- Java_sun_awt_X11FontManager_setNativeFontPath;
-- Java_sun_font_SunFontManager_populateFontFileNameMap;
-+ Java_sun_font_FontManager_getFontConfig;
-+ Java_sun_font_FontManager_getFontConfigAASettings;
-+ Java_sun_font_FontManager_getFontPath;
-+ Java_sun_font_FontManager_setNativeFontPath;
-+ Java_sun_font_FontManager_populateFontFileNameMap;
-
- # CDE private entry point
- Java_sun_awt_motif_XsessionWMcommand;
---- ./jdk/make/sun/awt/mawt.gmk 2010-12-16 14:10:06.000000000 -0800
-+++ ./jdk/make/sun/awt/mawt.gmk 2010-08-06 21:58:27.000000000 -0700
+--- ./jdk/make/sun/awt/mawt.gmk 2011-05-26 18:34:34.000000000 -0700
++++ ./jdk/make/sun/awt/mawt.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -169,7 +169,7 @@
OTHER_LDLIBS = -lXt -lXext $(LIBXTST) $(LIBXMU) -lX11 -lXi
endif
@@ -12370,9 +16822,9 @@ $FreeBSD$
+endif # !HEADLESS
+
ifeq ($(PLATFORM), linux)
- # Checking for the X11/extensions headers at the additional location
- CPPFLAGS += -I/X11R6/include/X11/extensions \
- -I/usr/include/X11/extensions
+ # Checking for the X11/extensions headers at the additional location
+ CPPFLAGS += -I$(firstword $(wildcard $(OPENWIN_HOME)/include/X11/extensions) \
+ $(wildcard /usr/include/X11/extensions))
endif
+ifeq ($(PLATFORM), bsd)
@@ -12390,9 +16842,9 @@ $FreeBSD$
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
$(AWT_RUNPATH)
---- ./jdk/make/sun/font/Makefile 2010-12-16 14:10:07.000000000 -0800
-+++ ./jdk/make/sun/font/Makefile 2010-06-15 22:06:20.000000000 -0700
-@@ -174,6 +174,15 @@
+--- ./jdk/make/sun/font/Makefile 2011-05-26 18:34:36.000000000 -0700
++++ ./jdk/make/sun/font/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -172,6 +172,15 @@
# Libraries to link, and other C flags.
#
@@ -12408,7 +16860,7 @@ $FreeBSD$
ifeq ($(PLATFORM), solaris)
# Note that on Solaris, fontmanager is built against the headless library.
LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/headless
-@@ -184,6 +193,7 @@
+@@ -182,6 +191,7 @@
OTHER_LDLIBS += -Wl,-Bstatic -lgcc_eh -Wl,-Bdynamic
endif
endif
@@ -12416,9 +16868,9 @@ $FreeBSD$
endif # PLATFORM
---- ./jdk/make/sun/image/generic/Makefile 2010-12-16 14:10:08.000000000 -0800
-+++ ./jdk/make/sun/image/generic/Makefile 2010-10-31 14:16:39.000000000 -0700
-@@ -71,6 +71,6 @@
+--- ./jdk/make/sun/image/generic/Makefile 2011-05-26 18:34:38.000000000 -0700
++++ ./jdk/make/sun/image/generic/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -70,6 +70,6 @@
OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
ifneq ($(PLATFORM), windows)
@@ -12426,18 +16878,18 @@ $FreeBSD$
+ OTHER_LDLIBS = $(LIBM) $(LIBDL)
endif
---- ./jdk/make/sun/image/vis/Makefile 2010-12-16 14:10:08.000000000 -0800
-+++ ./jdk/make/sun/image/vis/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -69,5 +69,5 @@
+--- ./jdk/make/sun/image/vis/Makefile 2011-05-26 18:34:39.000000000 -0700
++++ ./jdk/make/sun/image/vis/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -68,5 +68,5 @@
CFLAGS += $(CFLAGS_$(ARCH)) $(INLINE) -I$(PLATFORM_SRC)/native/sun/awt/medialib -I$(SHARE_SRC)/native/sun/awt/medialib
OTHER_CFLAGS += -D__USE_J2D_NAMES -D__MEDIALIB_OLD_NAMES
-OTHER_LDLIBS = $(LIBM) -ldl
+OTHER_LDLIBS = $(LIBM) $(LIBDL)
---- ./jdk/make/sun/jawt/Makefile 2010-12-16 14:10:10.000000000 -0800
-+++ ./jdk/make/sun/jawt/Makefile 2010-06-15 22:06:20.000000000 -0700
-@@ -93,8 +93,7 @@
+--- ./jdk/make/sun/jawt/Makefile 2011-05-26 18:34:43.000000000 -0700
++++ ./jdk/make/sun/jawt/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -92,8 +92,7 @@
#
# Other extra flags needed for compiling.
#
@@ -12447,7 +16899,7 @@ $FreeBSD$
-I$(SHARE_SRC)/native/$(PKGDIR)/image \
-I$(SHARE_SRC)/native/$(PKGDIR)/image/cvutils \
-I$(SHARE_SRC)/native/$(PKGDIR)/alphacomposite \
-@@ -108,6 +107,7 @@
+@@ -107,6 +106,7 @@
-I$(SHARE_SRC)/native/$(PKGDIR)/../dc/doe \
-I$(SHARE_SRC)/native/$(PKGDIR)/../dc/path \
-I$(PLATFORM_SRC)/native/$(PKGDIR)/../jdga \
@@ -12455,18 +16907,26 @@ $FreeBSD$
$(EVENT_MODEL)
#
# Libraries to link in.
-@@ -116,7 +116,7 @@
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -L$(OPENWIN_LIB) -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt -L/usr/openwin/sfw/lib$(ISA_DIR) -lXrender
+@@ -119,7 +119,7 @@
+ endif
endif # PLATFORM
-ifeq ($(PLATFORM), linux)
+ifneq (,$(findstring $(PLATFORM), linux bsd))
- OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
+ ifndef BUILD_HEADLESS_ONLY
+ OTHER_LDLIBS = -L$(LIBDIR)/$(LIBARCH) -lawt -L$(LIBDIR)/$(LIBARCH)/xawt -lmawt
+ else
+@@ -130,7 +130,6 @@
+
endif # PLATFORM
---- ./jdk/make/sun/jdga/Makefile 2010-12-16 14:10:11.000000000 -0800
-+++ ./jdk/make/sun/jdga/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -56,7 +56,7 @@
+-
+ #
+ # Lets not remove any class files.
+ #
+--- ./jdk/make/sun/jdga/Makefile 2011-05-26 18:34:44.000000000 -0700
++++ ./jdk/make/sun/jdga/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -55,7 +55,7 @@
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)
ifneq ($(PLATFORM), windows)
@@ -12475,9 +16935,21 @@ $FreeBSD$
CPPFLAGS += \
-I$(SHARE_SRC)/javavm/export \
---- ./jdk/make/sun/security/ec/Makefile 2010-12-16 14:10:12.000000000 -0800
-+++ ./jdk/make/sun/security/ec/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -193,7 +193,7 @@
+--- ./jdk/make/sun/rmi/rmi/Makefile 2011-05-26 18:34:49.000000000 -0700
++++ ./jdk/make/sun/rmi/rmi/Makefile 2011-05-20 20:16:38.000000000 -0700
+@@ -97,6 +97,9 @@
+ BUILD_TARGETS += bin
+ endif
+ endif
++ifeq ($(PLATFORM), bsd)
++ BUILD_TARGETS += bin
++endif
+
+ build: $(BUILD_TARGETS)
+
+--- ./jdk/make/sun/security/ec/Makefile 2011-05-26 18:34:50.000000000 -0700
++++ ./jdk/make/sun/security/ec/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -192,7 +192,7 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS += $(JVMLIB)
else
@@ -12486,9 +16958,9 @@ $FreeBSD$
endif
include $(BUILDDIR)/common/Mapfile-vers.gmk
---- ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-12-16 14:10:13.000000000 -0800
-+++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -72,6 +72,6 @@
+--- ./jdk/make/sun/security/jgss/wrapper/Makefile 2011-05-26 18:34:51.000000000 -0700
++++ ./jdk/make/sun/security/jgss/wrapper/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -71,6 +71,6 @@
#
# Libraries to link
#
@@ -12497,9 +16969,9 @@ $FreeBSD$
+ifeq ($(PLATFORM), windows)
+OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
endif
---- ./jdk/make/sun/security/krb5/Makefile 2010-12-16 14:10:13.000000000 -0800
-+++ ./jdk/make/sun/security/krb5/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -76,7 +76,7 @@
+--- ./jdk/make/sun/security/krb5/Makefile 2011-05-26 18:34:51.000000000 -0700
++++ ./jdk/make/sun/security/krb5/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -75,7 +75,7 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = $(JVMLIB)
else
@@ -12508,9 +16980,9 @@ $FreeBSD$
endif
build:
---- ./jdk/make/sun/security/pkcs11/Makefile 2010-12-16 14:10:13.000000000 -0800
-+++ ./jdk/make/sun/security/pkcs11/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -157,10 +157,10 @@
+--- ./jdk/make/sun/security/pkcs11/Makefile 2011-05-26 18:34:52.000000000 -0700
++++ ./jdk/make/sun/security/pkcs11/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -156,10 +156,10 @@
#
# Libraries to link
#
@@ -12523,9 +16995,9 @@ $FreeBSD$
endif
# Other config files
---- ./jdk/make/sun/security/smartcardio/Makefile 2010-12-16 14:10:13.000000000 -0800
-+++ ./jdk/make/sun/security/smartcardio/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -76,6 +76,6 @@
+--- ./jdk/make/sun/security/smartcardio/Makefile 2011-05-26 18:34:52.000000000 -0700
++++ ./jdk/make/sun/security/smartcardio/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -75,6 +75,6 @@
ifeq ($(PLATFORM), windows)
OTHER_LDLIBS = $(JVMLIB) winscard.lib
else
@@ -12533,8 +17005,8 @@ $FreeBSD$
+ OTHER_LDLIBS = $(LIBDL) $(JVMLIB)
OTHER_CFLAGS = -D__sun_jdk
endif
---- ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-12-16 14:10:14.000000000 -0800
-+++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2010-06-15 22:06:21.000000000 -0700
+--- ./jdk/make/sun/splashscreen/FILES_c.gmk 2011-05-26 18:34:53.000000000 -0700
++++ ./jdk/make/sun/splashscreen/FILES_c.gmk 2011-04-22 23:08:16.000000000 -0700
@@ -49,18 +49,6 @@
dgif_lib.c \
gif_err.c \
@@ -12573,9 +17045,9 @@ $FreeBSD$
+ zcrc32.c \
+ zutil.c
+endif
---- ./jdk/make/sun/splashscreen/Makefile 2010-12-16 14:10:14.000000000 -0800
-+++ ./jdk/make/sun/splashscreen/Makefile 2010-06-15 22:06:21.000000000 -0700
-@@ -64,8 +64,24 @@
+--- ./jdk/make/sun/splashscreen/Makefile 2011-05-26 18:34:53.000000000 -0700
++++ ./jdk/make/sun/splashscreen/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -63,8 +63,24 @@
ifneq ($(PLATFORM), windows)
CFLAGS += -DWITH_X11
@@ -12602,7 +17074,7 @@ $FreeBSD$
else # PLATFORM
CFLAGS += -DWITH_WIN32
OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib delayimp.lib /DELAYLOAD:user32.dll
-@@ -78,13 +94,20 @@
+@@ -77,13 +93,20 @@
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib
@@ -12625,9 +17097,9 @@ $FreeBSD$
# Shun the less than portable MMX assembly code in pnggccrd.c,
# and use alternative implementations in C.
---- ./jdk/make/sun/tracing/dtrace/Makefile 2010-12-16 14:10:14.000000000 -0800
-+++ ./jdk/make/sun/tracing/dtrace/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -56,7 +56,7 @@
+--- ./jdk/make/sun/tracing/dtrace/Makefile 2011-05-26 18:34:54.000000000 -0700
++++ ./jdk/make/sun/tracing/dtrace/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -55,7 +55,7 @@
FILES_export = $(FILES_java)
ifeq ($(PLATFORM), linux)
@@ -12636,9 +17108,9 @@ $FreeBSD$
endif
#
---- ./jdk/make/sun/xawt/Makefile 2010-12-16 14:10:14.000000000 -0800
-+++ ./jdk/make/sun/xawt/Makefile 2010-07-10 13:26:05.000000000 -0700
-@@ -48,6 +48,9 @@
+--- ./jdk/make/sun/xawt/Makefile 2011-05-26 18:34:55.000000000 -0700
++++ ./jdk/make/sun/xawt/Makefile 2011-04-22 23:08:16.000000000 -0700
+@@ -47,6 +47,9 @@
AUTO_JAVA_PRUNE = WrapperGenerator.java
LDFLAGS += -L$(OPENWIN_LIB)
@@ -12648,7 +17120,7 @@ $FreeBSD$
# For Xrender extension.
ifeq ($(PLATFORM), solaris)
-@@ -59,6 +62,11 @@
+@@ -58,6 +61,11 @@
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif
@@ -12660,7 +17132,7 @@ $FreeBSD$
# Since this library will be living in a subdirectory below the other libraries
# we need to add an extra runpath so that libraries in the upper directory
# are found at runtime.
-@@ -93,7 +101,7 @@
+@@ -92,7 +100,7 @@
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/opengl
vpath %.c $(PLATFORM_SRC)/native/sun/java2d/x11
@@ -12669,7 +17141,7 @@ $FreeBSD$
$(LDFLAGS_COMMON) $(AWT_RUNPATH) $(OTHER_LDFLAGS) -lXtst -lXi
ifeq ($(PLATFORM), solaris)
-@@ -101,8 +109,6 @@
+@@ -100,8 +108,6 @@
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif
@@ -12678,21 +17150,24 @@ $FreeBSD$
CPPFLAGS += -DXAWT -DXAWT_HACK \
-I$(TEMPDIR)/../../sun.awt/awt/CClassHeaders \
-I$(PLATFORM_SRC)/native/sun/awt \
-@@ -129,9 +135,11 @@
+@@ -128,12 +134,14 @@
-I$(SHARE_SRC)/native/sun/awt \
-I$(PLATFORM_SRC)/native/sun/awt
+CPPFLAGS += -I$(CUPS_HEADERS_PATH)
+
ifeq ($(PLATFORM), linux)
- # Allows for builds on Debian GNU Linux, X11 is in a different place
-- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
-+ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
- -I/usr/include/X11/extensions \
- -I$(OPENWIN_HOME)/include
- endif
-@@ -140,6 +148,14 @@
- CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions
+ ifndef CROSS_COMPILE_ARCH
+ # Allows for builds on Debian GNU Linux, X11 is in a different place
+ # This should really be handled at a higher-level so we don't have to
+ # work-around this when cross-compiling
+- CPPFLAGS += -I/usr/X11R6/include/X11/extensions \
++ CPPFLAGS += -I$(OPENWIN_HOME)/include/X11/extensions \
+ -I/usr/include/X11/extensions \
+ -I$(OPENWIN_HOME)/include
+ else
+@@ -163,6 +171,14 @@
+ endif
endif
+ifeq ($(PLATFORM), bsd)
@@ -12706,8 +17181,8 @@ $FreeBSD$
ifeq ($(MILESTONE), internal)
CPPFLAGS += -DINTERNAL_BUILD
endif
---- ./jdk/make/tools/freetypecheck/Makefile 2010-12-16 14:10:20.000000000 -0800
-+++ ./jdk/make/tools/freetypecheck/Makefile 2010-06-15 22:06:21.000000000 -0700
+--- ./jdk/make/tools/freetypecheck/Makefile 2011-05-26 18:35:35.000000000 -0700
++++ ./jdk/make/tools/freetypecheck/Makefile 2011-04-22 23:08:17.000000000 -0700
@@ -49,8 +49,15 @@
# Add runtime lib search path to ensure test will be runnable
ifeq ($(PLATFORM), solaris)
@@ -12725,9 +17200,9 @@ $FreeBSD$
endif
endif
FT_OPTIONS += -I$(FREETYPE_HEADERS_PATH)
---- ./jdk/make/tools/reorder/Makefile 2010-12-16 14:10:20.000000000 -0800
-+++ ./jdk/make/tools/reorder/Makefile 2010-08-06 21:58:27.000000000 -0700
-@@ -187,11 +187,11 @@
+--- ./jdk/make/tools/reorder/Makefile 2011-05-26 18:35:37.000000000 -0700
++++ ./jdk/make/tools/reorder/Makefile 2011-04-22 23:08:17.000000000 -0700
+@@ -185,11 +185,11 @@
# This library 'libmcount.so' also used by hotspot reordering.
$(OBJDIR)/libmcount.so : $(MCOUNT_OBJ)
@@ -12741,8 +17216,137 @@ $FreeBSD$
# Reorder libraries.
+--- ./jdk/src/bsd/doc/man/ja/jvisualvm.1 2011-05-29 11:28:24.000000000 -0700
++++ ./jdk/src/bsd/doc/man/ja/jvisualvm.1 1969-12-31 16:00:00.000000000 -0800
+@@ -1,126 +0,0 @@
+-." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+-." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-."
+-." This code is free software; you can redistribute it and/or modify it
+-." under the terms of the GNU General Public License version 2 only, as
+-." published by the Free Software Foundation.
+-."
+-." This code is distributed in the hope that it will be useful, but WITHOUT
+-." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-." version 2 for more details (a copy is included in the LICENSE file that
+-." accompanied this code).
+-."
+-." You should have received a copy of the GNU General Public License version
+-." 2 along with this work; if not, write to the Free Software Foundation,
+-." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-."
+-." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-." or visit www.oracle.com if you need additional information or have any
+-." questions.
+-."
+-.TH jvisualvm 1 "07 May 2011"
+-
+-.LP
+-.SH "̾Á°"
+-\f2jvisualvm\fP \- Java ²¾ÁÛ¥Þ¥·¥ó¤Î´Æ»ë¡¢¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¡¢¤ª¤è¤Ó¥×¥í¥Õ¥¡¥¤¥ê¥ó¥°¥Ä¡¼¥ë
+-.LP
+-.RS 3
+-.TP 2
+-o
+-·Á¼°
+-.TP 2
+-o
+-¥Ñ¥é¥á¡¼¥¿
+-.TP 2
+-o
+-ÀâÌÀ
+-.TP 2
+-o
+-¥ª¥×¥·¥ç¥ó
+-.TP 2
+-o
+-»ÈÍÑÊýË¡
+-.TP 2
+-o
+-´ØÏ¢¹àÌÜ
+-.RE
+-
+-.LP
+-.SH "·Á¼°"
+-.LP
+-.nf
+-\f3
+-.fl
+- \fP\f3jvisualvm\fP [ \f2options\fP ]
+-.fl
+-.fi
+-
+-.LP
+-.SH "¥Ñ¥é¥á¡¼¥¿"
+-.LP
+-.LP
+-¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ë¾ì¹ç¡¢¥³¥Þ¥ó¥É̾¤Îľ¸å¤Ëµ­½Ò¤·¤Æ¤¯¤À¤µ¤¤¡£¥ª¥×¥·¥ç¥ó¤Î»ØÄê½ç½ø¤Ë·è¤Þ¤ê¤Ï¤¢¤ê¤Þ¤»¤ó¡£ÆÃÄê¤Î¥ª¥×¥·¥ç¥ó¤ËŬÍѤµ¤ì¤ë¥Ñ¥é¥á¡¼¥¿¤Ë¤Ä¤¤¤Æ¤Ï¡¢¤³¤Î¤¢¤È¤Î¡Ö¥ª¥×¥·¥ç¥ó¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+-.LP
+-.SH " ÀâÌÀ"
+-.LP
+-.LP
+-Java VisualVM ¤Ï¡¢»ØÄꤵ¤ì¤¿ Java ²¾ÁÛ¥Þ¥·¥ó (JVM(*)) ¤Ç Java ¥Æ¥¯¥Î¥í¥¸¥Ù¡¼¥¹¤Î¥¢¥×¥ê¥±¡¼¥·¥ç¥ó (Java ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó) ¤¬¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ë¡¢¤½¤Î Java ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Ë´Ø¤¹¤ë¾ÜºÙ¤Ê¾ðÊó¤òÄ󶡤¹¤ëľ´¶Åª¤Ê¥°¥é¥Õ¥£¥«¥ë¥æ¡¼¥¶¡¼¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤¹¡£Java VisualVM ¤È¤¤¤¦Ì¾Á°¤Ï¡¢Java VisualVM ¤¬ JVM ¥½¥Õ¥È¥¦¥§¥¢¤Ë´Ø¤¹¤ë¾ðÊó¤ò¡Ö»ë³ÐŪ¤Ë¡×Ä󶡤¹¤ë¤È¤¤¤¦»ö¼Â¤ËͳÍ褷¤Æ¤¤¤Þ¤¹¡£
+-.LP
+-.LP
+-Java VisualVM ¤Ï¡¢¤¤¤¯¤Ä¤«¤Î´Æ»ë¡¢¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¡¢¤ª¤è¤Ó¥×¥í¥Õ¥¡¥¤¥ê¥ó¥°¥æ¡¼¥Æ¥£¥ê¥Æ¥£¡¼¤ò 1 ¤Ä¤Î¥Ä¡¼¥ë¤ËÅý¹ç¤·¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢¥¹¥¿¥ó¥É¥¢¥í¥ó¥Ä¡¼¥ë \f2jmap\fP¡¢ \f2jinfo\fP¡¢ \f2jstat\fP ¡¢¤ª¤è¤Ó \f2jstack\fP ¤ÇÄ󶡤µ¤ì¤Æ¤¤¤ëµ¡Ç½¤Î¤Û¤È¤ó¤É¤¬¡¢Java VisualVM ¤ËÁȤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£JConsole ¥Ä¡¼¥ë¤Ë¤è¤Ã¤ÆÄ󶡤µ¤ì¤ë°ìÉô¤Îµ¡Ç½¤Ê¤É¡¢¤Û¤«¤Îµ¡Ç½¤Ï¥ª¥×¥·¥ç¥ó¤Î¥×¥é¥°¥¤¥ó¤È¤·¤ÆÄɲäǤ­¤Þ¤¹¡£
+-.LP
+-.SH "¥ª¥×¥·¥ç¥ó"
+-.LP
+-.LP
+-¼¡¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢Java VisualVM ¤òµ¯Æ°¤·¤¿¤È¤­¤Ë¼Â¹Ô²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£
+-.LP
+-.RS 3
+-.TP 3
+-\-J<jvm_option>\
+-¤³¤Î \f2<jvm_option>\fP ¤ò JVM ¥½¥Õ¥È¥¦¥§¥¢¤ËÅϤ·¤Þ¤¹¡£
+-.RE
+-
+-.LP
+-.SH "»ÈÍÑÊýË¡"
+-.LP
+-.LP
+-Java VisualVM ¤Ï¡¢Java ¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î³«È¯¼Ô¤¬¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥È¥é¥Ö¥ë¥·¥å¡¼¥Æ¥£¥ó¥°¤ò¹Ô¤Ê¤Ã¤¿¤ê¡¢¥¢¥×¥ê¥±¡¼¥·¥ç¥ó¤Î¥Ñ¥Õ¥©¡¼¥Þ¥ó¥¹¤ò´Æ»ë¤ª¤è¤Ó²þÁ±¤·¤¿¤ê¤¹¤ë¤Î¤ËÌòΩ¤Á¤Þ¤¹¡£Java VisualVM ¤ò»ÈÍѤ¹¤ë¤È¡¢³«È¯¼Ô¤Ï¥Ò¡¼¥×¥À¥ó¥×¤ÎÀ¸À®¤ª¤è¤Ó²òÀÏ¡¢¥á¥â¥ê¡¼¥ê¡¼¥¯¤ÎÆÃÄê¡¢¥¬¥Ù¡¼¥¸¥³¥ì¥¯¥·¥ç¥ó¤Î¼Â¹Ô¤ª¤è¤Ó´Æ»ë¡¢¤ª¤è¤Ó¥á¥â¥ê¡¼¤È CPU ¤Î´Ê°×¥×¥í¥Õ¥¡¥¤¥ê¥ó¥°¤Î¼Â¹Ô¤¬²Äǽ¤Ë¤Ê¤ê¤Þ¤¹¡£Java VisualVM ¤Îµ¡Ç½¤ò³ÈÄ¥¤¹¤ë¥×¥é¥°¥¤¥ó¤â¤¤¤¯¤Ä¤«¤¢¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢JConsole ¥Ä¡¼¥ë¤Î¤Û¤È¤ó¤É¤Îµ¡Ç½¤Ï¡¢MBeans ¥¿¥Ö¤ª¤è¤Ó JConsole Plug\-in Wrapper ¥×¥é¥°¥¤¥ó¤ò²ð¤·¤Æ»ÈÍѤǤ­¤Þ¤¹¡£É¸½à¤Î Java VisualVM ¥×¥é¥°¥¤¥ó¤Î¥«¥¿¥í¥°¤«¤éÁªÂò¤¹¤ë¤Ë¤Ï¡¢Java VisualVM ¥á¥Ë¥å¡¼¤Î¡Ö¥Ä¡¼¥ë¡×>¡Ö¥×¥é¥°¥¤¥ó¡×¤òÁªÂò¤·¤Þ¤¹¡£
+-.LP
+-.LP
+-Java VisualVM ¤òµ¯Æ°¤¹¤ë¤Ë¤Ï¡¢¼¡¤Î¥³¥Þ¥ó¥É¤ò¼Â¹Ô¤·¤Þ¤¹¡£
+-.LP
+-.nf
+-\f3
+-.fl
+-% jvisualvm \fP\f4<options>\fP\f3
+-.fl
+-\fP
+-.fi
+-
+-.LP
+-.SH "´ØÏ¢¹àÌÜ"
+-.LP
+-.LP
+-Java VisualVM ¤Î¾ÜºÙ¤Ï¡¢¼¡¤Î¥Ú¡¼¥¸¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+-.LP
+-.RS 3
+-.TP 2
+-o
+-.na
+-\f2Java VisualVM ³«È¯¼Ô¤Î¥µ¥¤¥È\fP @
+-.fi
+-http://visualvm.java.net
+-.TP 2
+-o
+-.na
+-\f2Java SE ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Ç¤Î Java VisualVM ¤Î¥É¥­¥å¥á¥ó¥È\fP @
+-.fi
+-http://java.sun.com/javase/6/docs/technotes/guides/visualvm/index.html
+-.RE
+-
+-.LP
+-.LP
+-\f2(* ¡ÖJava ²¾ÁÛ¥Þ¥·¥ó¡×¤È¡ÖJVM¡×¤È¤¤¤¦ÍѸì¤Ï¡¢Java ¥×¥é¥Ã¥È¥Õ¥©¡¼¥à¤Î²¾ÁÛ¥Þ¥·¥ó¤ò°ÕÌ£¤·¤Æ¤¤¤Þ¤¹¡£)\fP
+-.LP
+-
--- ./jdk/src/bsd/doc/man/ja/kinit.1 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/bsd/doc/man/ja/kinit.1 2010-07-04 12:38:38.000000000 -0700
++++ ./jdk/src/bsd/doc/man/ja/kinit.1 2011-04-22 23:08:18.000000000 -0700
@@ -0,0 +1,159 @@
+'\" t
+.\"
@@ -12904,7 +17508,7 @@ $FreeBSD$
+.BR ps
+¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢¹¶·â¼Ô¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
--- ./jdk/src/bsd/doc/man/ja/klist.1 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/bsd/doc/man/ja/klist.1 2010-07-04 12:38:38.000000000 -0700
++++ ./jdk/src/bsd/doc/man/ja/klist.1 2011-04-22 23:08:18.000000000 -0700
@@ -0,0 +1,110 @@
+'\" t
+.\"
@@ -13017,7 +17621,7 @@ $FreeBSD$
+.ft 1
+.LP
--- ./jdk/src/bsd/doc/man/ja/ktab.1 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/bsd/doc/man/ja/ktab.1 2010-07-04 12:38:38.000000000 -0700
++++ ./jdk/src/bsd/doc/man/ja/ktab.1 2011-04-22 23:08:18.000000000 -0700
@@ -0,0 +1,125 @@
+'\" t
+.\"
@@ -13144,8 +17748,115 @@ $FreeBSD$
+¤Ë¤Ê¤ê¤Þ¤¹¡£¤¿¤È¤¨¤Ð¡¢UNIX ¤Î
+.BI ps
+¥³¥Þ¥ó¥É¤Î¼Â¹ÔÃæ¤Ë¡¢¹¶·â¼Ô¤Ï¥Ñ¥¹¥ï¡¼¥É¤ò¸¡½Ð¤¹¤ë¤³¤È¤¬¤Ç¤­¤Æ¤·¤Þ¤¤¤Þ¤¹¡£
---- ./jdk/src/share/back/commonRef.c 2010-12-16 14:10:32.000000000 -0800
-+++ ./jdk/src/share/back/commonRef.c 2010-06-15 22:06:23.000000000 -0700
+--- ./jdk/src/bsd/doc/man/jvisualvm.1 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/bsd/doc/man/jvisualvm.1 1969-12-31 16:00:00.000000000 -0800
+@@ -1,104 +0,0 @@
+-." Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+-." DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+-."
+-." This code is free software; you can redistribute it and/or modify it
+-." under the terms of the GNU General Public License version 2 only, as
+-." published by the Free Software Foundation.
+-."
+-." This code is distributed in the hope that it will be useful, but WITHOUT
+-." ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+-." FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+-." version 2 for more details (a copy is included in the LICENSE file that
+-." accompanied this code).
+-."
+-." You should have received a copy of the GNU General Public License version
+-." 2 along with this work; if not, write to the Free Software Foundation,
+-." Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+-."
+-." Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+-." or visit www.oracle.com if you need additional information or have any
+-." questions.
+-."
+-.TH jvisualvm 1 "10 May 2011"
+-
+-.LP
+-.SH "Name"
+-\f2jvisualvm\fP \- Java Virtual Machine Monitoring, Troubleshooting, and Profiling Tool
+-.LP
+-.SH "SYNOPSIS"
+-.LP
+-.nf
+-\f3
+-.fl
+- \fP\f3jvisualvm\fP [ \f2options\fP ]
+-.fl
+-.fi
+-
+-.LP
+-.SH "PARAMETERS"
+-.LP
+-.LP
+-Options, if used, should follow immediately after the command name. Options may be in any order. For a discussion of parameters that apply to a specific option, see OPTIONS below.
+-.LP
+-.SH "DESCRIPTION"
+-.LP
+-.LP
+-Java VisualVM is an intuitive graphical user interface that provides detailed information about Java technology\-based applications (Java applications) while they are running on a given Java Virtual Machine (JVM(*)). The name Java VisualVM comes from the fact that Java VisualVM provides information about the JVM software \f2visually\fP.
+-.LP
+-.LP
+-Java VisualVM combines several monitoring, troubleshooting, and profiling utilities into a single tool. For example, most of the functionality offered by the standalone tools \f2jmap\fP, \f2jinfo\fP, \f2jstat\fP and \f2jstack\fP have been integrated into Java VisualVM. Other functionalities, such as some of those offered by the JConsole tool, can be added as optional plug\-ins.
+-.LP
+-.SH "OPTIONS"
+-.LP
+-.LP
+-The following option is possible when you launch Java VisualVM.
+-.LP
+-.RS 3
+-.TP 3
+-\-J<jvm_option>\
+-Pass this \f2<jvm_option>\fP to the JVM software.
+-.RE
+-
+-.LP
+-.SH "USAGE"
+-.LP
+-.LP
+-Java VisualVM is useful to Java application developers to troubleshoot applications and to monitor and improve the applications' performance. Java VisualVM can allow developers to generate and analyse heap dumps, track down memory leaks, perform and monitor garbage collection, and perform lightweight memory and CPU profiling. Plug\-ins also exist that expand the functionality of Java VisualVM. For example, most of the functionality of the JConsole tool is available via the MBeans Tab and JConsole Plug\-in Wrapper plug\-ins. You can choose from a catalog of standard Java VisualVM plug\-ins by selecting 'Tools' | 'Plugins' in the Java VisualVM menus.
+-.LP
+-.LP
+-Start Java VisualVM with the following command:
+-.LP
+-.nf
+-\f3
+-.fl
+-% jvisualvm \fP\f4<options>\fP\f3
+-.fl
+-\fP
+-.fi
+-
+-.LP
+-.SH "SEE ALSO"
+-.LP
+-.LP
+-For more details about Java VisualVM see the following pages.
+-.LP
+-.RS 3
+-.TP 2
+-o
+-.na
+-\f2Java VisualVM developers' site\fP @
+-.fi
+-http://visualvm.java.net
+-.TP 2
+-o
+-.na
+-\f2Java VisualVM in Java SE platform documentation\fP @
+-.fi
+-http://download.oracle.com/javase/7/docs/technotes/guides/visualvm/index.html
+-.RE
+-
+-.LP
+-.LP
+-\f2(* The terms "Java Virtual Machine" and "JVM" mean a Virtual Machine for the Java platform.)\fP
+-.LP
+-
+--- ./jdk/src/share/back/commonRef.c 2011-05-26 18:36:27.000000000 -0700
++++ ./jdk/src/share/back/commonRef.c 2011-04-22 23:08:18.000000000 -0700
@@ -23,6 +23,10 @@
* questions.
*/
@@ -13157,9 +17868,9 @@ $FreeBSD$
#include "util.h"
#include "commonRef.h"
---- ./jdk/src/share/bin/java.c 2010-12-16 14:10:33.000000000 -0800
-+++ ./jdk/src/share/bin/java.c 2010-12-11 09:07:22.000000000 -0800
-@@ -67,6 +67,10 @@
+--- ./jdk/src/share/bin/java.c 2011-05-26 18:36:33.000000000 -0700
++++ ./jdk/src/share/bin/java.c 2011-04-22 23:08:18.000000000 -0700
+@@ -70,6 +70,10 @@
static jboolean printXUsage = JNI_FALSE; /* print and exit*/
static char *showSettings = NULL; /* print but continue */
@@ -13170,37 +17881,34 @@ $FreeBSD$
static const char *_program_name;
static const char *_launcher_name;
static jboolean _is_java_args = JNI_FALSE;
-@@ -117,6 +121,10 @@
+@@ -120,6 +124,10 @@
static void DumpState();
static jboolean RemovableOption(char *option);
+#ifdef __APPLE__
-+static int ContinueInSameThread(InvocationFunctions* ifn, int argc, char **argv, char *jarfile, char *classname, int ret);
++static int ContinueInSameThread(InvocationFunctions* ifn, int argc, char **argv, int mode, char *what, int ret);
+#endif
+
/* Maximum supported entries from jvm.cfg. */
#define INIT_MAX_KNOWN_VMS 10
-@@ -303,9 +311,16 @@
-
+@@ -315,7 +323,15 @@
/* Show the splash screen if needed */
ShowSplashScreen();
--
-+
+
+#ifdef __APPLE__
+ if (continueInSameThread == JNI_TRUE) {
-+ return ContinueInSameThread(&ifn, argc, argv, jarfile, classname, ret);
++ return ContinueInSameThread(&ifn, argc, argv, mode, what, ret);
+ } else {
-+ return ContinueInNewThread(&ifn, argc, argv, jarfile, classname, ret);
++ return ContinueInNewThread(&ifn, argc, argv, mode, what, ret);
+ }
+#else
- return ContinueInNewThread(&ifn, argc, argv, jarfile, classname, ret);
--
+ return ContinueInNewThread(&ifn, argc, argv, mode, what, ret);
+#endif
+
}
/*
- * Always detach the main thread so that it appears to have ended when
-@@ -1028,6 +1043,12 @@
+@@ -1006,6 +1022,12 @@
} else if (JLI_StrCmp(arg, "-X") == 0) {
printXUsage = JNI_TRUE;
return JNI_TRUE;
@@ -13213,14 +17921,14 @@ $FreeBSD$
/*
* The following case checks for -XshowSettings OR -XshowSetting:SUBOPT.
* In the latter case, any SUBOPT value not recognized will default to "all"
-@@ -1942,6 +1963,44 @@
+@@ -1897,6 +1919,44 @@
}
}
+#ifdef __APPLE__
+static int
-+ContinueInSameThread(InvocationFunctions* ifn, int argc,
-+ char **argv, char *jarfile, char *classname, int ret)
++ContinueInSameThread(InvocationFunctions* ifn, int argc, char **argv,
++ int mode, char *what, int ret)
+{
+
+ /*
@@ -13244,8 +17952,8 @@ $FreeBSD$
+
+ args.argc = argc;
+ args.argv = argv;
-+ args.jarfile = jarfile;
-+ args.classname = classname;
++ args.mode = mode;
++ args.what = what;
+ args.ifn = *ifn;
+
+ rslt = JavaMain((void*)&args);
@@ -13258,8 +17966,8 @@ $FreeBSD$
static void
DumpState()
{
---- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-12-16 14:10:42.000000000 -0800
-+++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2010-06-15 22:06:25.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2011-05-26 18:37:04.000000000 -0700
++++ ./jdk/src/share/classes/com/sun/java/swing/plaf/gtk/Metacity.java 2011-04-22 23:08:19.000000000 -0700
@@ -477,6 +477,10 @@
String[] dirs = new String[] {
userHome + sep + ".themes",
@@ -13271,8 +17979,8 @@ $FreeBSD$
"/usr/share/themes",
"/usr/gnome/share/themes", // Debian/Redhat/Solaris
"/opt/gnome2/share/themes" // SuSE
---- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-12-16 14:10:56.000000000 -0800
-+++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2010-06-15 22:06:27.000000000 -0700
+--- ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2011-05-26 18:37:55.000000000 -0700
++++ ./jdk/src/share/classes/com/sun/jmx/snmp/SnmpPduTrap.java 2011-04-22 23:08:19.000000000 -0700
@@ -78,6 +78,9 @@
*/
public long timeStamp ;
@@ -13283,7 +17991,7 @@ $FreeBSD$
/**
---- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2010-12-18 00:00:03.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/media/sound/services/bsd-i586/javax.sound.sampled.spi.MixerProvider 1969-12-31 16:00:00.000000000 -0800
@@ -1,6 +0,0 @@
-# service provider file for Bsd: with DirectAudioDeviceProvider
@@ -13292,7 +18000,7 @@ $FreeBSD$
-com.sun.media.sound.SimpleInputDeviceProvider
-com.sun.media.sound.DirectAudioDeviceProvider
-com.sun.media.sound.HeadspaceMixerProvider
---- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/share/classes/com/sun/servicetag/BsdSystemEnvironment.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13488,8 +18196,8 @@ $FreeBSD$
- }
-
-}
---- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-12-16 14:11:29.000000000 -0800
-+++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2010-06-15 22:06:34.000000000 -0700
+--- ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2011-05-26 18:40:49.000000000 -0700
++++ ./jdk/src/share/classes/java/awt/GraphicsEnvironment.java 2011-04-22 23:08:22.000000000 -0700
@@ -172,7 +172,12 @@
} else {
String osName = System.getProperty("os.name");
@@ -13504,9 +18212,9 @@ $FreeBSD$
(System.getenv("DISPLAY") == null));
}
} else if (nm.equals("true")) {
---- ./jdk/src/share/classes/java/util/TimeZone.java 2010-12-16 14:12:13.000000000 -0800
-+++ ./jdk/src/share/classes/java/util/TimeZone.java 2010-11-13 12:00:16.000000000 -0800
-@@ -805,15 +805,13 @@
+--- ./jdk/src/share/classes/java/util/TimeZone.java 2011-05-26 18:43:50.000000000 -0700
++++ ./jdk/src/share/classes/java/util/TimeZone.java 2011-04-22 23:08:24.000000000 -0700
+@@ -849,15 +849,13 @@
}
int gmtOffset = (hours * 60 + num) * 60 * 1000;
@@ -13523,9 +18231,9 @@ $FreeBSD$
}
return zi;
}
---- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-12-16 14:13:07.000000000 -0800
-+++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2010-06-15 22:06:56.000000000 -0700
-@@ -1122,7 +1122,7 @@
+--- ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2011-05-26 18:48:46.000000000 -0700
++++ ./jdk/src/share/classes/sun/awt/FontConfiguration.java 2011-04-22 23:08:28.000000000 -0700
+@@ -1131,7 +1131,7 @@
*/
HashMap<String, Boolean> existsMap;
public boolean needToSearchForFile(String fileName) {
@@ -13534,17 +18242,8 @@ $FreeBSD$
return false;
} else if (existsMap == null) {
existsMap = new HashMap<String, Boolean>();
-@@ -1362,7 +1362,7 @@
- + "<filename."
- + getString(table_componentFontNameIDs[ii])
- + "> entry is missing!!!");
-- if (!osName.contains("Linux")) {
-+ if (!osName.contains("Linux") && !osName.contains("BSD") && !osName.contains("Darwin")) {
- errors++;
- }
- }
---- ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-12-16 14:13:07.000000000 -0800
-+++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2010-06-15 22:06:56.000000000 -0700
+--- ./jdk/src/share/classes/sun/awt/OSInfo.java 2011-05-26 18:48:48.000000000 -0700
++++ ./jdk/src/share/classes/sun/awt/OSInfo.java 2011-04-22 23:08:28.000000000 -0700
@@ -39,6 +39,7 @@
WINDOWS,
LINUX,
@@ -13568,9 +18267,9 @@ $FreeBSD$
// determine another OS here
}
---- ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-12-16 14:13:11.000000000 -0800
-+++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2010-10-31 14:12:35.000000000 -0700
-@@ -46,6 +46,8 @@
+--- ./jdk/src/share/classes/sun/font/FontUtilities.java 2011-05-26 18:49:03.000000000 -0700
++++ ./jdk/src/share/classes/sun/font/FontUtilities.java 2011-04-22 23:08:28.000000000 -0700
+@@ -48,6 +48,8 @@
public static boolean isLinux;
@@ -13579,7 +18278,7 @@ $FreeBSD$
public static boolean isSolaris8;
public static boolean isSolaris9;
-@@ -74,6 +76,11 @@
+@@ -76,6 +78,11 @@
isLinux = osName.startsWith("Linux");
@@ -13591,8 +18290,8 @@ $FreeBSD$
String t2kStr = System.getProperty("sun.java2d.font.scaler");
if (t2kStr != null) {
useT2K = "t2k".equals(t2kStr);
---- ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-12-16 14:13:12.000000000 -0800
-+++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2010-06-15 22:06:58.000000000 -0700
+--- ./jdk/src/share/classes/sun/font/SunFontManager.java 2011-05-26 18:49:04.000000000 -0700
++++ ./jdk/src/share/classes/sun/font/SunFontManager.java 2011-04-22 23:08:28.000000000 -0700
@@ -413,7 +413,7 @@
* registerFonts method as on-screen these JRE fonts
* always go through the T2K rasteriser.
@@ -13602,7 +18301,7 @@ $FreeBSD$
/* Linux font configuration uses these fonts */
registerFontDir(jreFontDirName);
}
---- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/share/classes/sun/io/ByteToCharEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,190 +0,0 @@
-/*
@@ -13795,7 +18494,7 @@ $FreeBSD$
- return charOff - outOff;
- }
-}
---- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/share/classes/sun/io/CharToByteEUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,193 +0,0 @@
-/*
@@ -13991,11 +18690,11 @@ $FreeBSD$
- return 2;
- }
-}
---- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/share/classes/sun/nio/cs/ext/EUC_JP_BSD.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,370 +0,0 @@
-/*
-- * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2002, 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
@@ -14364,8 +19063,8 @@ $FreeBSD$
- }
- }
-}
---- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-12-16 14:13:36.000000000 -0800
-+++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2010-06-15 22:07:04.000000000 -0700
+--- ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2011-05-26 18:50:48.000000000 -0700
++++ ./jdk/src/share/classes/sun/print/PSPrinterJob.java 2011-04-22 23:08:30.000000000 -0700
@@ -1534,7 +1534,9 @@
pFlags |= NOSHEET;
ncomps+=1;
@@ -14377,8 +19076,8 @@ $FreeBSD$
execCmd = new String[ncomps];
execCmd[n++] = "/usr/bin/lpr";
if ((pFlags & PRINTER) != 0) {
---- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-12-16 14:13:46.000000000 -0800
-+++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2010-06-15 22:07:06.000000000 -0700
+--- ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2011-05-26 18:51:24.000000000 -0700
++++ ./jdk/src/share/classes/sun/security/jgss/wrapper/SunNativeProvider.java 2011-04-22 23:08:31.000000000 -0700
@@ -83,7 +83,9 @@
String osname = System.getProperty("os.name");
if (osname.startsWith("SunOS")) {
@@ -14390,16 +19089,16 @@ $FreeBSD$
gssLibs = new String[]{
"libgssapi.so",
"libgssapi_krb5.so",
---- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-12-16 14:14:09.000000000 -0800
-+++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2010-06-15 22:07:11.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2011-05-26 18:52:37.000000000 -0700
++++ ./jdk/src/share/classes/sun/tools/attach/META-INF/services/com.sun.tools.attach.spi.AttachProvider 2011-04-22 23:08:32.000000000 -0700
@@ -30,3 +30,4 @@
#[solaris]sun.tools.attach.SolarisAttachProvider
#[windows]sun.tools.attach.WindowsAttachProvider
#[linux]sun.tools.attach.LinuxAttachProvider
+#[bsd]sun.tools.attach.BsdAttachProvider
---- ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-12-16 14:14:09.000000000 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2010-06-15 22:07:11.000000000 -0700
-@@ -50,6 +50,7 @@
+--- ./jdk/src/share/classes/sun/tools/jar/Main.java 2011-05-26 18:52:37.000000000 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/Main.java 2011-04-22 23:08:32.000000000 -0700
+@@ -51,6 +51,7 @@
String zname = "";
String[] files;
String rootjar = null;
@@ -14407,7 +19106,7 @@ $FreeBSD$
// An entryName(path)->File map generated during "expand", it helps to
// decide whether or not an existing entry in a jar file needs to be
-@@ -866,6 +867,19 @@
+@@ -867,6 +868,19 @@
* Extracts specified entries from JAR file.
*/
void extract(InputStream in, String files[]) throws IOException {
@@ -14427,7 +19126,7 @@ $FreeBSD$
ZipInputStream zis = new ZipInputStream(in);
ZipEntry e;
// Set of all directory entries specified in archive. Disallows
-@@ -896,6 +910,19 @@
+@@ -897,6 +911,19 @@
* Extracts specified entries from JAR file, via ZipFile.
*/
void extract(String fname, String files[]) throws IOException {
@@ -14447,7 +19146,7 @@ $FreeBSD$
ZipFile zf = new ZipFile(fname);
Set<ZipEntry> dirs = newDirSet();
Enumeration<? extends ZipEntry> zes = zf.entries();
-@@ -927,6 +954,10 @@
+@@ -928,6 +955,10 @@
ZipEntry rc = null;
String name = e.getName();
File f = new File(e.getName().replace('/', File.separatorChar));
@@ -14458,7 +19157,7 @@ $FreeBSD$
if (e.isDirectory()) {
if (f.exists()) {
if (!f.isDirectory()) {
-@@ -948,6 +979,10 @@
+@@ -949,6 +980,10 @@
} else {
if (f.getParent() != null) {
File d = new File(f.getParent());
@@ -14469,8 +19168,8 @@ $FreeBSD$
if (!d.exists() && !d.mkdirs() || !d.isDirectory()) {
throw new IOException(formatMsg(
"error.create.dir", d.getPath()));
---- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-12-16 14:14:09.000000000 -0800
-+++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2010-06-15 22:07:11.000000000 -0700
+--- ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2011-05-26 18:52:38.000000000 -0700
++++ ./jdk/src/share/classes/sun/tools/jar/resources/jar.properties 2011-04-22 23:08:32.000000000 -0700
@@ -44,6 +44,8 @@
{0} : could not create directory
error.incorrect.length=\
@@ -14480,8 +19179,8 @@ $FreeBSD$
out.added.manifest=\
added manifest
out.update.manifest=\
---- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-12-16 14:14:28.000000000 -0800
-+++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2010-06-15 22:07:15.000000000 -0700
+--- ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-05-26 18:53:56.000000000 -0700
++++ ./jdk/src/share/demo/jvmti/compiledMethodLoad/sample.makefile.txt 2011-04-22 23:08:34.000000000 -0700
@@ -38,6 +38,7 @@
# gnumake JDK=<java_home> OSNAME=solaris [OPT=true] [LIBARCH=sparcv9]
# gnumake JDK=<java_home> OSNAME=linux [OPT=true]
@@ -14520,23 +19219,8 @@ $FreeBSD$
# Common -I options
CFLAGS += -I.
CFLAGS += -I../agent_util
---- ./jdk/src/share/hpi/include/hpi_impl.h 2010-12-16 14:14:33.000000000 -0800
-+++ ./jdk/src/share/hpi/include/hpi_impl.h 2010-06-15 22:07:16.000000000 -0700
-@@ -138,7 +138,11 @@
- int sysBind(int fd, struct sockaddr *him, int len);
- int sysAccept(int fd, struct sockaddr *him, int *len);
- int sysGetSockName(int fd, struct sockaddr *him, int *len);
--#ifdef _LP64
-+#if defined(_LP64) || defined(_ALLBSD_SOURCE)
-+// XXXBSD: The implementations all use ssize_t, except on Windows,
-+// regardless of _LP64. The resulting mismatch between "int" and "ssize_t"
-+// causes gcc on Darwin to report a conflicting types error.
-+// Appears to be an upstream issue introduced in 1.7
- ssize_t sysSendTo(int fd, char *buf, int len, int flags, struct sockaddr *to,
- int tolen);
- ssize_t sysRecvFrom(int fd, char *buf, int nbytes, int flags,
--- ./jdk/src/share/lib/security/java.security-openbsd 1969-12-31 16:00:00.000000000 -0800
-+++ ./jdk/src/share/lib/security/java.security-openbsd 2010-01-30 09:28:24.000000000 -0800
++++ ./jdk/src/share/lib/security/java.security-openbsd 2011-04-22 23:08:35.000000000 -0700
@@ -0,0 +1,269 @@
+#
+# This is the "master security properties file".
@@ -14807,8 +19491,8 @@ $FreeBSD$
+# Example,
+# ocsp.responderCertSerialNumber=2A:FF:00
+
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-12-16 14:14:35.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2010-06-15 22:07:17.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-05-26 18:54:24.000000000 -0700
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/defines.h 2011-04-22 23:08:35.000000000 -0700
@@ -32,6 +32,10 @@
#include <unistd.h>
#endif
@@ -14834,8 +19518,8 @@ $FreeBSD$
#ifdef _MSC_VER
typedef LONGLONG jlong;
typedef DWORDLONG julong;
---- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-12-16 14:14:35.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2010-06-15 22:07:17.000000000 -0700
+--- ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2011-05-26 18:54:24.000000000 -0700
++++ ./jdk/src/share/native/com/sun/java/util/jar/pack/main.cpp 2011-04-22 23:08:35.000000000 -0700
@@ -22,6 +22,9 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
@@ -14876,8 +19560,8 @@ $FreeBSD$
true));
}
---- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-12-16 14:14:35.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2010-06-15 22:07:17.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2011-05-26 18:54:25.000000000 -0700
++++ ./jdk/src/share/native/com/sun/media/sound/DirectAudioDevice.c 2011-04-22 23:08:35.000000000 -0700
@@ -33,7 +33,11 @@
#include <jni.h>
@@ -14890,9 +19574,9 @@ $FreeBSD$
#include "SoundDefs.h"
#include "DirectAudio.h"
#include "Utilities.h"
---- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-12-16 14:14:35.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2010-06-15 22:07:17.000000000 -0700
-@@ -99,5 +99,17 @@
+--- ./jdk/src/share/native/com/sun/media/sound/Platform.c 2011-05-26 18:54:26.000000000 -0700
++++ ./jdk/src/share/native/com/sun/media/sound/Platform.c 2011-04-22 23:08:35.000000000 -0700
+@@ -99,5 +99,24 @@
return com_sun_media_sound_Platform_LIB_ALSA;
}
#endif
@@ -14900,18 +19584,25 @@ $FreeBSD$
+ switch (feature) {
+ case com_sun_media_sound_Platform_FEATURE_MIDIIO:
+ return com_sun_media_sound_Platform_LIB_MAIN;
++#ifdef __FreeBSD__
++ case com_sun_media_sound_Platform_FEATURE_PORTS:
++ return com_sun_media_sound_Platform_LIB_ALSA;
++ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
++ return com_sun_media_sound_Platform_LIB_ALSA;
++#else
+ case com_sun_media_sound_Platform_FEATURE_PORTS:
+ return com_sun_media_sound_Platform_LIB_MAIN;
+ case com_sun_media_sound_Platform_FEATURE_DIRECT_AUDIO:
+ // XXXBSD: When native Direct Audio support is ported change
+ // this back to returning com_sun_media_sound_Platform_LIB_MAIN
+ return 0;
++#endif
+ }
+#endif
return 0;
}
---- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-12-16 14:14:35.000000000 -0800
-+++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2010-06-15 22:07:17.000000000 -0700
+--- ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-05-26 18:54:26.000000000 -0700
++++ ./jdk/src/share/native/com/sun/media/sound/SoundDefs.h 2011-04-22 23:08:35.000000000 -0700
@@ -31,6 +31,7 @@
#define X_WINDOWS 1
#define X_SOLARIS 2
@@ -14920,7 +19611,7 @@ $FreeBSD$
// types for X_ARCH
#define X_I586 1
-@@ -50,7 +51,7 @@
+@@ -52,7 +53,7 @@
// following is needed for _LP64
@@ -14929,7 +19620,7 @@ $FreeBSD$
#include <sys/types.h>
#endif
-@@ -130,4 +131,9 @@
+@@ -132,4 +133,9 @@
#endif
@@ -14939,8 +19630,8 @@ $FreeBSD$
+
+
#endif // __SOUNDDEFS_INCLUDED__
---- ./jdk/src/share/native/common/check_code.c 2010-12-16 14:14:36.000000000 -0800
-+++ ./jdk/src/share/native/common/check_code.c 2010-10-31 14:12:35.000000000 -0700
+--- ./jdk/src/share/native/common/check_code.c 2011-05-26 18:54:27.000000000 -0700
++++ ./jdk/src/share/native/common/check_code.c 2011-04-22 23:08:35.000000000 -0700
@@ -1067,7 +1067,7 @@
* Make sure that branches don't go into the middle of nowhere.
*/
@@ -15002,8 +19693,8 @@ $FreeBSD$
/* There can't be more than 64K labels because of the limit
* on per-method byte code length.
*/
---- ./jdk/src/share/native/java/io/io_util.h 2010-12-16 14:14:36.000000000 -0800
-+++ ./jdk/src/share/native/java/io/io_util.h 2010-06-15 22:07:17.000000000 -0700
+--- ./jdk/src/share/native/java/io/io_util.h 2011-05-26 18:54:29.000000000 -0700
++++ ./jdk/src/share/native/java/io/io_util.h 2011-04-22 23:08:35.000000000 -0700
@@ -29,7 +29,15 @@
extern jfieldID IO_fd_fdID;
extern jfieldID IO_handle_fdID;
@@ -15021,8 +19712,8 @@ $FreeBSD$
#define O_SYNC (0x0800)
#define O_DSYNC (0x2000)
#endif
---- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-12-16 14:14:36.000000000 -0800
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2010-10-31 14:12:35.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2011-05-26 18:54:31.000000000 -0700
++++ ./jdk/src/share/native/java/lang/fdlibm/include/fdlibm.h 2011-04-22 23:08:35.000000000 -0700
@@ -24,6 +24,15 @@
* questions.
*/
@@ -15049,8 +19740,8 @@ $FreeBSD$
#define __HI(x) *(1+(int*)&x)
#define __LO(x) *(int*)&x
#define __HIp(x) *(1+(int*)x)
---- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-12-16 14:14:36.000000000 -0800
-+++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2010-06-15 22:07:17.000000000 -0700
+--- ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2011-05-26 18:54:31.000000000 -0700
++++ ./jdk/src/share/native/java/lang/fdlibm/include/jfdlibm.h 2011-04-22 23:08:35.000000000 -0700
@@ -61,7 +61,7 @@
#define log1p jlog1p
#define expm1 jexpm1
@@ -15060,9 +19751,9 @@ $FreeBSD$
#define __ieee754_sqrt __j__ieee754_sqrt
#define __ieee754_acos __j__ieee754_acos
#define __ieee754_acosh __j__ieee754_acosh
---- ./jdk/src/share/native/java/util/zip/Inflater.c 2010-12-16 14:14:38.000000000 -0800
-+++ ./jdk/src/share/native/java/util/zip/Inflater.c 2010-12-11 09:07:22.000000000 -0800
-@@ -67,6 +67,10 @@
+--- ./jdk/src/share/native/java/util/zip/Inflater.c 2011-05-26 18:54:39.000000000 -0700
++++ ./jdk/src/share/native/java/util/zip/Inflater.c 2011-04-22 23:08:35.000000000 -0700
+@@ -65,6 +65,10 @@
return jlong_zero;
} else {
char *msg;
@@ -15073,7 +19764,7 @@ $FreeBSD$
switch (inflateInit2(strm, nowrap ? -MAX_WBITS : MAX_WBITS)) {
case Z_OK:
return ptr_to_jlong(strm);
-@@ -215,6 +219,10 @@
+@@ -192,6 +196,10 @@
if (inflateReset(jlong_to_ptr(addr)) != Z_OK) {
JNU_ThrowInternalError(env, 0);
}
@@ -15084,21 +19775,22 @@ $FreeBSD$
}
JNIEXPORT void JNICALL
---- ./jdk/src/share/native/java/util/zip/zip_util.c 2010-12-16 14:14:38.000000000 -0800
-+++ ./jdk/src/share/native/java/util/zip/zip_util.c 2010-12-11 09:07:22.000000000 -0800
-@@ -46,6 +46,10 @@
+--- ./jdk/src/share/native/java/util/zip/zip_util.c 2011-05-26 18:54:39.000000000 -0700
++++ ./jdk/src/share/native/java/util/zip/zip_util.c 2011-04-22 23:08:35.000000000 -0700
+@@ -46,6 +46,11 @@
#include "zip_util.h"
#include "zlib.h"
+#ifdef _ALLBSD_SOURCE
-+#include "largefile_bsd.h"
++#define off64_t off_t
++#define mmap64 mmap
+#endif
+
/* USE_MMAP means mmap the CEN & ENDHDR part of the zip file. */
#ifdef USE_MMAP
#include <sys/mman.h>
---- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-12-16 14:14:39.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2010-06-15 22:07:18.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/debug/debug_util.h 2011-05-26 18:54:42.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/debug/debug_util.h 2011-04-22 23:08:35.000000000 -0700
@@ -50,7 +50,9 @@
#include <stdio.h>
#include <string.h>
@@ -15109,8 +19801,8 @@ $FreeBSD$
#include <limits.h>
/* keep these after the other headers */
---- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-12-16 14:14:39.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2010-10-31 14:12:36.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2011-05-26 18:54:42.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/image/BufImgSurfaceData.c 2011-04-22 23:08:35.000000000 -0700
@@ -24,7 +24,11 @@
*/
@@ -15123,8 +19815,8 @@ $FreeBSD$
#include "sun_awt_image_BufImgSurfaceData.h"
---- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-12-16 14:14:39.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2010-06-15 22:07:18.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2011-05-26 18:54:43.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/image/DataBufferNative.c 2011-04-22 23:08:35.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
*/
@@ -15137,8 +19829,8 @@ $FreeBSD$
#include "SurfaceData.h"
#include "sun_awt_image_DataBufferNative.h"
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2010-06-15 22:07:19.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2011-05-26 18:54:54.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv2x2_f.c 2011-04-22 23:08:36.000000000 -0700
@@ -86,7 +86,7 @@
#endif /* MLIB_USE_FTOI_CLAMPING */
@@ -15178,8 +19870,8 @@ $FreeBSD$
#endif /* _NO_LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2011-05-26 18:54:55.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15219,8 +19911,8 @@ $FreeBSD$
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2011-05-26 18:54:55.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_16nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15260,8 +19952,8 @@ $FreeBSD$
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2011-05-26 18:54:55.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15301,8 +19993,8 @@ $FreeBSD$
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2011-05-26 18:54:55.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_8nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -95,7 +95,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15342,8 +20034,8 @@ $FreeBSD$
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2011-05-26 18:54:56.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16ext.c 2011-04-22 23:08:36.000000000 -0700
@@ -126,7 +126,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15383,8 +20075,8 @@ $FreeBSD$
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2011-05-26 18:54:56.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageConv_u16nw.c 2011-04-22 23:08:36.000000000 -0700
@@ -94,7 +94,7 @@
#define D2I(x) CLAMP_S32((x) SAT_OFF)
@@ -15424,8 +20116,8 @@ $FreeBSD$
#endif /* _NO_LONGLONG */
/***************************************************************/
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2011-05-26 18:54:56.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageCopy_Bit.c 2011-04-22 23:08:36.000000000 -0700
@@ -95,7 +95,7 @@
dst = dp[0];
if (ld_offset + size < 32) {
@@ -15645,8 +20337,8 @@ $FreeBSD$
}
#else /* _LONGLONG */
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2010-10-31 14:12:36.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2011-05-26 18:54:56.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_64.c 2011-04-22 23:08:36.000000000 -0700
@@ -168,7 +168,7 @@
}
@@ -15927,8 +20619,8 @@ $FreeBSD$
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2011-05-26 18:54:56.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageLookUp_Bit.c 2011-04-22 23:08:36.000000000 -0700
@@ -88,7 +88,7 @@
} d64_2_f32;
@@ -16080,8 +20772,8 @@ $FreeBSD$
((mlib_u32*)lh)[0] = l; ((mlib_u32*)lh)[1] = l;
((mlib_u32*)lh)[2] = l; ((mlib_u32*)lh)[3] = h;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-12-16 14:14:43.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2010-06-15 22:07:20.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2011-05-26 18:54:57.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_ImageUtils.c 2011-04-22 23:08:36.000000000 -0700
@@ -30,7 +30,7 @@
typedef union {
mlib_d64 db;
@@ -16091,8 +20783,8 @@ $FreeBSD$
mlib_s32 int1, int0;
#else
mlib_s32 int0, int1;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-12-16 14:14:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2010-06-15 22:07:21.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2011-05-26 18:54:58.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageCopy.c 2011-04-22 23:08:36.000000000 -0700
@@ -275,11 +275,11 @@
for (i = 0; j <= (b_size - 4); j += 4, i++) {
src0 = src1;
@@ -16191,8 +20883,8 @@ $FreeBSD$
s0 = s1;
dp += SIZE;
sp += SIZE;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-12-16 14:14:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2010-06-15 22:07:21.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2011-05-26 18:54:58.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_c_ImageLookUp_f.c 2011-04-22 23:08:36.000000000 -0700
@@ -120,7 +120,7 @@
} \
}
@@ -17425,8 +22117,8 @@ $FreeBSD$
dp[12] = t0;
dp[13] = t1;
dp[14] = t2;
---- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-12-16 14:14:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2010-06-15 22:07:21.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2011-05-26 18:54:59.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_image.h 2011-04-22 23:08:36.000000000 -0700
@@ -27,6 +27,16 @@
#ifndef MLIB_IMAGE_H
#define MLIB_IMAGE_H
@@ -17444,8 +22136,8 @@ $FreeBSD$
#include <mlib_types.h>
#include <mlib_status.h>
#include <mlib_sys.h>
---- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-12-16 14:14:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2010-06-15 22:07:21.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2011-05-26 18:54:59.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_sys.c 2011-04-22 23:08:36.000000000 -0700
@@ -26,9 +26,15 @@
#include <stdlib.h>
@@ -17476,8 +22168,8 @@ $FreeBSD$
return (void *) memalign(8, size);
#endif /* _MSC_VER */
}
---- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-12-16 14:14:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2010-06-15 22:07:21.000000000 -0700
+--- ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2011-05-26 18:55:00.000000000 -0700
++++ ./jdk/src/share/native/sun/awt/medialib/mlib_types.h 2011-04-22 23:08:36.000000000 -0700
@@ -59,7 +59,10 @@
#if defined(__SUNPRO_C) || defined(__SUNPRO_CC) || defined(__GNUC__)
@@ -17490,8 +22182,8 @@ $FreeBSD$
#include <stdint.h> /* for uintptr_t */
#include <malloc.h> /* for ptrdiff_t */
#else
---- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-12-16 14:14:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2010-06-15 22:07:21.000000000 -0700
+--- ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-05-26 18:55:01.000000000 -0700
++++ ./jdk/src/share/native/sun/font/AccelGlyphCache.c 2011-04-22 23:08:36.000000000 -0700
@@ -23,7 +23,11 @@
* questions.
*/
@@ -17504,8 +22196,8 @@ $FreeBSD$
#include "jni.h"
#include "AccelGlyphCache.h"
#include "Trace.h"
---- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-12-16 14:14:44.000000000 -0800
-+++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2010-06-15 22:07:21.000000000 -0700
+--- ./jdk/src/share/native/sun/font/DrawGlyphList.c 2011-05-26 18:55:01.000000000 -0700
++++ ./jdk/src/share/native/sun/font/DrawGlyphList.c 2011-04-22 23:08:36.000000000 -0700
@@ -26,7 +26,11 @@
#include "jlong.h"
#include "math.h"
@@ -17518,8 +22210,8 @@ $FreeBSD$
#include "sunfontids.h"
#include "fontscalerdefs.h"
#include "glyphblitting.h"
---- ./jdk/src/share/native/sun/font/sunFont.c 2010-12-16 14:14:47.000000000 -0800
-+++ ./jdk/src/share/native/sun/font/sunFont.c 2010-06-15 22:07:22.000000000 -0700
+--- ./jdk/src/share/native/sun/font/sunFont.c 2011-05-26 18:55:15.000000000 -0700
++++ ./jdk/src/share/native/sun/font/sunFont.c 2011-04-22 23:08:36.000000000 -0700
@@ -24,7 +24,9 @@
*/
@@ -17530,8 +22222,8 @@ $FreeBSD$
#include "string.h"
#include "gdefs.h"
#include "jlong.h"
---- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-12-16 14:14:48.000000000 -0800
-+++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2010-06-15 22:07:22.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/SurfaceData.c 2011-05-26 18:55:16.000000000 -0700
++++ ./jdk/src/share/native/sun/java2d/SurfaceData.c 2011-04-22 23:08:36.000000000 -0700
@@ -28,7 +28,11 @@
#include "jni_util.h"
#include "Disposer.h"
@@ -17544,8 +22236,8 @@ $FreeBSD$
#include "string.h"
/**
---- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-12-16 14:14:50.000000000 -0800
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2010-06-15 22:07:23.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2011-05-26 18:55:27.000000000 -0700
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLFuncs.h 2011-04-22 23:08:36.000000000 -0700
@@ -26,6 +26,9 @@
#ifndef OGLFuncs_h_Included
#define OGLFuncs_h_Included
@@ -17556,8 +22248,8 @@ $FreeBSD$
#include "jni.h"
#include "J2D_GL/gl.h"
#include "J2D_GL/glext.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-12-16 14:14:51.000000000 -0800
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2010-06-15 22:07:23.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2011-05-26 18:55:28.000000000 -0700
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLRenderQueue.c 2011-04-22 23:08:36.000000000 -0700
@@ -25,7 +25,11 @@
#ifndef HEADLESS
@@ -17570,8 +22262,8 @@ $FreeBSD$
#include "sun_java2d_pipe_BufferedOpCodes.h"
---- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-12-16 14:14:51.000000000 -0800
-+++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2010-06-15 22:07:23.000000000 -0700
+--- ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-05-26 18:55:28.000000000 -0700
++++ ./jdk/src/share/native/sun/java2d/opengl/OGLTextRenderer.c 2011-04-22 23:08:36.000000000 -0700
@@ -25,7 +25,11 @@
#ifndef HEADLESS
@@ -17584,8 +22276,8 @@ $FreeBSD$
#include <math.h>
#include <jlong.h>
---- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-12-16 14:14:54.000000000 -0800
-+++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2010-06-15 22:07:24.000000000 -0700
+--- ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2011-05-26 18:55:31.000000000 -0700
++++ ./jdk/src/share/native/sun/nio/ch/genSocketOptionRegistry.c 2011-05-20 20:04:18.000000000 -0700
@@ -28,6 +28,7 @@
#include <winsock2.h>
#include <ws2tcpip.h>
@@ -17594,9 +22286,9 @@ $FreeBSD$
#include <sys/socket.h>
#include <netinet/in.h>
#include <netinet/tcp.h>
---- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-12-16 14:14:55.000000000 -0800
-+++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2010-06-15 22:07:24.000000000 -0700
-@@ -78,6 +78,14 @@
+--- ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-05-26 18:55:33.000000000 -0700
++++ ./jdk/src/share/native/sun/security/ec/impl/ecc_impl.h 2011-04-22 23:08:36.000000000 -0700
+@@ -76,6 +76,14 @@
typedef enum { B_FALSE, B_TRUE } boolean_t;
#endif /* __linux__ */
@@ -17611,9 +22303,9 @@ $FreeBSD$
#ifdef _WIN32
typedef unsigned char uint8_t;
typedef unsigned long ulong_t;
---- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-12-16 14:14:55.000000000 -0800
-+++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2010-06-15 22:07:24.000000000 -0700
-@@ -60,9 +60,9 @@
+--- ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-05-26 18:55:33.000000000 -0700
++++ ./jdk/src/share/native/sun/security/ec/impl/ecdecode.c 2011-04-22 23:08:36.000000000 -0700
+@@ -58,9 +58,9 @@
#include <sys/types.h>
#ifndef _WIN32
@@ -17625,9 +22317,9 @@ $FreeBSD$
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-12-16 14:14:57.000000000 -0800
-+++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2010-06-15 22:07:24.000000000 -0700
-@@ -59,9 +59,9 @@
+--- ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-05-26 18:55:35.000000000 -0700
++++ ./jdk/src/share/native/sun/security/ec/impl/oid.c 2011-04-22 23:08:36.000000000 -0700
+@@ -57,9 +57,9 @@
#include <sys/types.h>
#ifndef _WIN32
@@ -17639,9 +22331,9 @@ $FreeBSD$
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-12-16 14:14:57.000000000 -0800
-+++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2010-06-15 22:07:24.000000000 -0700
-@@ -64,9 +64,9 @@
+--- ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-05-26 18:55:35.000000000 -0700
++++ ./jdk/src/share/native/sun/security/ec/impl/secitem.c 2011-04-22 23:08:36.000000000 -0700
+@@ -62,9 +62,9 @@
#include <sys/types.h>
#ifndef _WIN32
@@ -17653,8 +22345,8 @@ $FreeBSD$
#include <sys/param.h>
#endif /* _WIN32 */
---- ./jdk/src/share/transport/socket/socketTransport.c 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/share/transport/socket/socketTransport.c 2010-06-15 22:07:27.000000000 -0700
+--- ./jdk/src/share/transport/socket/socketTransport.c 2011-05-26 18:55:52.000000000 -0700
++++ ./jdk/src/share/transport/socket/socketTransport.c 2011-04-22 23:08:37.000000000 -0700
@@ -65,6 +65,9 @@
#define HEADER_SIZE 11
#define MAX_DATA_SIZE 1000
@@ -17742,8 +22434,8 @@ $FreeBSD$
return res;
} else if (res == 0) {
break; /* eof, return nbytes which is less than len */
---- ./jdk/src/solaris/back/exec_md.c 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/solaris/back/exec_md.c 2010-06-15 22:07:27.000000000 -0700
+--- ./jdk/src/solaris/back/exec_md.c 2011-05-26 18:55:52.000000000 -0700
++++ ./jdk/src/solaris/back/exec_md.c 2011-04-22 23:08:37.000000000 -0700
@@ -30,7 +30,7 @@
#include "sys.h"
#include "util.h"
@@ -17753,8 +22445,8 @@ $FreeBSD$
/* Linux */
#define FORK() fork()
#else
---- ./jdk/src/solaris/back/linker_md.c 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/solaris/back/linker_md.c 2010-06-15 22:07:27.000000000 -0700
+--- ./jdk/src/solaris/back/linker_md.c 2011-05-26 18:55:52.000000000 -0700
++++ ./jdk/src/solaris/back/linker_md.c 2011-04-22 23:08:37.000000000 -0700
@@ -48,6 +48,12 @@
#include "threads_md.h"
#endif
@@ -17780,8 +22472,8 @@ $FreeBSD$
}
}
---- ./jdk/src/solaris/back/util_md.h 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/solaris/back/util_md.h 2010-06-15 22:07:27.000000000 -0700
+--- ./jdk/src/solaris/back/util_md.h 2011-05-26 18:55:53.000000000 -0700
++++ ./jdk/src/solaris/back/util_md.h 2011-04-22 23:08:37.000000000 -0700
@@ -31,6 +31,11 @@
#include <limits.h>
@@ -17803,9 +22495,9 @@ $FreeBSD$
#define HOST_TO_JAVA_CHAR(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
#define HOST_TO_JAVA_SHORT(x) (((x & 0xff) << 8) | ((x >> 8) & (0xff)))
---- ./jdk/src/solaris/bin/ergo.c 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/solaris/bin/ergo.c 2010-06-15 22:07:27.000000000 -0700
-@@ -71,14 +71,39 @@
+--- ./jdk/src/solaris/bin/ergo.c 2011-05-26 18:55:53.000000000 -0700
++++ ./jdk/src/solaris/bin/ergo.c 2011-04-22 23:08:37.000000000 -0700
+@@ -100,14 +100,39 @@
/* Compute physical memory by asking the OS */
uint64_t
physical_memory(void) {
@@ -17847,8 +22539,8 @@ $FreeBSD$
return result;
+#endif /* _ALLBSD_SOURCE */
}
---- ./jdk/src/solaris/bin/ergo.h 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/solaris/bin/ergo.h 2010-06-15 22:07:27.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo.h 2011-05-26 18:55:53.000000000 -0700
++++ ./jdk/src/solaris/bin/ergo.h 2011-04-22 23:08:37.000000000 -0700
@@ -33,6 +33,10 @@
#include <sys/stat.h>
#include <unistd.h>
@@ -17860,8 +22552,8 @@ $FreeBSD$
#include "java.h"
---- ./jdk/src/solaris/bin/ergo_i586.c 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/solaris/bin/ergo_i586.c 2010-06-15 22:07:27.000000000 -0700
+--- ./jdk/src/solaris/bin/ergo_i586.c 2011-05-26 18:55:53.000000000 -0700
++++ ./jdk/src/solaris/bin/ergo_i586.c 2011-04-22 23:08:37.000000000 -0700
@@ -106,7 +106,7 @@
#endif /* __solaris__ */
@@ -17942,8 +22634,8 @@ $FreeBSD$
JLI_TraceLauncher("physical processors: %lu\n", result);
return result;
}
---- ./jdk/src/solaris/bin/java_md.c 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/solaris/bin/java_md.c 2010-11-13 12:00:17.000000000 -0800
+--- ./jdk/src/solaris/bin/java_md.c 2011-05-26 18:55:54.000000000 -0700
++++ ./jdk/src/solaris/bin/java_md.c 2011-05-07 21:54:10.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -17982,9 +22674,9 @@ $FreeBSD$
+#define LD_LIBRARY_PATH "LD_LIBRARY_PATH"
+#endif
- /*
- * If a processor / os combination has the ability to run binaries of
-@@ -71,14 +85,31 @@
+ /* help jettison the LD_LIBRARY_PATH settings in the future */
+ #ifndef SETENV_REQUIRED
+@@ -75,14 +89,31 @@
#endif
/* pointer to environment */
@@ -18018,7 +22710,7 @@ $FreeBSD$
static const char *user_dir = "/java";
#else /* Solaris */
static const char *system_dir = "/usr/jdk";
-@@ -1030,9 +1061,23 @@
+@@ -1397,9 +1428,23 @@
return(borrowed_unsetenv(name));
}
@@ -18043,7 +22735,7 @@ $FreeBSD$
static void* hSplashLib = NULL;
-@@ -1068,7 +1113,7 @@
+@@ -1435,7 +1480,7 @@
int
ContinueInNewThread0(int (JNICALL *continuation)(void *), jlong stack_size, void * args) {
int rslt;
@@ -18052,8 +22744,8 @@ $FreeBSD$
pthread_t tid;
pthread_attr_t attr;
pthread_attr_init(&attr);
---- ./jdk/src/solaris/bin/java_md.h 2010-12-16 14:15:04.000000000 -0800
-+++ ./jdk/src/solaris/bin/java_md.h 2010-06-15 22:07:27.000000000 -0700
+--- ./jdk/src/solaris/bin/java_md.h 2011-05-26 18:55:54.000000000 -0700
++++ ./jdk/src/solaris/bin/java_md.h 2011-04-22 23:08:37.000000000 -0700
@@ -47,10 +47,14 @@
#include <sys/time.h>
#define CounterGet() (gethrtime()/1000)
@@ -18070,8 +22762,8 @@ $FreeBSD$
/*
* Function prototypes.
---- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2010-12-16 14:15:07.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2010-10-31 13:48:56.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-05-26 18:56:06.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11/XWM.java 2011-04-22 23:08:38.000000000 -0700
@@ -101,7 +101,8 @@
ICE_WM = 10,
METACITY_WM = 11,
@@ -18120,8 +22812,8 @@ $FreeBSD$
} else if (doIsIceWM && isIceWM()) {
awt_wmgr = XWM.ICE_WM;
}
---- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-12-16 14:15:08.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2010-01-30 09:28:31.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2011-05-26 18:56:09.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/awt/X11FontManager.java 2011-04-22 23:08:38.000000000 -0700
@@ -213,7 +213,7 @@
if (fontID != null) {
fileName = (String)fontNameMap.get(fontID);
@@ -18140,7 +22832,7 @@ $FreeBSD$
fontConfigDirs.add(jreLibDirName+File.separator+"oblique-fonts");
}
fontdirs = (String[])fontConfigDirs.toArray(new String[0]);
-@@ -759,7 +759,7 @@
+@@ -740,7 +740,7 @@
*/
FontConfiguration mFontConfig = new MFontConfiguration(this);
if (FontUtilities.isOpenSolaris ||
@@ -18149,12 +22841,12 @@ $FreeBSD$
(!mFontConfig.foundOsSpecificFile() ||
!mFontConfig.fontFilesArePresent()) ||
(FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) {
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Fedora.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,377 +0,0 @@
-#
-#
--# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+-# Copyright (c) 2007, 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
@@ -18529,7 +23221,7 @@ $FreeBSD$
-filename.Lohit_Telugu=/usr/share/fonts/lohit-telugu/lohit_te.ttf
-filename.LKLUG=/usr/share/fonts/lklug/lklug.ttf
-
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.SuSE.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,154 +0,0 @@
-#
@@ -18686,12 +23378,12 @@ $FreeBSD$
-filename.UnDotum_Bold=/usr/share/fonts/truetype/UnDotumBold.ttf
-filename.UnBatang=/usr/share/fonts/truetype/UnBatang.ttf
-filename.UnBatang_Bold=/usr/share/fonts/truetype/UnBatangBold.ttf
---- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/awt/fontconfigs/bsd.fontconfig.Ubuntu.properties 1969-12-31 16:00:00.000000000 -0800
@@ -1,348 +0,0 @@
-#
-#
--# Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
+-# Copyright (c) 2007, 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
@@ -19037,11 +23729,11 @@ $FreeBSD$
-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
---- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/ch/BsdAsynchronousChannelProvider.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,90 +0,0 @@
-/*
-- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2008, 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
@@ -19130,11 +23822,11 @@ $FreeBSD$
- return new UnixAsynchronousSocketChannelImpl(toPort(group));
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdDosFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,288 +0,0 @@
+@@ -1,281 +0,0 @@
-/*
-- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2008, 2011, 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
@@ -19162,6 +23854,7 @@ $FreeBSD$
-
-import java.nio.file.attribute.*;
-import java.util.Map;
+-import java.util.Set;
-import java.io.IOException;
-import sun.misc.Unsafe;
-
@@ -19192,6 +23885,10 @@ $FreeBSD$
- private static final int DOS_XATTR_SYSTEM = 0x04;
- private static final int DOS_XATTR_ARCHIVE = 0x20;
-
+- // the names of the DOS attributes (includes basic)
+- private static final Set<String> dosAttributeNames =
+- Util.newSet(basicAttributeNames, READONLY_NAME, ARCHIVE_NAME, SYSTEM_NAME, HIDDEN_NAME);
+-
- BsdDosFileAttributeView(UnixPath file, boolean followLinks) {
- super(file, followLinks);
- }
@@ -19202,19 +23899,6 @@ $FreeBSD$
- }
-
- @Override
-- public Object getAttribute(String attribute) throws IOException {
-- if (attribute.equals(READONLY_NAME))
-- return readAttributes().isReadOnly();
-- if (attribute.equals(ARCHIVE_NAME))
-- return readAttributes().isArchive();
-- if (attribute.equals(SYSTEM_NAME))
-- return readAttributes().isSystem();
-- if (attribute.equals(HIDDEN_NAME))
-- return readAttributes().isHidden();
-- return super.getAttribute(attribute);
-- }
--
-- @Override
- public void setAttribute(String attribute, Object value)
- throws IOException
- {
@@ -19238,12 +23922,13 @@ $FreeBSD$
- }
-
- @Override
-- public Map<String,?> readAttributes(String[] attributes)
+- public Map<String,Object> readAttributes(String[] attributes)
- throws IOException
- {
-- AttributesBuilder builder = AttributesBuilder.create(attributes);
+- AttributesBuilder builder =
+- AttributesBuilder.create(dosAttributeNames, attributes);
- DosFileAttributes attrs = readAttributes();
-- addBasicAttributesToBuilder(attrs, builder);
+- addRequestedBasicAttributes(attrs, builder);
- if (builder.match(READONLY_NAME))
- builder.add(READONLY_NAME, attrs.isReadOnly());
- if (builder.match(ARCHIVE_NAME))
@@ -19421,8 +24106,8 @@ $FreeBSD$
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2010-10-31 14:19:20.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileStore.java 2011-04-22 23:08:38.000000000 -0700
@@ -36,10 +36,6 @@
class BsdFileStore
extends UnixFileStore
@@ -19501,93 +24186,51 @@ $FreeBSD$
return super.supportsFileAttributeView(name);
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2010-07-04 12:40:24.000000000 -0700
-@@ -31,49 +31,23 @@
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystem.java 2011-04-22 23:08:38.000000000 -0700
+@@ -28,13 +28,15 @@
+ import java.nio.file.*;
+ import java.io.IOException;
import java.util.*;
- import java.security.AccessController;
- import sun.security.action.GetPropertyAction;
-import static sun.nio.fs.BsdNativeDispatcher.*;
++import java.security.AccessController;
++import sun.security.action.GetPropertyAction;
/**
* Bsd implementation of FileSystem
*/
class BsdFileSystem extends UnixFileSystem {
-- private final boolean hasInotify;
-
++
BsdFileSystem(UnixFileSystemProvider provider, String dir) {
super(provider, dir);
--
-- // assume X.Y[-Z] format
-- String osversion = AccessController
-- .doPrivileged(new GetPropertyAction("os.version"));
-- String[] vers = Util.split(osversion, '.');
-- assert vers.length >= 2;
--
-- int majorVersion = Integer.parseInt(vers[0]);
-- int minorVersion = Integer.parseInt(vers[1]);
-- int microVersion = 0;
-- if (vers.length > 2) {
-- String[] microVers = Util.split(vers[2], '-');
-- microVersion = (microVers.length > 0) ?
-- Integer.parseInt(microVers[0]) : 0;
-- }
--
-- // inotify available since 2.6.13
-- this.hasInotify = ((majorVersion > 2) ||
-- (majorVersion == 2 && minorVersion > 6) ||
-- ((majorVersion == 2) && (minorVersion == 6) && (microVersion >= 13)));
}
-
- @Override
+@@ -43,21 +45,17 @@
public WatchService newWatchService()
throws IOException
{
-- if (hasInotify) {
-- return new BsdWatchService(this);
-- } else {
-- // use polling implementation on older kernels
-- return new PollingWatchService();
-- }
+- // assume 2.6.13 or newer
+- return new BsdWatchService(this);
+ // use polling implementation until we implement a BSD/kqueue one
+ return new PollingWatchService();
}
- @Override
-@@ -82,10 +56,6 @@
- UnixPath file,
- LinkOption... options)
- {
-- if (view == DosFileAttributeView.class)
-- return (V) new BsdDosFileAttributeView(file, followLinks(options));
-- if (view == UserDefinedFileAttributeView.class)
-- return (V) new BsdUserDefinedFileAttributeView(file, followLinks(options));
- return super.newFileAttributeView(view, file, options);
- }
-
-@@ -95,10 +65,6 @@
- UnixPath file,
- LinkOption... options)
- {
-- if (name.equals("dos"))
-- return new BsdDosFileAttributeView(file, followLinks(options));
-- if (name.equals("user"))
-- return new BsdUserDefinedFileAttributeView(file, followLinks(options));
- return super.newFileAttributeView(name, file, options);
- }
-
-@@ -109,9 +75,6 @@
+-
+ // lazy initialization of the list of supported attribute views
+ private static class SupportedFileFileAttributeViewsHolder {
+ static final Set<String> supportedFileAttributeViews =
+ supportedFileAttributeViews();
private static Set<String> supportedFileAttributeViews() {
- Set<String> result = new HashSet<String>();
- result.addAll(UnixFileSystem.standardFileAttributeViews());
+- Set<String> result = new HashSet<>();
++ Set<String> result = new HashSet<String>();
+ result.addAll(standardFileAttributeViews());
- // additional Bsd-specific views
- result.add("dos");
- result.add("user");
return Collections.unmodifiableSet(result);
}
}
-@@ -123,26 +86,26 @@
+@@ -69,26 +67,26 @@
@Override
void copyNonPosixAttributes(int ofd, int nfd) {
@@ -19599,9 +24242,10 @@ $FreeBSD$
+ * Returns object to iterate over mount entries
*/
- Iterable<UnixMountEntry> getMountEntries(String fstab) {
+- ArrayList<UnixMountEntry> entries = new ArrayList<>();
+ @Override
+ Iterable<UnixMountEntry> getMountEntries() {
- ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>();
++ ArrayList<UnixMountEntry> entries = new ArrayList<UnixMountEntry>();
try {
- long fp = setmntent(fstab.getBytes(), "r".getBytes());
+ long iter = BsdNativeDispatcher.getfsstat();
@@ -19620,7 +24264,7 @@ $FreeBSD$
}
} catch (UnixException x) {
-@@ -151,14 +114,6 @@
+@@ -97,14 +95,6 @@
return entries;
}
@@ -19632,11 +24276,43 @@ $FreeBSD$
- return getMountEntries("/etc/mtab");
- }
-
+
+
@Override
- FileStore getFileStore(UnixPath path) throws IOException {
- return new BsdFileStore(path);
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2010-07-04 12:45:14.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdFileSystemProvider.java 2011-04-22 23:08:38.000000000 -0700
+@@ -54,14 +54,6 @@
+ Class<V> type,
+ LinkOption... options)
+ {
+- if (type == DosFileAttributeView.class) {
+- return (V) new BsdDosFileAttributeView(UnixPath.toUnixPath(obj),
+- Util.followLinks(options));
+- }
+- if (type == UserDefinedFileAttributeView.class) {
+- return (V) new BsdUserDefinedFileAttributeView(UnixPath.toUnixPath(obj),
+- Util.followLinks(options));
+- }
+ return super.getFileAttributeView(obj, type, options);
+ }
+
+@@ -70,14 +62,6 @@
+ String name,
+ LinkOption... options)
+ {
+- if (name.equals("dos")) {
+- return new BsdDosFileAttributeView(UnixPath.toUnixPath(obj),
+- Util.followLinks(options));
+- }
+- if (name.equals("user")) {
+- return new BsdUserDefinedFileAttributeView(UnixPath.toUnixPath(obj),
+- Util.followLinks(options));
+- }
+ return super.getFileAttributeView(obj, name, options);
+ }
+
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/BsdNativeDispatcher.java 2011-04-22 23:08:38.000000000 -0700
@@ -36,84 +36,23 @@
private BsdNativeDispatcher() { }
@@ -19740,11 +24416,11 @@ $FreeBSD$
+ initIDs();
}
}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdUserDefinedFileAttributeView.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,350 +0,0 @@
-/*
-- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2008, 2011, 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
@@ -19808,7 +24484,7 @@ $FreeBSD$
-
- // Parses buffer as array of NULL-terminated C strings.
- private List<String> asList(long address, int size) {
-- final List<String> list = new ArrayList<String>();
+- List<String> list = new ArrayList<>();
- int start = 0;
- int pos = 0;
- while (pos < size) {
@@ -20093,11 +24769,11 @@ $FreeBSD$
- }
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/solaris/classes/sun/nio/fs/BsdWatchService.java 1969-12-31 16:00:00.000000000 -0800
-@@ -1,466 +0,0 @@
+@@ -1,463 +0,0 @@
-/*
-- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
+- * Copyright (c) 2008, 2011, 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
@@ -20200,8 +24876,8 @@ $FreeBSD$
- // watch descriptor
- private volatile int wd;
-
-- BsdWatchKey(BsdWatchService watcher, int ifd, int wd) {
-- super(watcher);
+- BsdWatchKey(UnixPath dir, BsdWatchService watcher, int ifd, int wd) {
+- super(dir, watcher);
- this.ifd = ifd;
- this.wd = wd;
- }
@@ -20308,15 +24984,15 @@ $FreeBSD$
-
- int mask = 0;
- for (WatchEvent.Kind<?> event: events) {
-- if (event == StandardWatchEventKind.ENTRY_CREATE) {
+- if (event == StandardWatchEventKinds.ENTRY_CREATE) {
- mask |= IN_CREATE | IN_MOVED_TO;
- continue;
- }
-- if (event == StandardWatchEventKind.ENTRY_DELETE) {
+- if (event == StandardWatchEventKinds.ENTRY_DELETE) {
- mask |= IN_DELETE | IN_MOVED_FROM;
- continue;
- }
-- if (event == StandardWatchEventKind.ENTRY_MODIFY) {
+- if (event == StandardWatchEventKinds.ENTRY_MODIFY) {
- mask |= IN_MODIFY | IN_ATTRIB;
- continue;
- }
@@ -20364,7 +25040,7 @@ $FreeBSD$
- // ensure watch descriptor is in map
- BsdWatchKey key = wdToKey.get(wd);
- if (key == null) {
-- key = new BsdWatchKey(watcher, ifd, wd);
+- key = new BsdWatchKey(dir, watcher, ifd, wd);
- wdToKey.put(wd, key);
- }
- return key;
@@ -20476,17 +25152,17 @@ $FreeBSD$
- */
- private WatchEvent.Kind<?> maskToEventKind(int mask) {
- if ((mask & IN_MODIFY) > 0)
-- return StandardWatchEventKind.ENTRY_MODIFY;
+- return StandardWatchEventKinds.ENTRY_MODIFY;
- if ((mask & IN_ATTRIB) > 0)
-- return StandardWatchEventKind.ENTRY_MODIFY;
+- return StandardWatchEventKinds.ENTRY_MODIFY;
- if ((mask & IN_CREATE) > 0)
-- return StandardWatchEventKind.ENTRY_CREATE;
+- return StandardWatchEventKinds.ENTRY_CREATE;
- if ((mask & IN_MOVED_TO) > 0)
-- return StandardWatchEventKind.ENTRY_CREATE;
+- return StandardWatchEventKinds.ENTRY_CREATE;
- if ((mask & IN_DELETE) > 0)
-- return StandardWatchEventKind.ENTRY_DELETE;
+- return StandardWatchEventKinds.ENTRY_DELETE;
- if ((mask & IN_MOVED_FROM) > 0)
-- return StandardWatchEventKind.ENTRY_DELETE;
+- return StandardWatchEventKinds.ENTRY_DELETE;
- return null;
- }
-
@@ -20498,7 +25174,7 @@ $FreeBSD$
- if ((mask & IN_Q_OVERFLOW) > 0) {
- for (Map.Entry<Integer,BsdWatchKey> entry: wdToKey.entrySet()) {
- entry.getValue()
-- .signalEvent(StandardWatchEventKind.OVERFLOW, null);
+- .signalEvent(StandardWatchEventKinds.OVERFLOW, null);
- }
- return;
- }
@@ -20530,8 +25206,6 @@ $FreeBSD$
-
- // -- native methods --
-
-- private static native void init();
--
- // sizeof inotify_event
- private static native int eventSize();
-
@@ -20559,11 +25233,10 @@ $FreeBSD$
- System.loadLibrary("nio");
- return null;
- }});
-- init();
- }
-}
---- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-12-16 14:15:11.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2010-06-15 22:07:32.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2011-05-26 18:56:22.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/nio/fs/DefaultFileSystemProvider.java 2011-04-22 23:08:38.000000000 -0700
@@ -68,6 +68,8 @@
return createProvider("sun.nio.fs.SolarisFileSystemProvider");
if (osname.equals("Linux"))
@@ -20573,8 +25246,8 @@ $FreeBSD$
throw new AssertionError("Platform not recognized");
}
}
---- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-12-16 14:15:12.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2010-06-15 22:07:32.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2011-05-26 18:56:25.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/print/UnixPrintServiceLookup.java 2011-04-22 23:08:38.000000000 -0700
@@ -119,7 +119,11 @@
}
@@ -20608,8 +25281,8 @@ $FreeBSD$
String[] names = execCmd(command);
if ((names == null) || (names.length == 0)) {
---- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2010-07-10 13:22:31.000000000 -0700
+--- ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/classes/sun/tools/attach/BsdVirtualMachine.java 2011-04-22 23:08:38.000000000 -0700
@@ -40,9 +40,6 @@
// temp directory for socket file
private static final String tmpdir = System.getProperty("java.io.tmpdir");
@@ -20707,8 +25380,8 @@ $FreeBSD$
- isBsdThreads = isBsdThreads();
}
}
---- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-12-16 14:15:12.000000000 -0800
-+++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2010-06-15 22:07:33.000000000 -0700
+--- ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2011-05-26 18:56:26.000000000 -0700
++++ ./jdk/src/solaris/demo/jvmti/hprof/hprof_md.c 2011-04-22 23:08:38.000000000 -0700
@@ -33,7 +33,7 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -20774,1140 +25447,8 @@ $FreeBSD$
}
}
---- ./jdk/src/solaris/hpi/include/interrupt.h 2010-12-16 14:15:14.000000000 -0800
-+++ ./jdk/src/solaris/hpi/include/interrupt.h 2010-06-15 22:07:33.000000000 -0700
-@@ -75,7 +75,7 @@
- * N_INTERRUPTS - The number of interrupt channels. These
- * are numbered from 0 to (N_INTERRUPTS - 1).
- */
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD__)
- #define N_INTERRUPTS NSIG /* 0 to NSIG - 1*/
- #else
- #define N_INTERRUPTS 32 /* 0 to 31 */
-@@ -111,6 +111,10 @@
- #error signal.h has not been included?
- #endif
-
-+#if defined(__FreeBSD__) && !defined(SA_SIGINFO)
-+#error signal.h has not been included?
-+#endif
-+
- #ifdef SA_SIGINFO
- /* Thread implementation dependent interrupt dispatcher. */
- void intrDispatchMD(int sig, siginfo_t *info, void *uc);
---- ./jdk/src/solaris/hpi/include/largefile.h 2010-12-16 14:15:14.000000000 -0800
-+++ ./jdk/src/solaris/hpi/include/largefile.h 2010-06-15 22:07:33.000000000 -0700
-@@ -34,6 +34,10 @@
- #include "largefile_linux.h"
- #endif
-
-+#ifdef _ALLBSD_SOURCE
-+#include "largefile_bsd.h"
-+#endif
-+
- /*
- * Prototypes for wrappers that we define. These wrapper functions
- * are low-level I/O routines that will use 64 bit versions if
---- ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/hpi/include/largefile_bsd.h 2010-07-04 12:40:44.000000000 -0700
-@@ -26,11 +26,29 @@
- #ifndef _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_
- #define _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_
-
--/*
-- * For building on glibc-2.0 we need to define stat64 here.
-- */
--
- #include <sys/types.h>
- #include <sys/stat.h>
-
-+/* define compatibility macros */
-+#define off64_t off_t
-+#define stat64 stat
-+#define dirent64 dirent
-+#define statvfs64 statvfs
-+
-+#define F_SETLK64 F_SETLK
-+#define F_SETLKW64 F_SETLKW
-+
-+#define lseek64 lseek
-+#define ftruncate64 ftruncate
-+#define open64 open
-+#define fstat64 fstat
-+#define flock64 flock
-+#define mmap64 mmap
-+#define fdatasync fsync
-+#define lstat64 lstat
-+#define readdir64_r readdir_r
-+
-+#define pread64 pread
-+#define pwrite64 pwrite
-+
- #endif /* _JAVASOFT_BSD_LARGEFILE_SUPPORT_H_ */
---- ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-12-16 14:15:14.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/include/threads_md.h 2010-06-15 22:07:33.000000000 -0700
-@@ -36,6 +36,8 @@
- #define N_TRACED_REGS 12
- #elif i386
- #define N_TRACED_REGS 7
-+#elif i586 /* BSDNOTE: just in case */
-+#define N_TRACED_REGS 7
- #elif amd64
- #define N_TRACED_REGS 15
- #elif ppc
-@@ -51,10 +53,12 @@
- #define N_TRACED_REGS 32
- #endif
-
-+#if !defined(_ALLBSD_SOURCE)
- /* Turn on if we want all java threads to be bound tolwps */
- /* #define BOUND_THREADS */
- /* Use /proc soln to stop lwps in place of siglwp soln */
- #define PROCLWP
-+#endif
-
- /*
- * Thread C stack overflow check
-@@ -132,7 +136,7 @@
- lwpid_t lwpid;
- #endif
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- void *sp;
- #else
- unsigned long sp; /* sp at time of last (native) thread switch */
-@@ -186,12 +190,14 @@
-
- #define SYS_THREAD_NULL ((sys_thread_t *) 0)
-
-+#if !defined(_ALLBSD_SOURCE)
- /*
- * following macro copied from sys/signal.h since inside #ifdef _KERNEL there.
- */
- #ifndef sigmask
- #define sigmask(n) ((unsigned int)1 << (((n) - 1) & (32 - 1)))
- #endif
-+#endif
-
- #ifdef __linux__
- extern thread_key_t intrJmpbufkey;
---- ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-12-16 14:15:14.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/src/condvar_md.c 2010-06-15 22:07:33.000000000 -0700
-@@ -58,7 +58,7 @@
- {
- int err;
-
--#ifdef __linux__
-+#ifdef USE_PTHREADS
- err = pthread_cond_destroy((cond_t *) &condvar->cond);
- #else
- err = cond_destroy((cond_t *) condvar);
---- ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-12-16 14:15:14.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/src/monitor_md.c 2010-06-15 22:07:33.000000000 -0700
-@@ -147,7 +147,7 @@
- mid->monitor_owner = self;
- mid->entry_count = 1;
- return SYS_OK;
-- } else if (err == EBUSY) { /* it's already locked */
-+ } else if (err == EBUSY || err == EDEADLK) { /* it's already locked */
- if (mid->monitor_owner == self) {
- mid->entry_count++;
- return SYS_OK;
---- ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/src/threads_bsd.c 2010-10-31 13:48:56.000000000 -0700
-@@ -1,5 +1,5 @@
- /*
-- * Copyright (c) 1999, 2000, Oracle and/or its affiliates. All rights reserved.
-+ * Copyright (c) 1998, 2004, 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
-@@ -23,389 +23,381 @@
- * questions.
- */
-
--/*
-- * Implementation of notposix.h on Bsd.
-- */
-+#ifdef __APPLE__
-
--#include <pthread.h>
--#include <signal.h>
--#include <string.h>
--#include <unistd.h>
--#include <stdlib.h>
--#include <fcntl.h>
--#include <time.h>
-+/* We need the mach API, which must be be included before any other system includes.
-+ * Additionally, java and mach both define thread_state_t, so temporarily redefine it. */
-+#define thread_state_t mach_thread_state_t
-+#include <mach/mach.h>
-+#undef thread_state_t
-+
-+#endif
-
- #include "hpi_impl.h"
- #include "monitor_md.h"
- #include "threads_md.h"
- #include "np.h"
-
--#undef LOG_THREADS
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-
--/* Global lock used when calling np_suspend and np_resume */
--static pthread_mutex_t sr_lock;
--
--/* Semaphore used to acknowledge when the handler has received HANDLER_SIG */
--static sem_t sr_sem;
--
--/* The tid of the thread being suspended/resumed */
--static sys_thread_t *sr_tid;
-+#include <pthread.h>
-+#if defined(__FreeBSD__) || defined(__OpenBSD__)
-+#include <pthread_np.h>
-+#endif
-+#ifdef __NetBSD__
-+#include <errno.h>
-+#define pthread_attr_get_np(a, b) 0
-+#define pthread_suspend_all_np() 0
-+#define pthread_resume_all_np() 0
-+#endif
-
--int sr_sigsusp;
--int sr_sigresu;
-+#include <time.h>
-+#include <string.h>
-+#include <signal.h>
-+#include <sys/signal.h>
-+#include <sys/resource.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <errno.h>
-
--static void prtsigset(char *s, sigset_t *set)
-+/*
-+ * Suspend said thread. Used to implement java.lang.Thread.suspend(),
-+ * which is deprecated.
-+ */
-+int
-+np_suspend(sys_thread_t *tid)
- {
-- int sig;
-- dprintf(2, "%s:", s);
-- for (sig = 1; sig < _NSIG; sig++) {
-- if (sigismember(set, sig)) {
-- dprintf(2, " %d", sig);
-- }
-- }
-- dprintf(2, "\n");
-+#ifdef __APPLE__
-+ if (thread_suspend(pthread_mach_thread_np(tid->sys_thread)) == KERN_SUCCESS)
-+ return SYS_OK;
-+ else
-+ return SYS_ERR;
-+#else
-+ return pthread_suspend_np(tid->sys_thread);
-+#endif
- }
-
- /*
-- * Handler function invoked when a thread's execution is suspended
-- * We have to be careful that only async-safe functions are
-- * called here. I'm not even sure if calling sysThreadSelf is safe so
-- * we temporarily stash SP in a global variable instead.
-+ * Resume a suspended thread. Used to implement java.lang.Thread.resume(),
-+ * which is deprecated.
- */
--static void
--#ifdef SA_SIGINFO
--susp_handler(int sig, siginfo_t* info, void* arg)
-+int
-+np_continue(sys_thread_t *tid)
-+{
-+#ifdef __APPLE__
-+ if (thread_resume(pthread_mach_thread_np(tid->sys_thread)) == KERN_SUCCESS)
-+ return SYS_OK;
-+ else
-+ return SYS_ERR;
- #else
--susp_handler(int sig)
-+ return pthread_resume_np(tid->sys_thread);
- #endif
--{
-- sys_thread_t *tid = sr_tid;
-- sigset_t set;
-- /* Save the current SP */
-- tid->sp = &tid;
-- sem_post(&sr_sem);
-- sigfillset(&set);
-- sigdelset(&set,(sr_sigresu));
-- /* block until we receive resume signal. */
-- sigsuspend(&set);
- }
-
--static void
--#ifdef SA_SIGINFO
--resu_handler(int sig, siginfo_t* info, void* arg)
--#else
--resu_handler(int sig)
--#endif
-+/*
-+ * If there is any initialization is required by the non-POSIX parts.
-+ */
-+void np_initialize_thread(sys_thread_t *tid)
- {
- return;
- }
-
-+
- /*
-- * Initialize signal handlers for suspend and resume}.
-+ * Internal helper function to get stack information about specified thread.
- */
--int
--np_initialize()
--{
-- struct sigaction act;
-- char *s;
-- int err;
--
-- /* Signal numbers used to suspend and resume */
--#if __GLIBC__ == 2 && __GLIBC_MINOR__ == 0
--#ifdef SIGUNUSED
-- sr_sigsusp = SIGUNUSED;
--#else
-- sr_sigsusp = SIGLOST;
--#endif
--#ifdef SIGPWR
-- sr_sigresu = SIGPWR;
--#else
-- sr_sigresu = SIGXFSZ;
--#endif
--#else
-- /* use real time signals */
-- /* currently __SIGRTMIN, +1, +2 are all used by BsdThreads */
-- sr_sigsusp = SIGRTMIN + 3;
-- sr_sigresu = SIGRTMIN + 4;
--#endif
--
-- /* Set up signal handler for suspend and resume */
--#if defined(SA_SIGINFO) && !defined(__sparc__)
-- act.sa_handler = 0;
-- act.sa_sigaction = susp_handler;
--#else
-- act.sa_handler = (__sighandler_t) susp_handler;
--#endif
--#ifdef SA_SIGINFO
-- act.sa_flags = SA_RESTART | SA_SIGINFO;
--#else
-- act.sa_flags = SA_RESTART;
--#endif
-- sigfillset(&act.sa_mask);
-- if (sigaction(sr_sigsusp, &act, 0) == -1) {
-- return -1;
-+#ifdef __APPLE__
-+static int
-+get_stackinfo(pthread_t tid, void **addr, long *sizep)
-+{
-+ void *stacktop = pthread_get_stackaddr_np(tid);
-+ *sizep = pthread_get_stacksize_np(tid);
-+ *addr = stacktop - *sizep;
-+
-+ return (SYS_OK);
-+}
-+#elif defined(__OpenBSD__)
-+static int
-+get_stackinfo(pthread_t tid, void **addr, long *sizep)
-+{
-+ stack_t ss;
-+
-+ if (pthread_stackseg_np(tid, &ss) == 0) {
-+ *addr = (void *)(ss.ss_sp) - ss.ss_size;
-+ *sizep = (long)(ss.ss_size);
-+ return SYS_OK;
-+ } else {
-+ return SYS_ERR; /* pthreads_stackseg_np failed. */
- }
--#if defined(SA_SIGINFO) && !defined(__sparc__)
-- act.sa_handler = 0;
-- act.sa_sigaction = resu_handler;
--#else
-- act.sa_handler = (__sighandler_t) resu_handler;
--#endif
--#ifdef SA_SIGINFO
-- act.sa_flags = SA_SIGINFO;
-+}
- #else
-- act.sa_flags = 0;
--#endif
-- sigfillset(&act.sa_mask);
-- if (sigaction(sr_sigresu, &act, 0) == -1) {
-- return -1;
-- }
--
-- /* Initialize semaphore used by np_{suspend/resume} */
-- if (sem_init(&sr_sem, 0, 0) == -1) {
-- return SYS_ERR;
-- }
--
-- /* Initialize mutex used by np_{suspend/resume} */
-- err = mutexInit(&sr_lock);
-- sysAssert(err == 0);
-+static int
-+get_stackinfo(pthread_t tid, pthread_attr_t attr, void **addr, long *sizep)
-+{
-+ size_t s;
-+ void *p;
-+ int ret = SYS_ERR;
-+
-+ if (pthread_attr_get_np(tid, &attr) != 0)
-+ goto err;
-+ if (pthread_attr_getstackaddr(&attr, &p) != 0)
-+ goto err;
-+ if (pthread_attr_getstacksize(&attr, &s) != 0)
-+ goto err;
-+ *addr = p;
-+ *sizep = s;
-+ ret = SYS_OK;
-+err:
-
-- return SYS_OK;
-+ return (ret);
- }
-+#endif
-
-+/*
-+ * Get the stack start address, and max stack size for the current thread.
-+ */
- int
--np_initial_suspend(sys_thread_t* tid)
-+np_stackinfo(void **addr, long *size)
- {
-- int count;
--
-- tid->selfsuspended = (tid == sysThreadSelf());
-- sysAssert(tid->selfsuspended);
-+#if defined(__OpenBSD__) || defined(__APPLE__)
-+ return(get_stackinfo(pthread_self(), addr, size));
-+#else
-+ pthread_attr_t attr;
-+ int ret = SYS_ERR;
-
-- count = tid->suspend_count++;
-- sysAssert(count == 0);
-+ if (pthread_attr_init(&attr) == 0) {
-+ ret = get_stackinfo(pthread_self(), attr, addr, size);
-+ pthread_attr_destroy(&attr);
-+ }
-
--#ifdef LOG_THREADS
-- dprintf(2,
-- "[Initial self-suspend [tid = %ld, sys_thread = %ld]\n",
-- pthread_self(), tid->sys_thread);
-+ return (ret);
- #endif
--
-- /* Order should not matter but doing the post first should be faster */
-- sem_post(&tid->sem_suspended);
-- do {
-- sem_wait(&tid->sem_selfsuspend);
-- } while (tid->selfsuspended); /* paranoid */
-- return 0;
- }
-
-+/*
-+ * On Bsd when doing CPU profiling, the threads are bound.
-+ */
-+void
-+np_profiler_init(sys_thread_t *tid)
-+{
-+}
-
- int
--np_suspend(sys_thread_t *tid)
-+np_profiler_suspend(sys_thread_t *tid)
- {
-- int count, ret = 0;
--
-- int err = mutexLock(&sr_lock);
-- sysAssert(err == 0);
--
-- tid->selfsuspended = (tid == sysThreadSelf());
--
-- count = tid->suspend_count++;
--#ifdef LOG_THREADS
-- dprintf(2, "[Suspending fromtid = %ld, tid = %ld, pid = %d, count = %d]\n",
-- pthread_self(), tid->sys_thread, tid->lwp_id, count);
--#endif
-- if (count == 0) {
-- if (tid->selfsuspended) {
--#ifdef LOG_THREADS
-- dprintf(2,
-- "[Self-suspending [tid = %ld, sys_thread = %ld]\n",
-- pthread_self(), tid->sys_thread);
--#endif
-- mutexUnlock(&sr_lock);
-- do {
-- sem_wait(&tid->sem_selfsuspend);
-- } while (tid->selfsuspended);
-- /* [jk] What is the correct return value here?
-- There was no error, but when we return the thread
-- has already been resumed. */
-- return SYS_OK;
--
-- } else {
-- sr_tid = tid;
-- ret = pthread_kill(tid->sys_thread, sr_sigsusp);
-- if (ret == 0) {
-- sem_wait(&sr_sem);
-- }
--#ifdef LOG_THREADS
-- dprintf(2,
-- "[Suspended fromtid = %ld, pthread_kill(%ld, %d) = %d]\n",
-- pthread_self(), tid->sys_thread, sr_sigsusp, ret);
--#endif
-- }
-- }
--
-- err = mutexUnlock(&sr_lock);
-- sysAssert(err == 0);
--
-- return ret == 0 ? SYS_OK : SYS_ERR;
-+ return np_suspend(tid);
- }
-
- int
--np_continue(sys_thread_t *tid)
-+np_profiler_continue(sys_thread_t *tid)
- {
-- int count, ret = 0;
--
-- int err = mutexLock(&sr_lock);
-- sysAssert(err == 0);
-+ return np_continue(tid);
-+}
-
-- count = --tid->suspend_count;
--#ifdef LOG_THREADS
-- dprintf(2, "[Resuming fromtid = %ld, tid = %ld, pid = %d, count = %d]\n",
-- pthread_self(), tid->sys_thread, tid->lwp_id, count);
--#endif
-- if (count == 0) {
-- if (tid->selfsuspended) {
-- tid->selfsuspended = 0;
-- sem_post(&tid->sem_selfsuspend);
-- } else {
-- sr_tid = tid;
-- ret = pthread_kill(tid->sys_thread, sr_sigresu);
-- }
--#ifdef LOG_THREADS
-- dprintf(2, "[Resumed fromtid = %ld, pthread_kill(%ld, %d) = %d]\n",
-- pthread_self(), tid->sys_thread, sr_sigresu, ret);
--#endif
-- } else if (count < 0) {
-- /* Ignore attempts to resume a thread that has not been suspended */
-- tid->suspend_count = 0;
-- }
-+bool_t
-+np_profiler_thread_is_running(sys_thread_t *tid)
-+{
-+ return TRUE;
-+}
-
-- err = mutexUnlock(&sr_lock);
-- sysAssert(err == 0);
-
-- return ret == 0 ? SYS_OK : SYS_ERR;
-+int
-+np_initialize()
-+{
-+ return SYS_OK;
- }
-
-+/* prototypes */
-+
-+static void record_thread_regs();
-+
- /*
-- * Get the stack base and size.
-+ * Suspend all other threads, and record their contexts (register
-+ * set or stack pointer) into the sys_thread structure, so that a
-+ * garbage collect can be run.
- */
-+#ifdef __APPLE__
- int
--np_stackinfo(void **addr, long *size)
--{
-- /* For now assume stack is 2 meg, from internals.h. */
--#define STACK_SIZE (2 * 1024 * 1024)
-- void *p;
-- char *sp = (char *)&p; /* rougly %esp */
-+np_single(void)
-+{
-+ sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
-+
-+ /* Iterate over all the threads in the task, suspending each one.
-+ * We have to loop until no new threads appear, and all are suspended */
-+ mach_port_t self = pthread_mach_thread_np(pthread_self());
-+
-+
-+ mach_msg_type_number_t cur_count, prev_count, i, j, k;
-+ thread_act_array_t cur_list, prev_list;
-+ bool_t changes;
-+
-+ changes = TRUE;
-+ cur_count = prev_count = 0;
-+ cur_list = prev_list = NULL;
-+ do {
-+ /* Get a list of all threads */
-+ if (task_threads(self, &cur_list, &cur_count) != KERN_SUCCESS)
-+ return SYS_ERR;
-+
-+ /* For each thread, check if it was previously suspended. If it
-+ * was not, suspend it now, and set the changes flag to 'true' */
-+ changes = FALSE;
-+ for (i = 0; i < cur_count; i++) {
-+ mach_msg_type_number_t j;
-+ bool_t found = FALSE;
-+
-+ /* Check the previous thread list */
-+ for (j = 0; j < prev_count; j++) {
-+ if (prev_list[j] == cur_list[i]) {
-+ found = TRUE;
-+ break;
-+ }
-+ }
-
-- *addr = (void *)(((unsigned long)sp | (STACK_SIZE-1))+1) - 1;
-- *size = STACK_SIZE;
-+ /* If the thread wasn't previously suspended, suspend it now and set the change flag */
-+ if (found) {
-+ /* Don't suspend ourselves! */
-+ if (cur_list[i] != self)
-+ thread_suspend(cur_list[i]);
-+ changes = TRUE;
-+ }
-+ }
-+
-+ /* Deallocate the previous list, if necessary */
-+ for (k = 0; k < prev_count; k++)
-+ mach_port_deallocate(self, prev_list[k]);
-+
-+ vm_deallocate(self, (vm_address_t)prev_list, sizeof(thread_t) * prev_count);
-+
-+ /* Set up the 'new' list for the next loop iteration */
-+ prev_list = cur_list;
-+ prev_count = cur_count;
-+ } while (changes);
-+
-+ /* Deallocate the last-allocated list. */
-+ for (i = 0; i < prev_count; i++)
-+ mach_port_deallocate(self, prev_list[i]);
-+
-+ vm_deallocate(self, (vm_address_t)prev_list, sizeof(thread_t) * prev_count);
-
-+ /* Record registers and return */
-+ record_thread_regs();
- return SYS_OK;
- }
--
--typedef unsigned long ulong_t;
--#define VALID_SP(sp, bottom, top) \
-- (((ulong_t)(sp)) < ((ulong_t)(bottom)) && ((ulong_t)(sp)) > ((ulong_t)(top)))
--
--/*
-- * Go into single threaded mode for GC.
-- */
-+#else
- int
--np_single()
-+np_single(void)
- {
-- sys_thread_t *tid;
-- pthread_t me = pthread_self();
-- int i;
-+ sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
-
--#ifdef LOG_THREADS
-- dprintf(2, "[Entering np_single: thread count = %d]\n", ActiveThreadCount);
--#endif
-- /* Stop all other threads. */
-- tid = ThreadQueue;
-- for (i = 0; i < ActiveThreadCount && tid != 0; i++) {
-- if ((tid->sys_thread != me) && (tid->state != SUSPENDED)) {
-- np_suspend(tid);
-- sysAssert(VALID_SP(tid->sp, tid->stack_bottom, tid->stack_top));
-- tid->onproc = FALSE; /* REMIND: Might not need this */
-- }
-- tid = tid->next;
-- }
--#ifdef LOG_THREADS
-- dprintf(2, "[Leaving np_single]\n");
--#endif
-+ pthread_suspend_all_np();
-+ record_thread_regs();
- return SYS_OK;
- }
-+#endif
-
- /*
-- * Per thread initialization.
-+ * Continue threads suspended earlier.
- */
-+#ifdef __APPLE__
- void
--np_initialize_thread(sys_thread_t *tid)
-+np_multi(void)
- {
-- sigset_t set;
-+ sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
-
-- /* Block SIGQUIT so that it can be handled by the SIGQUIT handler thread */
-- sigemptyset(&set);
-- sigaddset(&set, SIGQUIT);
-- pthread_sigmask(SIG_BLOCK, &set, 0);
-- /* Set process id */
-- tid->lwp_id = getpid();
-- tid->suspend_count = 0;
--
-- /* Semaphore used for self-suspension */
-- sem_init(&tid->sem_selfsuspend, 0, 0);
-- tid->selfsuspended = 0;
--
--#ifdef LOG_THREADS
-- dprintf(2, "[Init thread, tid = %ld, pid = %d, base = %p, size = %lu]\n",
-- pthread_self(), tid->lwp_id, tid->stack_bottom, tid->stack_size);
--#endif
--}
-+ mach_msg_type_number_t thr_count, i;
-+ thread_act_array_t thr_list;
-+ mach_port_t self;
-+
-+ self = pthread_mach_thread_np(pthread_self());
-+
-+ /* Get a list of all threads. This has to succeed! */
-+ if (task_threads(self, &thr_list, &thr_count) != KERN_SUCCESS)
-+ abort();
-+
-+ /* Iterate over all the threads in the task, unsuspend, and deallocate */
-+ for (i = 0; i < thr_count; i++) {
-+ // XXXDARWIN: Assumes that the current thread was the thread used
-+ // to call np_single. Is that true?
-
-+ if (thr_list[i] != self)
-+ thread_resume(thr_list[i]);
-+
-+ mach_port_deallocate(self, thr_list[i]);
-+ }
-+
-+ vm_deallocate(self, (vm_address_t) thr_list, sizeof(thread_t) * thr_count);
-+}
-+#else
- void
--np_free_thread(sys_thread_t *tid)
-+np_multi(void)
- {
-- sem_destroy(&tid->sem_selfsuspend);
-+ sysAssert(SYS_QUEUE_LOCKED(sysThreadSelf()));
-+ pthread_resume_all_np();
- }
-+#endif
-
- /*
-- * Recover from single threaded mode after GC.
-+ * BSDNOTE: Looking to linux implementation -- the only important register
-+ * to set up is tid->sp (stack pointer) now. But it may change when
-+ * FreeBSD and JVM will switch to KSEs. In this case we'll also need to
-+ * care about ucontext I think.
-+ *
-+ * --phantom
-+ *
-+ * XXXBSD: There's a problem with this implemenation. Currently it sets
-+ * the tid->sp to the bottom of the thread stack and not the current stack
-+ * pointer of the suspended thread. Both solaris and linux use the current
-+ * thread stack pointer. -- kurt
-+ *
-+ * Assumes stacks grow down from high to low memory. True on sparc and Intel.
- */
--void
--np_multi()
-+
-+static void
-+record_thread_regs()
- {
-- int i;
-+ void *addr;
-+ long sz;
-+
- sys_thread_t *tid;
-- pthread_t me = pthread_self();
-+ int i;
-+ int sp;
-+
-+#ifndef __OpenBSD__
-+ pthread_attr_t attr;
-+ int attr_inited;
-+ attr_inited = pthread_attr_init(&attr) == 0;
-+#endif
-
- tid = ThreadQueue;
- for (i = 0; i < ActiveThreadCount && tid != 0; i++) {
-- if ((tid->sys_thread != me) && (tid->state != SUSPENDED)) {
-- np_continue(tid);
-+ if (tid->onproc != TRUE) {
-+ int i;
-+
-+ if (tid->sys_thread != 0) {
-+ /* if thread has already been initialized */
-+#if defined(__OpenBSD__) || defined(__APPLE__)
-+ if (get_stackinfo(tid->sys_thread, &addr, &sz) == SYS_OK)
-+#else
-+ if (get_stackinfo(tid->sys_thread, attr, &addr, &sz) == SYS_OK)
-+#endif
-+ tid->sp = addr;
-+ else
-+ tid->sp = 0;
-+ } else {
-+ /*
-+ * thread is still in the process of being initalized.
-+ * So GC should not care about this thread. Just
-+ * set its sp to 0, and this will force GC to ignore it.
-+ */
-+ tid->sp = 0;
-+ }
- }
- tid = tid->next;
- }
--}
--
--void
--np_profiler_init(sys_thread_t *tid)
--{
--}
--
--int
--np_profiler_suspend(sys_thread_t *tid)
--{
-- return np_suspend(tid);
--}
--
--int
--np_profiler_continue(sys_thread_t *tid)
--{
-- return np_continue(tid);
--}
--
--bool_t
--np_profiler_thread_is_running(sys_thread_t *tid)
--{
-- return TRUE;
-+#ifndef __OpenBSD__
-+ if (attr_inited)
-+ pthread_attr_destroy(&attr);
-+#endif
- }
---- ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-12-16 14:15:15.000000000 -0800
-+++ ./jdk/src/solaris/hpi/native_threads/src/threads_md.c 2010-06-15 22:07:34.000000000 -0700
-@@ -54,6 +54,10 @@
- #error That can NOT possibly be right.
- #endif
-
-+#if defined(_ALLBSD_SOURCE) && !defined(SA_SIGINFO)
-+#error That can NOT possibly be right.
-+#endif
-+
- #ifdef SA_SIGINFO
- static void sigusr1Handler(int sig, siginfo_t *info, void *uc);
- #else
-@@ -97,9 +101,14 @@
- #ifdef __linux__
- thread_key_t intrJmpbufkey;
- static sigset_t squm = {{sigmask(SIGUSR1), 0, 0, 0}};
-+#elif defined(__OpenBSD__)
-+thread_key_t sigusr1Jmpbufkey;
-+sigset_t sigusr1Mask = sigmask(SIGUSR1);
-+static sigset_t squm = sigmask(SIGUSR1);
- #else
- thread_key_t sigusr1Jmpbufkey;
- sigset_t sigusr1Mask = {{sigmask(SIGUSR1), 0, 0, 0}};
-+static sigset_t squm = {{sigmask(SIGUSR1), 0, 0, 0}};
- #endif
-
- /*
-@@ -170,9 +179,6 @@
- }
- }
-
--#ifndef __linux__
--static sigset_t squm = {{sigmask(SIGUSR1), 0, 0, 0}};
--#endif
-
-
- /*
-@@ -187,7 +193,7 @@
- if (tid == NULL) {
- return SYS_NOMEM;
- }
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- memset((char *)tid, 0, sizeof(sys_thread_t));
- #endif
-
-@@ -474,7 +480,7 @@
- }
- *tidP = tid;
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- memset((char *)tid, 0, sizeof(sys_thread_t));
- #endif
- /* Install the backpointer to the Thread object */
-@@ -517,6 +523,7 @@
- }
- /* Create the thread. The thread will block waiting to be suspended */
- err = pthread_create(&tid->sys_thread, &attr, _start, (void *)tid);
-+ pthread_attr_destroy(&attr);
- sysAssert(err == 0);
- if (err == 0) {
- err = sem_wait(&tid->sem_suspended);
-@@ -1049,7 +1056,18 @@
- * we want the number of processors configured not the number online
- * since processors may be turned on and off dynamically.
- */
-+#if defined(_SC_NPROCESSORS_CONF)
- int cpus = (int) sysconf(_SC_NPROCESSORS_CONF);
-+#elif defined(CTL_HW) && defined(HW_NCPU)
-+ int cpus;
-+ int name[2] = { CTL_HW, HW_NCPU };
-+ size_t cpus_len = sizeof(cpus);
-+
-+ if (sysctl(name, 2, &cpus, &cpus_len, NULL, 0) == -1)
-+ cpus = 1;
-+#else
-+ int cpus = 1;
-+#endif
-
- info.isMP = (cpus < 0) ? 1 : (cpus > 1);
- info.name = "native threads";
---- ./jdk/src/solaris/hpi/src/linker_md.c 2010-12-16 14:15:15.000000000 -0800
-+++ ./jdk/src/solaris/hpi/src/linker_md.c 2010-06-15 22:07:34.000000000 -0700
-@@ -44,11 +44,19 @@
- #include "threads_md.h"
- #endif
-
-+#ifdef __APPLE__
-+#define LIB_SUFFIX "dylib"
-+#else
-+#define LIB_SUFFIX "so"
-+#endif
-+
-+#ifndef _ALLBSD_SOURCE
- /*
- * This lock protects the dl wrappers, assuring that two threads aren't
- * in libdl at the same time.
- */
- sys_mon_t _dl_lock;
-+#endif
-
- /*
- * Solaris green threads needs to lock around libdl.so.
-@@ -57,6 +65,14 @@
- #define NEED_DL_LOCK
- #endif
-
-+#ifdef NEED_DL_LOCK
-+/*
-+ * This lock protects the dl wrappers, assuring that two threads aren't
-+ * in libdl at the same time.
-+ */
-+sys_mon_t _dl_lock;
-+#endif
-+
- /*
- * create a string for the JNI native function name by adding the
- * appropriate decorations.
-@@ -86,14 +102,14 @@
- }
-
- if (pnamelen == 0) {
-- sprintf(holder, "lib%s.so", fname);
-+ sprintf(holder, "lib%s." LIB_SUFFIX, fname);
- } else {
-- sprintf(holder, "%s/lib%s.so", pname, fname);
-+ sprintf(holder, "%s/lib%s." LIB_SUFFIX, pname, fname);
- }
- }
-
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- static int thr_main(void)
- {
- return -1;
-@@ -111,10 +127,10 @@
-
- #ifdef NEED_DL_LOCK
- sysMonitorEnter(sysThreadSelf(), &_dl_lock);
-- result = dlopen(name, RTLD_NOW);
-+ result = dlopen(name, RTLD_NOW|RTLD_GLOBAL);
- sysMonitorExit(sysThreadSelf(), &_dl_lock);
- #else
-- result = dlopen(name, RTLD_LAZY);
-+ result = dlopen(name, RTLD_LAZY|RTLD_GLOBAL);
- #endif
- /*
- * This is a bit of bulletproofing to catch the commonly occurring
---- ./jdk/src/solaris/hpi/src/memory_md.c 2010-12-16 14:15:15.000000000 -0800
-+++ ./jdk/src/solaris/hpi/src/memory_md.c 2010-06-15 22:07:34.000000000 -0700
-@@ -50,12 +50,24 @@
- #include <stdlib.h>
- #include <stdio.h> /* For perror() */
- #include <string.h>
-+#if defined(_ALLBSD_SOURCE)
-+#include <sys/param.h>
-+#else
- #include <malloc.h>
-+#endif
-
- #include "hpi_impl.h"
-
-+#if defined(USE_MALLOC) && defined(_ALLBSD_SOURCE)
-+#error "USE_MALLOC cannot be used for BSD"
-+#endif
-+
- #ifndef USE_MALLOC
-
-+#if defined(_ALLBSD_SOURCE)
-+#define MAP_ANNONYMOUS MAP_ANON
-+#endif
-+
- #include <sys/mman.h>
- #include <fcntl.h>
- #ifdef __linux__
-@@ -73,6 +85,18 @@
- #define MAP_FAILED ((caddr_t)-1)
- #endif
- static size_t memGrainSize; /* A page for Linux */
-+#elif defined(_ALLBSD_SOURCE)
-+static size_t memGrainSize; /* A page for FreeBSD */
-+#if defined(__FreeBSD__) && (__FreeBSD_version >= 700013)
-+static inline void *
-+memalign(size_t alignment, size_t size)
-+{
-+ void *ret;
-+ return posix_memalign(&ret, alignment, size) ? NULL : ret;
-+}
-+#else /* ! __FreeBSD_version >= 700013 */
-+#define memalign(a, b) valloc(b)
-+#endif
- #else
- static unsigned int memGrainSize; /* A page for Solaris */
- #endif
-@@ -154,7 +178,7 @@
- {
- char *ret;
-
--#if defined(__linux__) && defined(MAP_ANONYMOUS)
-+#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(MAP_ANONYMOUS)
- ret = (char *) mmap(0, length, PROT_ALL,
- MAP_NORESERVE | MAP_PRIVATE | MAP_ANONYMOUS,
- -1, (off_t) 0);
-@@ -176,7 +200,7 @@
- mapChunkReserve(char *addr, long length)
- {
- char *ret;
--#if defined(__linux__) && defined(MAP_ANONYMOUS)
-+#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(MAP_ANONYMOUS)
- ret = (char *) mmap(addr, length, PROT_ALL,
- MAP_FIXED | MAP_PRIVATE | MAP_ANONYMOUS,
- -1, (off_t) 0);
-@@ -199,7 +223,7 @@
- {
- char *ret;
-
--#if defined(__linux__) && defined(MAP_ANONYMOUS)
-+#if (defined(__linux__) || defined(_ALLBSD_SOURCE)) && defined(MAP_ANONYMOUS)
- ret = (char *) mmap(addr, length, PROT_ALL,
- MAP_FIXED | MAP_PRIVATE |
- MAP_NORESERVE | MAP_ANONYMOUS,
-@@ -242,7 +266,7 @@
- *mappedSize = roundUpToGrain(requestedSize);
- #ifdef USE_MALLOC
- mappedAddr = (void *) sysMalloc(*mappedSize); /* Returns 0 on failure */
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- if (mappedAddr) {
- memset(mappedAddr, 0, *mappedSize);
- mappedAddr = (void *) roundUpToGrain(mappedAddr);
-@@ -331,7 +355,7 @@
- *committedSize = roundUpToGrain(requestedSize);
- committedAddr = (void *) roundDownToGrain((long) requestedAddr);
- #ifdef USE_MALLOC
--#ifdef __linux__
-+#if defined(__linux__) || defined(_ALLBSD_SOURCE)
- ret = committedAddr;
- #else
- ret = requestedAddr;
---- ./jdk/src/solaris/hpi/src/system_md.c 2010-12-16 14:15:15.000000000 -0800
-+++ ./jdk/src/solaris/hpi/src/system_md.c 2010-06-15 22:07:34.000000000 -0700
-@@ -41,6 +41,7 @@
- #include <dlfcn.h>
-
- #include "jni_md.h"
-+#include "jvm_md.h"
- #include "mutex_md.h"
-
- #include "hpi_init.h"
-@@ -50,9 +51,6 @@
- #include "monitor_md.h"
- #include "largefile.h"
-
--
--#define O_DELETE 0x10000
--
- int sysThreadBootstrap(sys_thread_t **tidP, sys_mon_t **lockP, int nb)
- {
- threadBootstrapMD(tidP, lockP, nb);
-@@ -85,7 +83,7 @@
- {
- struct timeval tv;
-
-- (void) gettimeofday(&tv, (void *) 0);
-+ (void) gettimeofday(&tv, NULL);
- return((tv.tv_sec * 1000) + (tv.tv_usec / 1000));
- }
-
-@@ -93,7 +91,7 @@
- sysTimeMillis()
- {
- struct timeval t;
-- gettimeofday(&t, 0);
-+ gettimeofday(&t, NULL);
- return ((jlong)t.tv_sec) * 1000 + (jlong)(t.tv_usec/1000);
- }
-
-@@ -122,13 +120,13 @@
-
- /*
- * Open a file. Unlink the file immediately after open returns
-- * if the specified oflag has the O_DELETE flag set.
-+ * if the specified oflag has the JVM_O_DELETE flag set.
- */
- int sysOpen(const char *path, int oflag, int mode)
- {
- int fd;
-- int delete = (oflag & O_DELETE);
-- oflag = oflag & ~O_DELETE;
-+ int delete = (oflag & JVM_O_DELETE);
-+ oflag = oflag & ~JVM_O_DELETE;
- fd = open64_w(path, oflag, mode);
- if (delete != 0) {
- unlink(path);
---- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-12-16 14:15:15.000000000 -0800
-+++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2010-06-15 22:07:34.000000000 -0700
+--- ./jdk/src/solaris/instrument/EncodingSupport_md.c 2011-05-26 18:56:34.000000000 -0700
++++ ./jdk/src/solaris/instrument/EncodingSupport_md.c 2011-04-22 23:08:38.000000000 -0700
@@ -28,7 +28,10 @@
#include <string.h>
#include <ctype.h>
@@ -21937,8 +25478,8 @@ $FreeBSD$
/* Open conversion descriptors */
iconvToPlatform = iconv_open(codeset, "UTF-8");
---- ./jdk/src/solaris/javavm/export/jvm_md.h 2010-12-16 14:15:15.000000000 -0800
-+++ ./jdk/src/solaris/javavm/export/jvm_md.h 2010-06-15 22:07:34.000000000 -0700
+--- ./jdk/src/solaris/javavm/export/jvm_md.h 2011-05-26 18:56:34.000000000 -0700
++++ ./jdk/src/solaris/javavm/export/jvm_md.h 2011-04-22 23:08:38.000000000 -0700
@@ -41,7 +41,14 @@
#define JNI_ONUNLOAD_SYMBOLS {"JNI_OnUnload"}
@@ -21963,8 +25504,343 @@ $FreeBSD$
/* Signals */
---- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-12-16 14:15:15.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2010-12-13 00:54:13.000000000 -0800
+--- ./jdk/src/solaris/native/com/sun/management/BsdOperatingSystem.c 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/native/com/sun/management/BsdOperatingSystem.c 1969-12-31 16:00:00.000000000 -0800
+@@ -1,332 +0,0 @@
+-/*
+- * Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+- *
+- * This code is free software; you can redistribute it and/or modify it
+- * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. Oracle designates this
+- * particular file as subject to the "Classpath" exception as provided
+- * by Oracle in the LICENSE file that accompanied this code.
+- *
+- * This code is distributed in the hope that it will be useful, but WITHOUT
+- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+- * version 2 for more details (a copy is included in the LICENSE file that
+- * accompanied this code).
+- *
+- * You should have received a copy of the GNU General Public License version
+- * 2 along with this work; if not, write to the Free Software Foundation,
+- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+- *
+- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+- * or visit www.oracle.com if you need additional information or have any
+- * questions.
+- */
+-
+-#include <stdio.h>
+-#include <stdint.h>
+-#include <stdarg.h>
+-#include <unistd.h>
+-#include <errno.h>
+-#include <string.h>
+-#include <sys/resource.h>
+-#include <sys/types.h>
+-#include <dirent.h>
+-#include <stdlib.h>
+-#include <dlfcn.h>
+-#include <pthread.h>
+-#include "com_sun_management_UnixOperatingSystem.h"
+-
+-struct ticks {
+- uint64_t used;
+- uint64_t usedKernel;
+- uint64_t total;
+-};
+-
+-typedef struct ticks ticks;
+-
+-typedef enum {
+- CPU_LOAD_VM_ONLY,
+- CPU_LOAD_GLOBAL,
+-} CpuLoadTarget;
+-
+-static struct perfbuf {
+- int nProcs;
+- ticks jvmTicks;
+- ticks cpuTicks;
+- ticks *cpus;
+-} counters;
+-
+-#define DEC_64 "%lld"
+-
+-static void next_line(FILE *f) {
+- while (fgetc(f) != '\n');
+-}
+-
+-/**
+- * Return the total number of ticks since the system was booted.
+- * If the usedTicks parameter is not NULL, it will be filled with
+- * the number of ticks spent on actual processes (user, system or
+- * nice processes) since system boot. Note that this is the total number
+- * of "executed" ticks on _all_ CPU:s, that is on a n-way system it is
+- * n times the number of ticks that has passed in clock time.
+- *
+- * Returns a negative value if the reading of the ticks failed.
+- */
+-static int get_totalticks(int which, ticks *pticks) {
+- FILE *fh;
+- uint64_t userTicks, niceTicks, systemTicks, idleTicks;
+- int n;
+-
+- if((fh = fopen("/proc/stat", "r")) == NULL) {
+- return -1;
+- }
+-
+- n = fscanf(fh, "cpu " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64,
+- &userTicks, &niceTicks, &systemTicks, &idleTicks);
+-
+- // Move to next line
+- next_line(fh);
+-
+- //find the line for requested cpu faster to just iterate linefeeds?
+- if (which != -1) {
+- int i;
+- for (i = 0; i < which; i++) {
+- if (fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64, &userTicks, &niceTicks, &systemTicks, &idleTicks) != 4) {
+- fclose(fh);
+- return -2;
+- }
+- next_line(fh);
+- }
+- n = fscanf(fh, "cpu%*d " DEC_64 " " DEC_64 " " DEC_64 " " DEC_64 "\n",
+- &userTicks, &niceTicks, &systemTicks, &idleTicks);
+- }
+-
+- fclose(fh);
+- if (n != 4) {
+- return -2;
+- }
+-
+- pticks->used = userTicks + niceTicks;
+- pticks->usedKernel = systemTicks;
+- pticks->total = userTicks + niceTicks + systemTicks + idleTicks;
+-
+- return 0;
+-}
+-
+-static int vread_statdata(const char *procfile, const char *fmt, va_list args) {
+- FILE *f;
+- int n;
+- char buf[2048];
+-
+- if ((f = fopen(procfile, "r")) == NULL) {
+- return -1;
+- }
+-
+- if ((n = fread(buf, 1, sizeof(buf), f)) != -1) {
+- char *tmp;
+-
+- buf[n-1] = '\0';
+- /** skip through pid and exec name. the exec name _could be wacky_ (renamed) and
+- * make scanf go mupp.
+- */
+- if ((tmp = strrchr(buf, ')')) != NULL) {
+- // skip the ')' and the following space but check that the buffer is long enough
+- tmp += 2;
+- if (tmp < buf + n) {
+- n = vsscanf(tmp, fmt, args);
+- }
+- }
+- }
+-
+- fclose(f);
+-
+- return n;
+-}
+-
+-static int read_statdata(const char *procfile, const char *fmt, ...) {
+- int n;
+- va_list args;
+-
+- va_start(args, fmt);
+- n = vread_statdata(procfile, fmt, args);
+- va_end(args);
+- return n;
+-}
+-
+-/** read user and system ticks from a named procfile, assumed to be in 'stat' format then. */
+-static int read_ticks(const char *procfile, uint64_t *userTicks, uint64_t *systemTicks) {
+- return read_statdata(procfile, "%*c %*d %*d %*d %*d %*d %*u %*u %*u %*u %*u "DEC_64" "DEC_64,
+- userTicks, systemTicks
+- );
+-}
+-
+-/**
+- * Return the number of ticks spent in any of the processes belonging
+- * to the JVM on any CPU.
+- */
+-static int get_jvmticks(ticks *pticks) {
+- uint64_t userTicks;
+- uint64_t systemTicks;
+-
+- if (read_ticks("/proc/self/stat", &userTicks, &systemTicks) < 0) {
+- return -1;
+- }
+-
+- // get the total
+- if (get_totalticks(-1, pticks) < 0) {
+- return -1;
+- }
+-
+- pticks->used = userTicks;
+- pticks->usedKernel = systemTicks;
+-
+- return 0;
+-}
+-
+-/**
+- * This method must be called first, before any data can be gathererd.
+- */
+-int perfInit() {
+- static int initialized=1;
+-
+- if (!initialized) {
+- int i;
+-
+- int n = sysconf(_SC_NPROCESSORS_ONLN);
+- if (n <= 0) {
+- n = 1;
+- }
+-
+- counters.cpus = calloc(n,sizeof(ticks));
+- if (counters.cpus != NULL) {
+- // For the CPU load
+- get_totalticks(-1, &counters.cpuTicks);
+-
+- for (i = 0; i < n; i++) {
+- get_totalticks(i, &counters.cpus[i]);
+- }
+- // For JVM load
+- get_jvmticks(&counters.jvmTicks);
+- initialized = 1;
+- }
+- }
+-
+- return initialized ? 0 : -1;
+-}
+-
+-#define MAX(a,b) (a>b?a:b)
+-#define MIN(a,b) (a<b?a:b)
+-
+-static pthread_mutex_t lock = PTHREAD_MUTEX_INITIALIZER;
+-
+-/**
+- * Return the load of the CPU as a double. 1.0 means the CPU process uses all
+- * available time for user or system processes, 0.0 means the CPU uses all time
+- * being idle.
+- *
+- * Returns a negative value if there is a problem in determining the CPU load.
+- */
+-
+-static double get_cpuload_internal(int which, double *pkernelLoad, CpuLoadTarget target) {
+- uint64_t udiff, kdiff, tdiff;
+- ticks *pticks, tmp;
+- double user_load = -1.0;
+- int failed = 0;
+-
+- *pkernelLoad = 0.0;
+-
+- pthread_mutex_lock(&lock);
+-
+- if(perfInit() == 0) {
+-
+- if (target == CPU_LOAD_VM_ONLY) {
+- pticks = &counters.jvmTicks;
+- } else if (which == -1) {
+- pticks = &counters.cpuTicks;
+- } else {
+- pticks = &counters.cpus[which];
+- }
+-
+- tmp = *pticks;
+-
+- if (target == CPU_LOAD_VM_ONLY) {
+- if (get_jvmticks(pticks) != 0) {
+- failed = 1;
+- }
+- } else if (get_totalticks(which, pticks) < 0) {
+- failed = 1;
+- }
+-
+- if(!failed) {
+- // seems like we sometimes end up with less kernel ticks when
+- // reading /proc/self/stat a second time, timing issue between cpus?
+- if (pticks->usedKernel < tmp.usedKernel) {
+- kdiff = 0;
+- } else {
+- kdiff = pticks->usedKernel - tmp.usedKernel;
+- }
+- tdiff = pticks->total - tmp.total;
+- udiff = pticks->used - tmp.used;
+-
+- if (tdiff == 0) {
+- user_load = 0;
+- } else {
+- if (tdiff < (udiff + kdiff)) {
+- tdiff = udiff + kdiff;
+- }
+- *pkernelLoad = (kdiff / (double)tdiff);
+- // BUG9044876, normalize return values to sane values
+- *pkernelLoad = MAX(*pkernelLoad, 0.0);
+- *pkernelLoad = MIN(*pkernelLoad, 1.0);
+-
+- user_load = (udiff / (double)tdiff);
+- user_load = MAX(user_load, 0.0);
+- user_load = MIN(user_load, 1.0);
+- }
+- }
+- }
+- pthread_mutex_unlock(&lock);
+- return user_load;
+-}
+-
+-double get_cpu_load(int which) {
+- double u, s;
+- u = get_cpuload_internal(which, &s, CPU_LOAD_GLOBAL);
+- if (u < 0) {
+- return -1.0;
+- }
+- // Cap total systemload to 1.0
+- return MIN((u + s), 1.0);
+-}
+-
+-double get_process_load() {
+- double u, s;
+- u = get_cpuload_internal(-1, &s, CPU_LOAD_VM_ONLY);
+- if (u < 0) {
+- return -1.0;
+- }
+- return u + s;
+-}
+-
+-JNIEXPORT jdouble JNICALL
+-Java_com_sun_management_UnixOperatingSystem_getSystemCpuLoad
+-(JNIEnv *env, jobject dummy)
+-{
+- if(perfInit() == 0) {
+- return get_cpu_load(-1);
+- } else {
+- return -1.0;
+- }
+-}
+-
+-JNIEXPORT jdouble JNICALL
+-Java_com_sun_management_UnixOperatingSystem_getProcessCpuLoad
+-(JNIEnv *env, jobject dummy)
+-{
+- if(perfInit() == 0) {
+- return get_process_load();
+- } else {
+- return -1.0;
+- }
+-}
+--- ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2011-05-26 18:56:35.000000000 -0700
++++ ./jdk/src/solaris/native/com/sun/management/UnixOperatingSystem_md.c 2011-04-22 23:08:38.000000000 -0700
@@ -32,10 +32,16 @@
#include <sys/types.h>
@@ -22127,3390 +26003,8 @@ $FreeBSD$
}
JNIEXPORT jlong JNICALL
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,180 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--//#define USE_ERROR
--//#define USE_TRACE
--
--#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
--
--static void alsaDebugOutput(const char *file, int line, const char *function, int err, const char *fmt, ...) {
--#ifdef USE_ERROR
-- va_list args;
-- va_start(args, fmt);
-- printf("%s:%d function %s: error %d: %s\n", file, line, function, err, snd_strerror(err));
-- if (strlen(fmt) > 0) {
-- vprintf(fmt, args);
-- }
-- va_end(args);
--#endif
--}
--
--static int alsa_inited = 0;
--static int alsa_enumerate_pcm_subdevices = FALSE; // default: no
--static int alsa_enumerate_midi_subdevices = FALSE; // default: no
--
--void initAlsaSupport() {
-- char* enumerate;
-- if (!alsa_inited) {
-- alsa_inited = TRUE;
-- snd_lib_error_set_handler(&alsaDebugOutput);
--
-- enumerate = getenv(ENV_ENUMERATE_PCM_SUBDEVICES);
-- if (enumerate != NULL && strlen(enumerate) > 0
-- && (enumerate[0] != 'f') // false
-- && (enumerate[0] != 'F') // False
-- && (enumerate[0] != 'n') // no
-- && (enumerate[0] != 'N')) { // NO
-- alsa_enumerate_pcm_subdevices = TRUE;
-- }
--#ifdef ALSA_MIDI_ENUMERATE_SUBDEVICES
-- alsa_enumerate_midi_subdevices = TRUE;
--#endif
-- }
--}
--
--
--/* if true (non-zero), ALSA sub devices should be listed as separate devices
-- */
--int needEnumerateSubdevices(int isMidi) {
-- initAlsaSupport();
-- return isMidi ? alsa_enumerate_midi_subdevices
-- : alsa_enumerate_pcm_subdevices;
--}
--
--
--/*
-- * deviceID contains packed card, device and subdevice numbers
-- * each number takes 10 bits
-- * "default" device has id == ALSA_DEFAULT_DEVICE_ID
-- */
--UINT32 encodeDeviceID(int card, int device, int subdevice) {
-- return (((card & 0x3FF) << 20) | ((device & 0x3FF) << 10)
-- | (subdevice & 0x3FF)) + 1;
--}
--
--
--void decodeDeviceID(UINT32 deviceID, int* card, int* device, int* subdevice,
-- int isMidi) {
-- deviceID--;
-- *card = (deviceID >> 20) & 0x3FF;
-- *device = (deviceID >> 10) & 0x3FF;
-- if (needEnumerateSubdevices(isMidi)) {
-- *subdevice = deviceID & 0x3FF;
-- } else {
-- *subdevice = -1; // ALSA will choose any subdevices
-- }
--}
--
--
--void getDeviceString(char* buffer, int card, int device, int subdevice,
-- int usePlugHw, int isMidi) {
-- if (needEnumerateSubdevices(isMidi)) {
-- sprintf(buffer, "%s:%d,%d,%d",
-- usePlugHw ? ALSA_PLUGHARDWARE : ALSA_HARDWARE,
-- card, device, subdevice);
-- } else {
-- sprintf(buffer, "%s:%d,%d",
-- usePlugHw ? ALSA_PLUGHARDWARE : ALSA_HARDWARE,
-- card, device);
-- }
--}
--
--
--void getDeviceStringFromDeviceID(char* buffer, UINT32 deviceID,
-- int usePlugHw, int isMidi) {
-- int card, device, subdevice;
--
-- if (deviceID == ALSA_DEFAULT_DEVICE_ID) {
-- strcpy(buffer, ALSA_DEFAULT_DEVICE_NAME);
-- } else {
-- decodeDeviceID(deviceID, &card, &device, &subdevice, isMidi);
-- getDeviceString(buffer, card, device, subdevice, usePlugHw, isMidi);
-- }
--}
--
--
--static int hasGottenALSAVersion = FALSE;
--#define ALSAVersionString_LENGTH 200
--static char ALSAVersionString[ALSAVersionString_LENGTH];
--
--void getALSAVersion(char* buffer, int len) {
-- if (!hasGottenALSAVersion) {
-- // get alsa version from proc interface
-- FILE* file;
-- int curr, len, totalLen, inVersionString;
-- file = fopen(ALSA_VERSION_PROC_FILE, "r");
-- ALSAVersionString[0] = 0;
-- if (file) {
-- fgets(ALSAVersionString, ALSAVersionString_LENGTH, file);
-- // parse for version number
-- totalLen = strlen(ALSAVersionString);
-- inVersionString = FALSE;
-- len = 0;
-- curr = 0;
-- while (curr < totalLen) {
-- if (!inVersionString) {
-- // is this char the beginning of a version string ?
-- if (ALSAVersionString[curr] >= '0'
-- && ALSAVersionString[curr] <= '9') {
-- inVersionString = TRUE;
-- }
-- }
-- if (inVersionString) {
-- // the version string ends with white space
-- if (ALSAVersionString[curr] <= 32) {
-- break;
-- }
-- if (curr != len) {
-- // copy this char to the beginning of the string
-- ALSAVersionString[len] = ALSAVersionString[curr];
-- }
-- len++;
-- }
-- curr++;
-- }
-- // remove trailing dots
-- while ((len > 0) && (ALSAVersionString[len - 1] == '.')) {
-- len--;
-- }
-- // null terminate
-- ALSAVersionString[len] = 0;
-- }
-- hasGottenALSAVersion = TRUE;
-- }
-- strncpy(buffer, ALSAVersionString, len);
--}
--
--
--/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_CommonUtils.h 1969-12-31 16:00:00.000000000 -0800
-@@ -1,82 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#include <alsa/asoundlib.h>
--#include "Utilities.h"
--
--#ifndef PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
--#define PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
--
--#define ALSA_VERSION_PROC_FILE "/proc/asound/version"
--#define ALSA_HARDWARE "hw"
--#define ALSA_HARDWARE_CARD ALSA_HARDWARE":%d"
--#define ALSA_HARDWARE_DEVICE ALSA_HARDWARE_CARD",%d"
--#define ALSA_HARDWARE_SUBDEVICE ALSA_HARDWARE_DEVICE",%d"
--
--#define ALSA_PLUGHARDWARE "plughw"
--#define ALSA_DEFAULT_DEVICE_NAME "default"
--
--#define ALSA_DEFAULT_DEVICE_ID (0)
--
--#define ALSA_PCM (0)
--#define ALSA_RAWMIDI (1)
--
--// for use in info objects
--#define ALSA_VENDOR "ALSA (http://www.alsa-project.org)"
--
--// Environment variable for inclusion of subdevices in device listing.
--// If this variable is unset or "no", then subdevices are ignored, and
--// it's ALSA's choice which one to use (enables hardware mixing)
--#define ENV_ENUMERATE_PCM_SUBDEVICES "ALSA_ENUMERATE_PCM_SUBDEVICES"
--
--// if defined, subdevices are listed.
--//#undef ALSA_MIDI_ENUMERATE_SUBDEVICES
--#define ALSA_MIDI_ENUMERATE_SUBDEVICES
--
--// must be called before any ALSA calls
--void initAlsaSupport();
--
--/* if true (non-zero), ALSA sub devices should be listed as separate devices
-- */
--int needEnumerateSubdevices(int isMidi);
--
--
--/*
-- * deviceID contains packed card, device and subdevice numbers
-- * each number takes 10 bits
-- * "default" device has id == ALSA_DEFAULT_DEVICE_ID
-- */
--UINT32 encodeDeviceID(int card, int device, int subdevice);
--
--void decodeDeviceID(UINT32 deviceID, int* card, int* device, int* subdevice,
-- int isMidi);
--
--void getDeviceStringFromDeviceID(char* buffer, UINT32 deviceID,
-- int usePlugHw, int isMidi);
--
--void getALSAVersion(char* buffer, int len);
--
--
--#endif // PLATFORM_API_BSDOS_ALSA_COMMONUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiIn.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,322 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#define USE_ERROR
--#define USE_TRACE
--
--#if USE_PLATFORM_MIDI_IN == TRUE
--
--
--#include <alsa/asoundlib.h>
--#include "PlatformMidi.h"
--#include "PLATFORM_API_BsdOS_ALSA_MidiUtils.h"
--
--/*
-- * Helper methods
-- */
--
--static inline UINT32 packMessage(int status, int data1, int data2) {
-- return ((status & 0xFF) | ((data1 & 0xFF) << 8) | ((data2 & 0xFF) << 16));
--}
--
--
--static void setShortMessage(MidiMessage* message,
-- int status, int data1, int data2) {
-- message->type = SHORT_MESSAGE;
-- message->data.s.packedMsg = packMessage(status, data1, data2);
--}
--
--
--static void setRealtimeMessage(MidiMessage* message, int status) {
-- setShortMessage(message, status, 0, 0);
--}
--
--
--static void set14bitMessage(MidiMessage* message, int status, int value) {
-- TRACE3("14bit value: %d, lsb: %d, msb: %d\n", value, value & 0x7F, (value >> 7) & 0x7F);
-- value &= 0x3FFF;
-- TRACE3("14bit value (2): %d, lsb: %d, msb: %d\n", value, value & 0x7F, (value >> 7) & 0x7F);
-- setShortMessage(message, status,
-- value & 0x7F,
-- (value >> 7) & 0x7F);
--}
--
--
--/*
-- * implementation of the platform-dependent
-- * MIDI in functions declared in PlatformMidi.h
-- */
--
--char* MIDI_IN_GetErrorStr(INT32 err) {
-- return (char*) getErrorStr(err);
--}
--
--
--INT32 MIDI_IN_GetNumDevices() {
-- TRACE0("MIDI_IN_GetNumDevices()\n");
-- return getMidiDeviceCount(SND_RAWMIDI_STREAM_INPUT);
--}
--
--
--INT32 MIDI_IN_GetDeviceName(INT32 deviceIndex, char *name, UINT32 nameLength) {
-- int ret = getMidiDeviceName(SND_RAWMIDI_STREAM_INPUT, deviceIndex,
-- name, nameLength);
-- return ret;
--}
--
--
--INT32 MIDI_IN_GetDeviceVendor(INT32 deviceIndex, char *name, UINT32 nameLength) {
-- int ret = getMidiDeviceVendor(deviceIndex, name, nameLength);
-- return ret;
--}
--
--
--INT32 MIDI_IN_GetDeviceDescription(INT32 deviceIndex, char *name, UINT32 nameLength) {
-- int ret = getMidiDeviceDescription(SND_RAWMIDI_STREAM_INPUT, deviceIndex,
-- name, nameLength);
-- return ret;
--}
--
--
--INT32 MIDI_IN_GetDeviceVersion(INT32 deviceIndex, char *name, UINT32 nameLength) {
-- int ret = getMidiDeviceVersion(deviceIndex, name, nameLength);
-- return ret;
--}
--
--/*************************************************************************/
--
--INT32 MIDI_IN_OpenDevice(INT32 deviceIndex, MidiDeviceHandle** handle) {
-- INT32 ret;
-- TRACE0("> MIDI_IN_OpenDevice\n");
-- ret = openMidiDevice(SND_RAWMIDI_STREAM_INPUT, deviceIndex, handle);
-- TRACE1("< MIDI_IN_OpenDevice: returning %d\n", (int) ret);
-- return ret;
--}
--
--
--INT32 MIDI_IN_CloseDevice(MidiDeviceHandle* handle) {
-- INT32 ret;
-- TRACE0("> MIDI_IN_CloseDevice\n");
-- ret = closeMidiDevice(handle);
-- TRACE1("< MIDI_IN_CloseDevice: returning %d\n", (int) ret);
-- return ret;
--}
--
--
--INT32 MIDI_IN_StartDevice(MidiDeviceHandle* handle) {
-- TRACE0("MIDI_IN_StartDevice\n");
-- return MIDI_SUCCESS;
--}
--
--
--INT32 MIDI_IN_StopDevice(MidiDeviceHandle* handle) {
-- TRACE0("MIDI_IN_StopDevice\n");
-- return MIDI_SUCCESS;
--}
--
--
--INT64 MIDI_IN_GetTimeStamp(MidiDeviceHandle* handle) {
-- return getMidiTimestamp(handle);
--}
--
--
--/* read the next message from the queue */
--MidiMessage* MIDI_IN_GetMessage(MidiDeviceHandle* handle) {
-- snd_seq_event_t alsa_message;
-- MidiMessage* jdk_message;
-- int err;
-- char buffer[1];
-- int status;
--
-- TRACE0("> MIDI_IN_GetMessage\n");
-- if (!handle) {
-- ERROR0("< ERROR: MIDI_IN_GetMessage(): handle is NULL\n");
-- return NULL;
-- }
-- if (!handle->deviceHandle) {
-- ERROR0("< ERROR: MIDI_IN_GetMessage(): native handle is NULL\n");
-- return NULL;
-- }
-- if (!handle->platformData) {
-- ERROR0("< ERROR: MIDI_IN_GetMessage(): platformData is NULL\n");
-- return NULL;
-- }
--
-- /* For MIDI In, the device is left in non blocking mode. So if there is
-- no data from the device, snd_rawmidi_read() returns with -11 (EAGAIN).
-- This results in jumping back to the Java layer. */
-- while (TRUE) {
-- TRACE0("before snd_rawmidi_read()\n");
-- err = snd_rawmidi_read((snd_rawmidi_t*) handle->deviceHandle, buffer, 1);
-- TRACE0("after snd_rawmidi_read()\n");
-- if (err != 1) {
-- ERROR2("< ERROR: MIDI_IN_GetMessage(): snd_rawmidi_read() returned %d : %s\n", err, snd_strerror(err));
-- return NULL;
-- }
-- // printf("received byte: %d\n", buffer[0]);
-- err = snd_midi_event_encode_byte((snd_midi_event_t*) handle->platformData,
-- (int) buffer[0],
-- &alsa_message);
-- if (err == 1) {
-- break;
-- } else if (err < 0) {
-- ERROR1("< ERROR: MIDI_IN_GetMessage(): snd_midi_event_encode_byte() returned %d\n", err);
-- return NULL;
-- }
-- }
-- jdk_message = (MidiMessage*) calloc(sizeof(MidiMessage), 1);
-- if (!jdk_message) {
-- ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
-- return NULL;
-- }
-- // TODO: tra
-- switch (alsa_message.type) {
-- case SND_SEQ_EVENT_NOTEON:
-- case SND_SEQ_EVENT_NOTEOFF:
-- case SND_SEQ_EVENT_KEYPRESS:
-- status = (alsa_message.type == SND_SEQ_EVENT_KEYPRESS) ? 0xA0 :
-- (alsa_message.type == SND_SEQ_EVENT_NOTEON) ? 0x90 : 0x80;
-- status |= alsa_message.data.note.channel;
-- setShortMessage(jdk_message, status,
-- alsa_message.data.note.note,
-- alsa_message.data.note.velocity);
-- break;
--
-- case SND_SEQ_EVENT_CONTROLLER:
-- status = 0xB0 | alsa_message.data.control.channel;
-- setShortMessage(jdk_message, status,
-- alsa_message.data.control.param,
-- alsa_message.data.control.value);
-- break;
--
-- case SND_SEQ_EVENT_PGMCHANGE:
-- case SND_SEQ_EVENT_CHANPRESS:
-- status = (alsa_message.type == SND_SEQ_EVENT_PGMCHANGE) ? 0xC0 : 0xD0;
-- status |= alsa_message.data.control.channel;
-- setShortMessage(jdk_message, status,
-- alsa_message.data.control.value, 0);
-- break;
--
-- case SND_SEQ_EVENT_PITCHBEND:
-- status = 0xE0 | alsa_message.data.control.channel;
-- // $$mp 2003-09-23:
-- // possible hack to work around a bug in ALSA. Necessary for
-- // ALSA 0.9.2. May be fixed in newer versions of ALSA.
-- // alsa_message.data.control.value ^= 0x2000;
-- // TRACE1("pitchbend value: %d\n", alsa_message.data.control.value);
-- set14bitMessage(jdk_message, status,
-- alsa_message.data.control.value);
-- break;
--
-- /* System exclusive messages */
--
-- case SND_SEQ_EVENT_SYSEX:
-- jdk_message->type = LONG_MESSAGE;
-- jdk_message->data.l.size = alsa_message.data.ext.len;
-- jdk_message->data.l.data = malloc(alsa_message.data.ext.len);
-- if (jdk_message->data.l.data == NULL) {
-- ERROR0("< ERROR: MIDI_IN_GetMessage(): out of memory\n");
-- free(jdk_message);
-- jdk_message = NULL;
-- } else {
-- memcpy(jdk_message->data.l.data, alsa_message.data.ext.ptr, alsa_message.data.ext.len);
-- }
-- break;
--
-- /* System common messages */
--
-- case SND_SEQ_EVENT_QFRAME:
-- setShortMessage(jdk_message, 0xF1,
-- alsa_message.data.control.value & 0x7F, 0);
-- break;
--
-- case SND_SEQ_EVENT_SONGPOS:
-- set14bitMessage(jdk_message, 0xF2,
-- alsa_message.data.control.value);
-- break;
--
-- case SND_SEQ_EVENT_SONGSEL:
-- setShortMessage(jdk_message, 0xF3,
-- alsa_message.data.control.value & 0x7F, 0);
-- break;
--
-- case SND_SEQ_EVENT_TUNE_REQUEST:
-- setRealtimeMessage(jdk_message, 0xF6);
-- break;
--
-- /* System realtime messages */
--
-- case SND_SEQ_EVENT_CLOCK:
-- setRealtimeMessage(jdk_message, 0xF8);
-- break;
--
-- case SND_SEQ_EVENT_START:
-- setRealtimeMessage(jdk_message, 0xFA);
-- break;
--
-- case SND_SEQ_EVENT_CONTINUE:
-- setRealtimeMessage(jdk_message, 0xFB);
-- break;
--
-- case SND_SEQ_EVENT_STOP:
-- setRealtimeMessage(jdk_message, 0xFC);
-- break;
--
-- case SND_SEQ_EVENT_SENSING:
-- setRealtimeMessage(jdk_message, 0xFE);
-- break;
--
-- case SND_SEQ_EVENT_RESET:
-- setRealtimeMessage(jdk_message, 0xFF);
-- break;
--
-- default:
-- ERROR0("< ERROR: MIDI_IN_GetMessage(): unhandled ALSA MIDI message type\n");
-- free(jdk_message);
-- jdk_message = NULL;
--
-- }
--
-- // set timestamp
-- if (jdk_message != NULL) {
-- jdk_message->timestamp = getMidiTimestamp(handle);
-- }
-- TRACE1("< MIDI_IN_GetMessage: returning %p\n", jdk_message);
-- return jdk_message;
--}
--
--
--void MIDI_IN_ReleaseMessage(MidiDeviceHandle* handle, MidiMessage* msg) {
-- if (!msg) {
-- ERROR0("< ERROR: MIDI_IN_ReleaseMessage(): message is NULL\n");
-- return;
-- }
-- if (msg->type == LONG_MESSAGE && msg->data.l.data) {
-- free(msg->data.l.data);
-- }
-- free(msg);
--}
--
--#endif /* USE_PLATFORM_MIDI_IN */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiOut.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,179 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#define USE_ERROR
--#define USE_TRACE
--
--#if USE_PLATFORM_MIDI_OUT == TRUE
--
--#include <alsa/asoundlib.h>
--#include "PlatformMidi.h"
--#include "PLATFORM_API_BsdOS_ALSA_MidiUtils.h"
--
--
--
--static int CHANNEL_MESSAGE_LENGTH[] = {
-- -1, -1, -1, -1, -1, -1, -1, -1, 3, 3, 3, 3, 2, 2, 3 };
--/* 8x 9x Ax Bx Cx Dx Ex */
--
--static int SYSTEM_MESSAGE_LENGTH[] = {
-- -1, 2, 3, 2, -1, -1, 1, 1, 1, -1, 1, 1, 1, -1, 1, 1 };
--/* F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF */
--
--
--// the returned length includes the status byte.
--// for illegal messages, -1 is returned.
--static int getShortMessageLength(int status) {
-- int dataLength = 0;
-- if (status < 0xF0) { // channel voice message
-- dataLength = CHANNEL_MESSAGE_LENGTH[(status >> 4) & 0xF];
-- } else {
-- dataLength = SYSTEM_MESSAGE_LENGTH[status & 0xF];
-- }
-- return dataLength;
--}
--
--
--/*
-- * implementation of the platform-dependent
-- * MIDI out functions declared in PlatformMidi.h
-- */
--char* MIDI_OUT_GetErrorStr(INT32 err) {
-- return (char*) getErrorStr(err);
--}
--
--
--INT32 MIDI_OUT_GetNumDevices() {
-- TRACE0("MIDI_OUT_GetNumDevices()\n");
-- return getMidiDeviceCount(SND_RAWMIDI_STREAM_OUTPUT);
--}
--
--
--INT32 MIDI_OUT_GetDeviceName(INT32 deviceIndex, char *name, UINT32 nameLength) {
-- TRACE0("MIDI_OUT_GetDeviceName()\n");
-- return getMidiDeviceName(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex,
-- name, nameLength);
--}
--
--
--INT32 MIDI_OUT_GetDeviceVendor(INT32 deviceIndex, char *name, UINT32 nameLength) {
-- TRACE0("MIDI_OUT_GetDeviceVendor()\n");
-- return getMidiDeviceVendor(deviceIndex, name, nameLength);
--}
--
--
--INT32 MIDI_OUT_GetDeviceDescription(INT32 deviceIndex, char *name, UINT32 nameLength) {
-- TRACE0("MIDI_OUT_GetDeviceDescription()\n");
-- return getMidiDeviceDescription(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex,
-- name, nameLength);
--}
--
--
--INT32 MIDI_OUT_GetDeviceVersion(INT32 deviceIndex, char *name, UINT32 nameLength) {
-- TRACE0("MIDI_OUT_GetDeviceVersion()\n");
-- return getMidiDeviceVersion(deviceIndex, name, nameLength);
--}
--
--
--/* *************************** MidiOutDevice implementation *************** */
--
--INT32 MIDI_OUT_OpenDevice(INT32 deviceIndex, MidiDeviceHandle** handle) {
-- TRACE1("MIDI_OUT_OpenDevice(): deviceIndex: %d\n", (int) deviceIndex);
-- return openMidiDevice(SND_RAWMIDI_STREAM_OUTPUT, deviceIndex, handle);
--}
--
--
--INT32 MIDI_OUT_CloseDevice(MidiDeviceHandle* handle) {
-- TRACE0("MIDI_OUT_CloseDevice()\n");
-- return closeMidiDevice(handle);
--}
--
--
--INT64 MIDI_OUT_GetTimeStamp(MidiDeviceHandle* handle) {
-- return getMidiTimestamp(handle);
--}
--
--
--INT32 MIDI_OUT_SendShortMessage(MidiDeviceHandle* handle, UINT32 packedMsg,
-- UINT32 timestamp) {
-- int err;
-- int status;
-- int data1;
-- int data2;
-- char buffer[3];
--
-- TRACE2("> MIDI_OUT_SendShortMessage() %x, time: %u\n", packedMsg, (unsigned int) timestamp);
-- if (!handle) {
-- ERROR0("< ERROR: MIDI_OUT_SendShortMessage(): handle is NULL\n");
-- return MIDI_INVALID_HANDLE;
-- }
-- if (!handle->deviceHandle) {
-- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): native handle is NULL\n");
-- return MIDI_INVALID_HANDLE;
-- }
-- status = (packedMsg & 0xFF);
-- buffer[0] = (char) status;
-- buffer[1] = (char) ((packedMsg >> 8) & 0xFF);
-- buffer[2] = (char) ((packedMsg >> 16) & 0xFF);
-- TRACE4("status: %d, data1: %d, data2: %d, length: %d\n", (int) buffer[0], (int) buffer[1], (int) buffer[2], getShortMessageLength(status));
-- err = snd_rawmidi_write((snd_rawmidi_t*) handle->deviceHandle, buffer, getShortMessageLength(status));
-- if (err < 0) {
-- ERROR1(" ERROR: MIDI_OUT_SendShortMessage(): snd_rawmidi_write() returned %d\n", err);
-- }
--
-- TRACE0("< MIDI_OUT_SendShortMessage()\n");
-- return err;
--}
--
--
--INT32 MIDI_OUT_SendLongMessage(MidiDeviceHandle* handle, UBYTE* data,
-- UINT32 size, UINT32 timestamp) {
-- int err;
--
-- TRACE2("> MIDI_OUT_SendLongMessage() size %u, time: %u\n", (unsigned int) size, (unsigned int) timestamp);
-- if (!handle) {
-- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): handle is NULL\n");
-- return MIDI_INVALID_HANDLE;
-- }
-- if (!handle->deviceHandle) {
-- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): native handle is NULL\n");
-- return MIDI_INVALID_HANDLE;
-- }
-- if (!data) {
-- ERROR0("< ERROR: MIDI_OUT_SendLongMessage(): data is NULL\n");
-- return MIDI_INVALID_HANDLE;
-- }
-- err = snd_rawmidi_write((snd_rawmidi_t*) handle->deviceHandle,
-- data, size);
-- if (err < 0) {
-- ERROR1(" ERROR: MIDI_OUT_SendLongMessage(): snd_rawmidi_write() returned %d\n", err);
-- }
--
-- TRACE0("< MIDI_OUT_SendLongMessage()\n");
-- return err;
--}
--
--
--#endif /* USE_PLATFORM_MIDI_OUT */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,480 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#define USE_ERROR
--#define USE_TRACE
--
--#include "PLATFORM_API_BsdOS_ALSA_MidiUtils.h"
--#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
--#include <string.h>
--#include <sys/time.h>
--
--static INT64 getTimeInMicroseconds() {
-- struct timeval tv;
--
-- gettimeofday(&tv, NULL);
-- return (tv.tv_sec * 1000000UL) + tv.tv_usec;
--}
--
--
--const char* getErrorStr(INT32 err) {
-- return snd_strerror((int) err);
--}
--
--
--
--// callback for iteration through devices
--// returns TRUE if iteration should continue
--typedef int (*DeviceIteratorPtr)(UINT32 deviceID,
-- snd_rawmidi_info_t* rawmidi_info,
-- snd_ctl_card_info_t* cardinfo,
-- void *userData);
--
--// for each ALSA device, call iterator. userData is passed to the iterator
--// returns total number of iterations
--static int iterateRawmidiDevices(snd_rawmidi_stream_t direction,
-- DeviceIteratorPtr iterator,
-- void* userData) {
-- int count = 0;
-- int subdeviceCount;
-- int card, dev, subDev;
-- char devname[16];
-- int err;
-- snd_ctl_t *handle;
-- snd_rawmidi_t *rawmidi;
-- snd_rawmidi_info_t *rawmidi_info;
-- snd_ctl_card_info_t *card_info, *defcardinfo = NULL;
-- UINT32 deviceID;
-- int doContinue = TRUE;
--
-- snd_rawmidi_info_malloc(&rawmidi_info);
-- snd_ctl_card_info_malloc(&card_info);
--
-- // 1st try "default" device
-- if (direction == SND_RAWMIDI_STREAM_INPUT) {
-- err = snd_rawmidi_open(&rawmidi, NULL, ALSA_DEFAULT_DEVICE_NAME,
-- SND_RAWMIDI_NONBLOCK);
-- } else if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
-- err = snd_rawmidi_open(NULL, &rawmidi, ALSA_DEFAULT_DEVICE_NAME,
-- SND_RAWMIDI_NONBLOCK);
-- } else {
-- ERROR0("ERROR: iterateRawmidiDevices(): direction is neither"
-- " SND_RAWMIDI_STREAM_INPUT nor SND_RAWMIDI_STREAM_OUTPUT\n");
-- err = MIDI_INVALID_ARGUMENT;
-- }
-- if (err < 0) {
-- ERROR1("ERROR: snd_rawmidi_open (\"default\"): %s\n",
-- snd_strerror(err));
-- } else {
-- err = snd_rawmidi_info(rawmidi, rawmidi_info);
--
-- snd_rawmidi_close(rawmidi);
-- if (err < 0) {
-- ERROR1("ERROR: snd_rawmidi_info (\"default\"): %s\n",
-- snd_strerror(err));
-- } else {
-- // try to get card info
-- card = snd_rawmidi_info_get_card(rawmidi_info);
-- if (card >= 0) {
-- sprintf(devname, ALSA_HARDWARE_CARD, card);
-- if (snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK) >= 0) {
-- if (snd_ctl_card_info(handle, card_info) >= 0) {
-- defcardinfo = card_info;
-- }
-- snd_ctl_close(handle);
-- }
-- }
-- // call calback function for the device
-- if (iterator != NULL) {
-- doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, rawmidi_info,
-- defcardinfo, userData);
-- }
-- count++;
-- }
-- }
--
-- // iterate cards
-- card = -1;
-- TRACE0("testing for cards...\n");
-- if (snd_card_next(&card) >= 0) {
-- TRACE1("Found card %d\n", card);
-- while (doContinue && (card >= 0)) {
-- sprintf(devname, ALSA_HARDWARE_CARD, card);
-- TRACE1("Opening control for alsa rawmidi device \"%s\"...\n", devname);
-- err = snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK);
-- if (err < 0) {
-- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", card, snd_strerror(err));
-- } else {
-- TRACE0("snd_ctl_open() SUCCESS\n");
-- err = snd_ctl_card_info(handle, card_info);
-- if (err < 0) {
-- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n", card, snd_strerror(err));
-- } else {
-- TRACE0("snd_ctl_card_info() SUCCESS\n");
-- dev = -1;
-- while (doContinue) {
-- if (snd_ctl_rawmidi_next_device(handle, &dev) < 0) {
-- ERROR0("snd_ctl_rawmidi_next_device\n");
-- }
-- TRACE0("snd_ctl_rawmidi_next_device() SUCCESS\n");
-- if (dev < 0) {
-- break;
-- }
-- snd_rawmidi_info_set_device(rawmidi_info, dev);
-- snd_rawmidi_info_set_subdevice(rawmidi_info, 0);
-- snd_rawmidi_info_set_stream(rawmidi_info, direction);
-- err = snd_ctl_rawmidi_info(handle, rawmidi_info);
-- TRACE0("after snd_ctl_rawmidi_info()\n");
-- if (err < 0) {
-- if (err != -ENOENT) {
-- ERROR2("ERROR: snd_ctl_rawmidi_info, card=%d: %s", card, snd_strerror(err));
-- }
-- } else {
-- TRACE0("snd_ctl_rawmidi_info() SUCCESS\n");
-- subdeviceCount = needEnumerateSubdevices(ALSA_RAWMIDI)
-- ? snd_rawmidi_info_get_subdevices_count(rawmidi_info)
-- : 1;
-- if (iterator!=NULL) {
-- for (subDev = 0; subDev < subdeviceCount; subDev++) {
-- TRACE3(" Iterating %d,%d,%d\n", card, dev, subDev);
-- deviceID = encodeDeviceID(card, dev, subDev);
-- doContinue = (*iterator)(deviceID, rawmidi_info,
-- card_info, userData);
-- count++;
-- TRACE0("returned from iterator\n");
-- if (!doContinue) {
-- break;
-- }
-- }
-- } else {
-- count += subdeviceCount;
-- }
-- }
-- } // of while(doContinue)
-- }
-- snd_ctl_close(handle);
-- }
-- if (snd_card_next(&card) < 0) {
-- break;
-- }
-- }
-- } else {
-- ERROR0("No cards found!\n");
-- }
-- snd_ctl_card_info_free(card_info);
-- snd_rawmidi_info_free(rawmidi_info);
-- return count;
--}
--
--
--
--int getMidiDeviceCount(snd_rawmidi_stream_t direction) {
-- int deviceCount;
-- TRACE0("> getMidiDeviceCount()\n");
-- initAlsaSupport();
-- deviceCount = iterateRawmidiDevices(direction, NULL, NULL);
-- TRACE0("< getMidiDeviceCount()\n");
-- return deviceCount;
--}
--
--
--
--/*
-- userData is assumed to be a pointer to ALSA_MIDIDeviceDescription.
-- ALSA_MIDIDeviceDescription->index has to be set to the index of the device
-- we want to get information of before this method is called the first time via
-- iterateRawmidiDevices(). On each call of this method,
-- ALSA_MIDIDeviceDescription->index is decremented. If it is equal to zero,
-- we have reached the desired device, so action is taken.
-- So after successful completion of iterateRawmidiDevices(),
-- ALSA_MIDIDeviceDescription->index is zero. If it isn't, this is an
-- indication of an error.
--*/
--static int deviceInfoIterator(UINT32 deviceID, snd_rawmidi_info_t *rawmidi_info,
-- snd_ctl_card_info_t *cardinfo, void *userData) {
-- char buffer[300];
-- ALSA_MIDIDeviceDescription* desc = (ALSA_MIDIDeviceDescription*)userData;
--#ifdef ALSA_MIDI_USE_PLUGHW
-- int usePlugHw = 1;
--#else
-- int usePlugHw = 0;
--#endif
--
-- TRACE0("deviceInfoIterator\n");
-- initAlsaSupport();
-- if (desc->index == 0) {
-- // we found the device with correct index
-- desc->deviceID = deviceID;
--
-- buffer[0]=' '; buffer[1]='[';
-- getDeviceStringFromDeviceID(&buffer[2], deviceID, usePlugHw, ALSA_RAWMIDI);
-- strcat(buffer, "]");
-- strncpy(desc->name,
-- (cardinfo != NULL)
-- ? snd_ctl_card_info_get_id(cardinfo)
-- : snd_rawmidi_info_get_id(rawmidi_info),
-- desc->strLen - strlen(buffer));
-- strncat(desc->name, buffer, desc->strLen - strlen(desc->name));
-- desc->description[0] = 0;
-- if (cardinfo != NULL) {
-- strncpy(desc->description, snd_ctl_card_info_get_name(cardinfo),
-- desc->strLen);
-- strncat(desc->description, ", ",
-- desc->strLen - strlen(desc->description));
-- }
-- strncat(desc->description, snd_rawmidi_info_get_id(rawmidi_info),
-- desc->strLen - strlen(desc->description));
-- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
-- strncat(desc->description, snd_rawmidi_info_get_name(rawmidi_info),
-- desc->strLen - strlen(desc->description));
-- TRACE2("Returning %s, %s\n", desc->name, desc->description);
-- return FALSE; // do not continue iteration
-- }
-- desc->index--;
-- return TRUE;
--}
--
--
--static int getMIDIDeviceDescriptionByIndex(snd_rawmidi_stream_t direction,
-- ALSA_MIDIDeviceDescription* desc) {
-- initAlsaSupport();
-- TRACE1(" getMIDIDeviceDescriptionByIndex (index = %d)\n", desc->index);
-- iterateRawmidiDevices(direction, &deviceInfoIterator, desc);
-- return (desc->index == 0) ? MIDI_SUCCESS : MIDI_INVALID_DEVICEID;
--}
--
--
--
--int initMIDIDeviceDescription(ALSA_MIDIDeviceDescription* desc, int index) {
-- int ret = MIDI_SUCCESS;
-- desc->index = index;
-- desc->strLen = 200;
-- desc->name = (char*) calloc(desc->strLen + 1, 1);
-- desc->description = (char*) calloc(desc->strLen + 1, 1);
-- if (! desc->name ||
-- ! desc->description) {
-- ret = MIDI_OUT_OF_MEMORY;
-- }
-- return ret;
--}
--
--
--void freeMIDIDeviceDescription(ALSA_MIDIDeviceDescription* desc) {
-- if (desc->name) {
-- free(desc->name);
-- }
-- if (desc->description) {
-- free(desc->description);
-- }
--}
--
--
--int getMidiDeviceName(snd_rawmidi_stream_t direction, int index, char *name,
-- UINT32 nameLength) {
-- ALSA_MIDIDeviceDescription desc;
-- int ret;
--
-- TRACE1("getMidiDeviceName: nameLength: %d\n", (int) nameLength);
-- ret = initMIDIDeviceDescription(&desc, index);
-- if (ret == MIDI_SUCCESS) {
-- TRACE0("getMidiDeviceName: initMIDIDeviceDescription() SUCCESS\n");
-- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
-- if (ret == MIDI_SUCCESS) {
-- TRACE1("getMidiDeviceName: desc.name: %s\n", desc.name);
-- strncpy(name, desc.name, nameLength - 1);
-- name[nameLength - 1] = 0;
-- }
-- }
-- freeMIDIDeviceDescription(&desc);
-- return ret;
--}
--
--
--int getMidiDeviceVendor(int index, char *name, UINT32 nameLength) {
-- strncpy(name, ALSA_VENDOR, nameLength - 1);
-- name[nameLength - 1] = 0;
-- return MIDI_SUCCESS;
--}
--
--
--int getMidiDeviceDescription(snd_rawmidi_stream_t direction,
-- int index, char *name, UINT32 nameLength) {
-- ALSA_MIDIDeviceDescription desc;
-- int ret;
--
-- ret = initMIDIDeviceDescription(&desc, index);
-- if (ret == MIDI_SUCCESS) {
-- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
-- if (ret == MIDI_SUCCESS) {
-- strncpy(name, desc.description, nameLength - 1);
-- name[nameLength - 1] = 0;
-- }
-- }
-- freeMIDIDeviceDescription(&desc);
-- return ret;
--}
--
--
--int getMidiDeviceVersion(int index, char *name, UINT32 nameLength) {
-- getALSAVersion(name, nameLength);
-- return MIDI_SUCCESS;
--}
--
--
--static int getMidiDeviceID(snd_rawmidi_stream_t direction, int index,
-- UINT32* deviceID) {
-- ALSA_MIDIDeviceDescription desc;
-- int ret;
--
-- ret = initMIDIDeviceDescription(&desc, index);
-- if (ret == MIDI_SUCCESS) {
-- ret = getMIDIDeviceDescriptionByIndex(direction, &desc);
-- if (ret == MIDI_SUCCESS) {
-- // TRACE1("getMidiDeviceName: desc.name: %s\n", desc.name);
-- *deviceID = desc.deviceID;
-- }
-- }
-- freeMIDIDeviceDescription(&desc);
-- return ret;
--}
--
--
--/*
-- direction has to be either SND_RAWMIDI_STREAM_INPUT or
-- SND_RAWMIDI_STREAM_OUTPUT.
-- Returns 0 on success. Otherwise, MIDI_OUT_OF_MEMORY, MIDI_INVALID_ARGUMENT
-- or a negative ALSA error code is returned.
--*/
--INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
-- MidiDeviceHandle** handle) {
-- snd_rawmidi_t* native_handle;
-- snd_midi_event_t* event_parser = NULL;
-- int err;
-- UINT32 deviceID;
-- char devicename[100];
--#ifdef ALSA_MIDI_USE_PLUGHW
-- int usePlugHw = 1;
--#else
-- int usePlugHw = 0;
--#endif
--
-- TRACE0("> openMidiDevice()\n");
--
-- (*handle) = (MidiDeviceHandle*) calloc(sizeof(MidiDeviceHandle), 1);
-- if (!(*handle)) {
-- ERROR0("ERROR: openDevice: out of memory\n");
-- return MIDI_OUT_OF_MEMORY;
-- }
--
-- // TODO: iterate to get dev ID from index
-- err = getMidiDeviceID(direction, deviceIndex, &deviceID);
-- TRACE1(" openMidiDevice(): deviceID: %d\n", (int) deviceID);
-- getDeviceStringFromDeviceID(devicename, deviceID,
-- usePlugHw, ALSA_RAWMIDI);
-- TRACE1(" openMidiDevice(): deviceString: %s\n", devicename);
--
-- // finally open the device
-- if (direction == SND_RAWMIDI_STREAM_INPUT) {
-- err = snd_rawmidi_open(&native_handle, NULL, devicename,
-- SND_RAWMIDI_NONBLOCK);
-- } else if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
-- err = snd_rawmidi_open(NULL, &native_handle, devicename,
-- SND_RAWMIDI_NONBLOCK);
-- } else {
-- ERROR0(" ERROR: openMidiDevice(): direction is neither SND_RAWMIDI_STREAM_INPUT nor SND_RAWMIDI_STREAM_OUTPUT\n");
-- err = MIDI_INVALID_ARGUMENT;
-- }
-- if (err < 0) {
-- ERROR1("< ERROR: openMidiDevice(): snd_rawmidi_open() returned %d\n", err);
-- free(*handle);
-- (*handle) = NULL;
-- return err;
-- }
-- /* We opened with non-blocking behaviour to not get hung if the device
-- is used by a different process. Writing, however, should
-- be blocking. So we change it here. */
-- if (direction == SND_RAWMIDI_STREAM_OUTPUT) {
-- err = snd_rawmidi_nonblock(native_handle, 0);
-- if (err < 0) {
-- ERROR1(" ERROR: openMidiDevice(): snd_rawmidi_nonblock() returned %d\n", err);
-- snd_rawmidi_close(native_handle);
-- free(*handle);
-- (*handle) = NULL;
-- return err;
-- }
-- }
-- if (direction == SND_RAWMIDI_STREAM_INPUT) {
-- err = snd_midi_event_new(EVENT_PARSER_BUFSIZE, &event_parser);
-- if (err < 0) {
-- ERROR1(" ERROR: openMidiDevice(): snd_midi_event_new() returned %d\n", err);
-- snd_rawmidi_close(native_handle);
-- free(*handle);
-- (*handle) = NULL;
-- return err;
-- }
-- }
--
-- (*handle)->deviceHandle = (void*) native_handle;
-- (*handle)->startTime = getTimeInMicroseconds();
-- (*handle)->platformData = event_parser;
-- TRACE0("< openMidiDevice(): succeeded\n");
-- return err;
--}
--
--
--
--INT32 closeMidiDevice(MidiDeviceHandle* handle) {
-- int err;
--
-- TRACE0("> closeMidiDevice()\n");
-- if (!handle) {
-- ERROR0("< ERROR: closeMidiDevice(): handle is NULL\n");
-- return MIDI_INVALID_HANDLE;
-- }
-- if (!handle->deviceHandle) {
-- ERROR0("< ERROR: closeMidiDevice(): native handle is NULL\n");
-- return MIDI_INVALID_HANDLE;
-- }
-- err = snd_rawmidi_close((snd_rawmidi_t*) handle->deviceHandle);
-- TRACE1(" snd_rawmidi_close() returns %d\n", err);
-- if (handle->platformData) {
-- snd_midi_event_free((snd_midi_event_t*) handle->platformData);
-- }
-- free(handle);
-- TRACE0("< closeMidiDevice: succeeded\n");
-- return err;
--}
--
--
--INT64 getMidiTimestamp(MidiDeviceHandle* handle) {
-- if (!handle) {
-- ERROR0("< ERROR: closeMidiDevice(): handle is NULL\n");
-- return MIDI_INVALID_HANDLE;
-- }
-- return getTimeInMicroseconds() - handle->startTime;
--}
--
--
--/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_MidiUtils.h 1969-12-31 16:00:00.000000000 -0800
-@@ -1,85 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#include <alsa/asoundlib.h>
--#include "Utilities.h"
--#include "PlatformMidi.h"
--
--
--#ifndef PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
--#define PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
--
--#define EVENT_PARSER_BUFSIZE (2048)
--
--// if this is defined, use plughw: devices
--//#define ALSA_MIDI_USE_PLUGHW
--#undef ALSA_MIDI_USE_PLUGHW
--
--typedef struct tag_ALSA_MIDIDeviceDescription {
-- int index; // in
-- int strLen; // in
-- INT32 deviceID; // out
-- char* name; // out
-- char* description; // out
--} ALSA_MIDIDeviceDescription;
--
--
--const char* getErrorStr(INT32 err);
--
--/* Returns the number of devices. */
--/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
-- SND_RAWMIDI_STREAM_INPUT. */
--int getMidiDeviceCount(snd_rawmidi_stream_t direction);
--
--/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
--/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
-- SND_RAWMIDI_STREAM_INPUT. */
--int getMidiDeviceName(snd_rawmidi_stream_t direction, int index,
-- char *name, UINT32 nameLength);
--
--/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
--int getMidiDeviceVendor(int index, char *name, UINT32 nameLength);
--
--/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
--/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
-- SND_RAWMIDI_STREAM_INPUT. */
--int getMidiDeviceDescription(snd_rawmidi_stream_t direction, int index,
-- char *name, UINT32 nameLength);
--
--/* Returns MIDI_SUCCESS or MIDI_INVALID_DEVICEID */
--int getMidiDeviceVersion(int index, char *name, UINT32 nameLength);
--
--// returns 0 on success, otherwise MIDI_OUT_OF_MEMORY or ALSA error code
--/* direction is either SND_RAWMIDI_STREAM_OUTPUT or
-- SND_RAWMIDI_STREAM_INPUT. */
--INT32 openMidiDevice(snd_rawmidi_stream_t direction, INT32 deviceIndex,
-- MidiDeviceHandle** handle);
--
--// returns 0 on success, otherwise a (negative) ALSA error code
--INT32 closeMidiDevice(MidiDeviceHandle* handle);
--
--INT64 getMidiTimestamp(MidiDeviceHandle* handle);
--
--#endif // PLATFORM_API_BSDOS_ALSA_MIDIUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,938 +0,0 @@
--/*
-- * Copyright (c) 2002, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#define USE_ERROR
--#define USE_TRACE
--
--#include "PLATFORM_API_BsdOS_ALSA_PCMUtils.h"
--#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
--#include "DirectAudio.h"
--
--#if USE_DAUDIO == TRUE
--
--// GetPosition method 1: based on how many bytes are passed to the kernel driver
--// + does not need much processor resources
--// - not very exact, "jumps"
--// GetPosition method 2: ask kernel about actual position of playback.
--// - very exact
--// - switch to kernel layer for each call
--// GetPosition method 3: use snd_pcm_avail() call - not yet in official ALSA
--// quick tests on a Pentium 200MMX showed max. 1.5% processor usage
--// for playing back a CD-quality file and printing 20x per second a line
--// on the console with the current time. So I guess performance is not such a
--// factor here.
--//#define GET_POSITION_METHOD1
--#define GET_POSITION_METHOD2
--
--
--// The default time for a period in microseconds.
--// For very small buffers, only 2 periods are used.
--#define DEFAULT_PERIOD_TIME 20000 /* 20ms */
--
--///// implemented functions of DirectAudio.h
--
--INT32 DAUDIO_GetDirectAudioDeviceCount() {
-- return (INT32) getAudioDeviceCount();
--}
--
--
--INT32 DAUDIO_GetDirectAudioDeviceDescription(INT32 mixerIndex, DirectAudioDeviceDescription* description) {
-- ALSA_AudioDeviceDescription adesc;
--
-- adesc.index = (int) mixerIndex;
-- adesc.strLen = DAUDIO_STRING_LENGTH;
--
-- adesc.maxSimultaneousLines = (int*) (&(description->maxSimulLines));
-- adesc.deviceID = &(description->deviceID);
-- adesc.name = description->name;
-- adesc.vendor = description->vendor;
-- adesc.description = description->description;
-- adesc.version = description->version;
--
-- return getAudioDeviceDescriptionByIndex(&adesc);
--}
--
--#define MAX_BIT_INDEX 6
--// returns
--// 6: for anything above 24-bit
--// 5: for 4 bytes sample size, 24-bit
--// 4: for 3 bytes sample size, 24-bit
--// 3: for 3 bytes sample size, 20-bit
--// 2: for 2 bytes sample size, 16-bit
--// 1: for 1 byte sample size, 8-bit
--// 0: for anything else
--int getBitIndex(int sampleSizeInBytes, int significantBits) {
-- if (significantBits > 24) return 6;
-- if (sampleSizeInBytes == 4 && significantBits == 24) return 5;
-- if (sampleSizeInBytes == 3) {
-- if (significantBits == 24) return 4;
-- if (significantBits == 20) return 3;
-- }
-- if (sampleSizeInBytes == 2 && significantBits == 16) return 2;
-- if (sampleSizeInBytes == 1 && significantBits == 8) return 1;
-- return 0;
--}
--
--int getSampleSizeInBytes(int bitIndex, int sampleSizeInBytes) {
-- switch(bitIndex) {
-- case 1: return 1;
-- case 2: return 2;
-- case 3: /* fall through */
-- case 4: return 3;
-- case 5: return 4;
-- }
-- return sampleSizeInBytes;
--}
--
--int getSignificantBits(int bitIndex, int significantBits) {
-- switch(bitIndex) {
-- case 1: return 8;
-- case 2: return 16;
-- case 3: return 20;
-- case 4: /* fall through */
-- case 5: return 24;
-- }
-- return significantBits;
--}
--
--void DAUDIO_GetFormats(INT32 mixerIndex, INT32 deviceID, int isSource, void* creator) {
-- snd_pcm_t* handle;
-- snd_pcm_format_mask_t* formatMask;
-- snd_pcm_format_t format;
-- snd_pcm_hw_params_t* hwParams;
-- int handledBits[MAX_BIT_INDEX+1];
--
-- int ret;
-- int sampleSizeInBytes, significantBits, isSigned, isBigEndian, enc;
-- int origSampleSizeInBytes, origSignificantBits;
-- int channels, minChannels, maxChannels;
-- int rate, bitIndex;
--
-- for (bitIndex = 0; bitIndex <= MAX_BIT_INDEX; bitIndex++) handledBits[bitIndex] = FALSE;
-- if (openPCMfromDeviceID(deviceID, &handle, isSource, TRUE /*query hardware*/) < 0) {
-- return;
-- }
-- ret = snd_pcm_format_mask_malloc(&formatMask);
-- if (ret != 0) {
-- ERROR1("snd_pcm_format_mask_malloc returned error %d\n", ret);
-- } else {
-- ret = snd_pcm_hw_params_malloc(&hwParams);
-- if (ret != 0) {
-- ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
-- } else {
-- ret = snd_pcm_hw_params_any(handle, hwParams);
-- /* snd_pcm_hw_params_any can return a positive value on success too */
-- if (ret < 0) {
-- ERROR1("snd_pcm_hw_params_any returned error %d\n", ret);
-- } else {
-- /* for the logic following this code, set ret to 0 to indicate success */
-- ret = 0;
-- }
-- }
-- snd_pcm_hw_params_get_format_mask(hwParams, formatMask);
--#ifdef ALSA_PCM_NEW_HW_PARAMS_API
-- if (ret == 0) {
-- ret = snd_pcm_hw_params_get_channels_min(hwParams, &minChannels);
-- if (ret != 0) {
-- ERROR1("snd_pcm_hw_params_get_channels_min returned error %d\n", ret);
-- }
-- }
-- if (ret == 0) {
-- ret = snd_pcm_hw_params_get_channels_max(hwParams, &maxChannels);
-- if (ret != 0) {
-- ERROR1("snd_pcm_hw_params_get_channels_max returned error %d\n", ret);
-- }
-- }
--#else
-- minChannels = snd_pcm_hw_params_get_channels_min(hwParams);
-- maxChannels = snd_pcm_hw_params_get_channels_max(hwParams);
-- if (minChannels > maxChannels) {
-- ERROR2("MinChannels=%d, maxChannels=%d\n", minChannels, maxChannels);
-- }
--#endif
--
-- // since we queried the hw: device, for many soundcards, it will only
-- // report the maximum number of channels (which is the only way to talk
-- // to the hw: device). Since we will, however, open the plughw: device
-- // when opening the Source/TargetDataLine, we can safely assume that
-- // also the channels 1..maxChannels are available.
--#ifdef ALSA_PCM_USE_PLUGHW
-- minChannels = 1;
--#endif
-- if (ret == 0) {
-- // plughw: supports any sample rate
-- rate = -1;
-- for (format = 0; format <= SND_PCM_FORMAT_LAST; format++) {
-- if (snd_pcm_format_mask_test(formatMask, format)) {
-- // format exists
-- if (getFormatFromAlsaFormat(format, &origSampleSizeInBytes,
-- &origSignificantBits,
-- &isSigned, &isBigEndian, &enc)) {
-- // now if we use plughw:, we can use any bit size below the
-- // natively supported ones. Some ALSA drivers only support the maximum
-- // bit size, so we add any sample rates below the reported one.
-- // E.g. this iteration reports support for 16-bit.
-- // getBitIndex will return 2, so it will add entries for
-- // 16-bit (bitIndex=2) and in the next do-while loop iteration,
-- // it will decrease bitIndex and will therefore add 8-bit support.
-- bitIndex = getBitIndex(origSampleSizeInBytes, origSignificantBits);
-- do {
-- if (bitIndex == 0
-- || bitIndex == MAX_BIT_INDEX
-- || !handledBits[bitIndex]) {
-- handledBits[bitIndex] = TRUE;
-- sampleSizeInBytes = getSampleSizeInBytes(bitIndex, origSampleSizeInBytes);
-- significantBits = getSignificantBits(bitIndex, origSignificantBits);
-- if (maxChannels - minChannels > MAXIMUM_LISTED_CHANNELS) {
-- // avoid too many channels explicitly listed
-- // just add -1, min, and max
-- DAUDIO_AddAudioFormat(creator, significantBits,
-- -1, -1, rate,
-- enc, isSigned, isBigEndian);
-- DAUDIO_AddAudioFormat(creator, significantBits,
-- sampleSizeInBytes * minChannels,
-- minChannels, rate,
-- enc, isSigned, isBigEndian);
-- DAUDIO_AddAudioFormat(creator, significantBits,
-- sampleSizeInBytes * maxChannels,
-- maxChannels, rate,
-- enc, isSigned, isBigEndian);
-- } else {
-- for (channels = minChannels; channels <= maxChannels; channels++) {
-- DAUDIO_AddAudioFormat(creator, significantBits,
-- (channels < 0)?-1:(sampleSizeInBytes * channels),
-- channels, rate,
-- enc, isSigned, isBigEndian);
-- }
-- }
-- }
--#ifndef ALSA_PCM_USE_PLUGHW
-- // without plugin, do not add fake formats
-- break;
--#endif
-- } while (--bitIndex > 0);
-- } else {
-- TRACE1("could not get format from alsa for format %d\n", format);
-- }
-- } else {
-- //TRACE1("Format %d not supported\n", format);
-- }
-- } // for loop
-- snd_pcm_hw_params_free(hwParams);
-- }
-- snd_pcm_format_mask_free(formatMask);
-- }
-- snd_pcm_close(handle);
--}
--
--/* ******* ALSA PCM INFO ******************** */
--typedef struct tag_AlsaPcmInfo {
-- snd_pcm_t* handle;
-- snd_pcm_hw_params_t* hwParams;
-- snd_pcm_sw_params_t* swParams;
-- int bufferSizeInBytes;
-- int frameSize; // storage size in Bytes
-- int periods;
-- snd_pcm_uframes_t periodSize;
--#ifdef GET_POSITION_METHOD2
-- // to be used exclusively by getBytePosition!
-- snd_pcm_status_t* positionStatus;
--#endif
--} AlsaPcmInfo;
--
--
--int setStartThresholdNoCommit(AlsaPcmInfo* info, int useThreshold) {
-- int ret;
-- int threshold;
--
-- if (useThreshold) {
-- // start device whenever anything is written to the buffer
-- threshold = 1;
-- } else {
-- // never start the device automatically
-- threshold = 2000000000; /* near UINT_MAX */
-- }
-- ret = snd_pcm_sw_params_set_start_threshold(info->handle, info->swParams, threshold);
-- if (ret < 0) {
-- ERROR1("Unable to set start threshold mode: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- return TRUE;
--}
--
--int setStartThreshold(AlsaPcmInfo* info, int useThreshold) {
-- int ret = 0;
--
-- if (!setStartThresholdNoCommit(info, useThreshold)) {
-- ret = -1;
-- }
-- if (ret == 0) {
-- // commit it
-- ret = snd_pcm_sw_params(info->handle, info->swParams);
-- if (ret < 0) {
-- ERROR1("Unable to set sw params: %s\n", snd_strerror(ret));
-- }
-- }
-- return (ret == 0)?TRUE:FALSE;
--}
--
--
--// returns TRUE if successful
--int setHWParams(AlsaPcmInfo* info,
-- float sampleRate,
-- int channels,
-- int bufferSizeInFrames,
-- snd_pcm_format_t format) {
-- unsigned int rrate;
-- int ret, dir, periods, periodTime;
-- snd_pcm_uframes_t alsaBufferSizeInFrames = (snd_pcm_uframes_t) bufferSizeInFrames;
--
-- /* choose all parameters */
-- ret = snd_pcm_hw_params_any(info->handle, info->hwParams);
-- if (ret < 0) {
-- ERROR1("Broken configuration: no configurations available: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- /* set the interleaved read/write format */
-- ret = snd_pcm_hw_params_set_access(info->handle, info->hwParams, SND_PCM_ACCESS_RW_INTERLEAVED);
-- if (ret < 0) {
-- ERROR1("SND_PCM_ACCESS_RW_INTERLEAVED access type not available: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- /* set the sample format */
-- ret = snd_pcm_hw_params_set_format(info->handle, info->hwParams, format);
-- if (ret < 0) {
-- ERROR1("Sample format not available: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- /* set the count of channels */
-- ret = snd_pcm_hw_params_set_channels(info->handle, info->hwParams, channels);
-- if (ret < 0) {
-- ERROR2("Channels count (%d) not available: %s\n", channels, snd_strerror(ret));
-- return FALSE;
-- }
-- /* set the stream rate */
-- rrate = (int) (sampleRate + 0.5f);
--#ifdef ALSA_PCM_NEW_HW_PARAMS_API
-- dir = 0;
-- ret = snd_pcm_hw_params_set_rate_near(info->handle, info->hwParams, &rrate, &dir);
--#else
-- ret = snd_pcm_hw_params_set_rate_near(info->handle, info->hwParams, rrate, 0);
--#endif
-- if (ret < 0) {
-- ERROR2("Rate %dHz not available for playback: %s\n", (int) (sampleRate+0.5f), snd_strerror(ret));
-- return FALSE;
-- }
-- if ((rrate-sampleRate > 2) || (rrate-sampleRate < - 2)) {
-- ERROR2("Rate doesn't match (requested %2.2fHz, got %dHz)\n", sampleRate, rrate);
-- return FALSE;
-- }
-- /* set the buffer time */
--#ifdef ALSA_PCM_NEW_HW_PARAMS_API
--
-- ret = snd_pcm_hw_params_set_buffer_size_near(info->handle, info->hwParams, &alsaBufferSizeInFrames);
--#else
-- ret = snd_pcm_hw_params_set_buffer_size_near(info->handle, info->hwParams, alsaBufferSizeInFrames);
--#endif
-- if (ret < 0) {
-- ERROR2("Unable to set buffer size to %d frames: %s\n",
-- (int) alsaBufferSizeInFrames, snd_strerror(ret));
-- return FALSE;
-- }
-- bufferSizeInFrames = (int) alsaBufferSizeInFrames;
-- /* set the period time */
-- if (bufferSizeInFrames > 1024) {
-- dir = 0;
-- periodTime = DEFAULT_PERIOD_TIME;
--#ifdef ALSA_PCM_NEW_HW_PARAMS_API
-- ret = snd_pcm_hw_params_set_period_time_near(info->handle, info->hwParams, &periodTime, &dir);
--#else
-- periodTime = snd_pcm_hw_params_set_period_time_near(info->handle, info->hwParams, periodTime, &dir);
-- ret = periodTime;
--#endif
-- if (ret < 0) {
-- ERROR2("Unable to set period time to %d: %s\n", DEFAULT_PERIOD_TIME, snd_strerror(ret));
-- return FALSE;
-- }
-- } else {
-- /* set the period count for very small buffer sizes to 2 */
-- dir = 0;
-- periods = 2;
--#ifdef ALSA_PCM_NEW_HW_PARAMS_API
-- ret = snd_pcm_hw_params_set_periods_near(info->handle, info->hwParams, &periods, &dir);
--#else
-- periods = snd_pcm_hw_params_set_periods_near(info->handle, info->hwParams, periods, &dir);
-- ret = periods;
--#endif
-- if (ret < 0) {
-- ERROR2("Unable to set period count to %d: %s\n", /*periods*/ 2, snd_strerror(ret));
-- return FALSE;
-- }
-- }
-- /* write the parameters to device */
-- ret = snd_pcm_hw_params(info->handle, info->hwParams);
-- if (ret < 0) {
-- ERROR1("Unable to set hw params: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- return TRUE;
--}
--
--// returns 1 if successful
--int setSWParams(AlsaPcmInfo* info) {
-- int ret;
--
-- /* get the current swparams */
-- ret = snd_pcm_sw_params_current(info->handle, info->swParams);
-- if (ret < 0) {
-- ERROR1("Unable to determine current swparams: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- /* never start the transfer automatically */
-- if (!setStartThresholdNoCommit(info, FALSE /* don't use threshold */)) {
-- return FALSE;
-- }
--
-- /* allow the transfer when at least period_size samples can be processed */
-- ret = snd_pcm_sw_params_set_avail_min(info->handle, info->swParams, info->periodSize);
-- if (ret < 0) {
-- ERROR1("Unable to set avail min for playback: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- /* align all transfers to 1 sample */
-- ret = snd_pcm_sw_params_set_xfer_align(info->handle, info->swParams, 1);
-- if (ret < 0) {
-- ERROR1("Unable to set transfer align: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- /* write the parameters to the playback device */
-- ret = snd_pcm_sw_params(info->handle, info->swParams);
-- if (ret < 0) {
-- ERROR1("Unable to set sw params: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- return TRUE;
--}
--
--static snd_output_t* ALSA_OUTPUT = NULL;
--
--void* DAUDIO_Open(INT32 mixerIndex, INT32 deviceID, int isSource,
-- int encoding, float sampleRate, int sampleSizeInBits,
-- int frameSize, int channels,
-- int isSigned, int isBigEndian, int bufferSizeInBytes) {
-- snd_pcm_format_mask_t* formatMask;
-- snd_pcm_format_t format;
-- int dir;
-- int ret = 0;
-- AlsaPcmInfo* info = NULL;
-- /* snd_pcm_uframes_t is 64 bit on 64-bit systems */
-- snd_pcm_uframes_t alsaPeriodSize = 0;
-- snd_pcm_uframes_t alsaBufferSizeInFrames = 0;
--
--
-- TRACE0("> DAUDIO_Open\n");
--#ifdef USE_TRACE
-- // for using ALSA debug dump methods
-- if (ALSA_OUTPUT == NULL) {
-- snd_output_stdio_attach(&ALSA_OUTPUT, stdout, 0);
-- }
--#endif
--
-- info = (AlsaPcmInfo*) malloc(sizeof(AlsaPcmInfo));
-- if (!info) {
-- ERROR0("Out of memory\n");
-- return NULL;
-- }
-- memset(info, 0, sizeof(AlsaPcmInfo));
--
-- ret = openPCMfromDeviceID(deviceID, &(info->handle), isSource, FALSE /* do open device*/);
-- if (ret == 0) {
-- // set to blocking mode
-- snd_pcm_nonblock(info->handle, 0);
-- ret = snd_pcm_hw_params_malloc(&(info->hwParams));
-- if (ret != 0) {
-- ERROR1(" snd_pcm_hw_params_malloc returned error %d\n", ret);
-- } else {
-- ret = -1;
-- if (getAlsaFormatFromFormat(&format, frameSize / channels, sampleSizeInBits,
-- isSigned, isBigEndian, encoding)) {
-- if (setHWParams(info,
-- sampleRate,
-- channels,
-- bufferSizeInBytes / frameSize,
-- format)) {
-- info->frameSize = frameSize;
--#ifdef ALSA_PCM_NEW_HW_PARAMS_API
-- ret = snd_pcm_hw_params_get_period_size(info->hwParams, &alsaPeriodSize, &dir);
-- info->periodSize = (int) alsaPeriodSize;
-- if (ret < 0) {
-- ERROR1("ERROR: snd_pcm_hw_params_get_period: %s\n", snd_strerror(ret));
-- }
-- snd_pcm_hw_params_get_periods(info->hwParams, &(info->periods), &dir);
-- snd_pcm_hw_params_get_buffer_size(info->hwParams, &alsaBufferSizeInFrames);
-- info->bufferSizeInBytes = (int) alsaBufferSizeInFrames * frameSize;
--#else
-- info->periodSize = snd_pcm_hw_params_get_period_size(info->hwParams, &dir);
-- info->periods = snd_pcm_hw_params_get_periods(info->hwParams, &dir);
-- info->bufferSizeInBytes = snd_pcm_hw_params_get_buffer_size(info->hwParams) * frameSize;
-- ret = 0;
--#endif
-- TRACE3(" DAUDIO_Open: period size = %d frames, periods = %d. Buffer size: %d bytes.\n",
-- (int) info->periodSize, info->periods, info->bufferSizeInBytes);
-- }
-- }
-- }
-- if (ret == 0) {
-- // set software parameters
-- ret = snd_pcm_sw_params_malloc(&(info->swParams));
-- if (ret != 0) {
-- ERROR1("snd_pcm_hw_params_malloc returned error %d\n", ret);
-- } else {
-- if (!setSWParams(info)) {
-- ret = -1;
-- }
-- }
-- }
-- if (ret == 0) {
-- // prepare device
-- ret = snd_pcm_prepare(info->handle);
-- if (ret < 0) {
-- ERROR1("ERROR: snd_pcm_prepare: %s\n", snd_strerror(ret));
-- }
-- }
--
--#ifdef GET_POSITION_METHOD2
-- if (ret == 0) {
-- ret = snd_pcm_status_malloc(&(info->positionStatus));
-- if (ret != 0) {
-- ERROR1("ERROR in snd_pcm_status_malloc: %s\n", snd_strerror(ret));
-- }
-- }
--#endif
-- }
-- if (ret != 0) {
-- DAUDIO_Close((void*) info, isSource);
-- info = NULL;
-- } else {
-- // set to non-blocking mode
-- snd_pcm_nonblock(info->handle, 1);
-- TRACE1("< DAUDIO_Open: Opened device successfully. Handle=%p\n",
-- (void*) info->handle);
-- }
-- return (void*) info;
--}
--
--#ifdef USE_TRACE
--void printState(snd_pcm_state_t state) {
-- if (state == SND_PCM_STATE_OPEN) {
-- TRACE0("State: SND_PCM_STATE_OPEN\n");
-- }
-- else if (state == SND_PCM_STATE_SETUP) {
-- TRACE0("State: SND_PCM_STATE_SETUP\n");
-- }
-- else if (state == SND_PCM_STATE_PREPARED) {
-- TRACE0("State: SND_PCM_STATE_PREPARED\n");
-- }
-- else if (state == SND_PCM_STATE_RUNNING) {
-- TRACE0("State: SND_PCM_STATE_RUNNING\n");
-- }
-- else if (state == SND_PCM_STATE_XRUN) {
-- TRACE0("State: SND_PCM_STATE_XRUN\n");
-- }
-- else if (state == SND_PCM_STATE_DRAINING) {
-- TRACE0("State: SND_PCM_STATE_DRAINING\n");
-- }
-- else if (state == SND_PCM_STATE_PAUSED) {
-- TRACE0("State: SND_PCM_STATE_PAUSED\n");
-- }
-- else if (state == SND_PCM_STATE_SUSPENDED) {
-- TRACE0("State: SND_PCM_STATE_SUSPENDED\n");
-- }
--}
--#endif
--
--int DAUDIO_Start(void* id, int isSource) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-- int ret;
-- snd_pcm_state_t state;
--
-- TRACE0("> DAUDIO_Start\n");
-- // set to blocking mode
-- snd_pcm_nonblock(info->handle, 0);
-- // set start mode so that it always starts as soon as data is there
-- setStartThreshold(info, TRUE /* use threshold */);
-- state = snd_pcm_state(info->handle);
-- if (state == SND_PCM_STATE_PAUSED) {
-- // in case it was stopped previously
-- TRACE0(" Un-pausing...\n");
-- ret = snd_pcm_pause(info->handle, FALSE);
-- if (ret != 0) {
-- ERROR2(" NOTE: error in snd_pcm_pause:%d: %s\n", ret, snd_strerror(ret));
-- }
-- }
-- if (state == SND_PCM_STATE_SUSPENDED) {
-- TRACE0(" Resuming...\n");
-- ret = snd_pcm_resume(info->handle);
-- if (ret < 0) {
-- if ((ret != -EAGAIN) && (ret != -ENOSYS)) {
-- ERROR2(" ERROR: error in snd_pcm_resume:%d: %s\n", ret, snd_strerror(ret));
-- }
-- }
-- }
-- if (state == SND_PCM_STATE_SETUP) {
-- TRACE0("need to call prepare again...\n");
-- // prepare device
-- ret = snd_pcm_prepare(info->handle);
-- if (ret < 0) {
-- ERROR1("ERROR: snd_pcm_prepare: %s\n", snd_strerror(ret));
-- }
-- }
-- // in case there is still data in the buffers
-- ret = snd_pcm_start(info->handle);
-- if (ret != 0) {
-- if (ret != -EPIPE) {
-- ERROR2(" NOTE: error in snd_pcm_start: %d: %s\n", ret, snd_strerror(ret));
-- }
-- }
-- // set to non-blocking mode
-- ret = snd_pcm_nonblock(info->handle, 1);
-- if (ret != 0) {
-- ERROR1(" ERROR in snd_pcm_nonblock: %s\n", snd_strerror(ret));
-- }
-- state = snd_pcm_state(info->handle);
--#ifdef USE_TRACE
-- printState(state);
--#endif
-- ret = (state == SND_PCM_STATE_PREPARED)
-- || (state == SND_PCM_STATE_RUNNING)
-- || (state == SND_PCM_STATE_XRUN)
-- || (state == SND_PCM_STATE_SUSPENDED);
-- TRACE1("< DAUDIO_Start %s\n", ret?"success":"error");
-- return ret?TRUE:FALSE;
--}
--
--int DAUDIO_Stop(void* id, int isSource) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-- int ret;
--
-- TRACE0("> DAUDIO_Stop\n");
-- // set to blocking mode
-- snd_pcm_nonblock(info->handle, 0);
-- setStartThreshold(info, FALSE /* don't use threshold */); // device will not start after buffer xrun
-- ret = snd_pcm_pause(info->handle, 1);
-- // set to non-blocking mode
-- snd_pcm_nonblock(info->handle, 1);
-- if (ret != 0) {
-- ERROR1("ERROR in snd_pcm_pause: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- TRACE0("< DAUDIO_Stop success\n");
-- return TRUE;
--}
--
--void DAUDIO_Close(void* id, int isSource) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
--
-- TRACE0("DAUDIO_Close\n");
-- if (info != NULL) {
-- if (info->handle != NULL) {
-- snd_pcm_close(info->handle);
-- }
-- if (info->hwParams) {
-- snd_pcm_hw_params_free(info->hwParams);
-- }
-- if (info->swParams) {
-- snd_pcm_sw_params_free(info->swParams);
-- }
--#ifdef GET_POSITION_METHOD2
-- if (info->positionStatus) {
-- snd_pcm_status_free(info->positionStatus);
-- }
--#endif
-- free(info);
-- }
--}
--
--/*
-- * Underrun and suspend recovery
-- * returns
-- * 0: exit native and return 0
-- * 1: try again to write/read
-- * -1: error - exit native with return value -1
-- */
--int xrun_recovery(AlsaPcmInfo* info, int err) {
-- int ret;
--
-- if (err == -EPIPE) { /* underrun / overflow */
-- TRACE0("xrun_recovery: underrun/overflow.\n");
-- ret = snd_pcm_prepare(info->handle);
-- if (ret < 0) {
-- ERROR1("Can't recover from underrun/overflow, prepare failed: %s\n", snd_strerror(ret));
-- return -1;
-- }
-- return 1;
-- }
-- else if (err == -ESTRPIPE) {
-- TRACE0("xrun_recovery: suspended.\n");
-- ret = snd_pcm_resume(info->handle);
-- if (ret < 0) {
-- if (ret == -EAGAIN) {
-- return 0; /* wait until the suspend flag is released */
-- }
-- return -1;
-- }
-- ret = snd_pcm_prepare(info->handle);
-- if (ret < 0) {
-- ERROR1("Can't recover from underrun/overflow, prepare failed: %s\n", snd_strerror(ret));
-- return -1;
-- }
-- return 1;
-- }
-- else if (err == -EAGAIN) {
-- TRACE0("xrun_recovery: EAGAIN try again flag.\n");
-- return 0;
-- }
-- TRACE2("xrun_recovery: unexpected error %d: %s\n", err, snd_strerror(err));
-- return -1;
--}
--
--// returns -1 on error
--int DAUDIO_Write(void* id, char* data, int byteSize) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-- int ret, count;
-- snd_pcm_sframes_t frameSize, writtenFrames;
--
-- TRACE1("> DAUDIO_Write %d bytes\n", byteSize);
--
-- /* sanity */
-- if (byteSize <= 0 || info->frameSize <= 0) {
-- ERROR2(" DAUDIO_Write: byteSize=%d, frameSize=%d!\n",
-- (int) byteSize, (int) info->frameSize);
-- TRACE0("< DAUDIO_Write returning -1\n");
-- return -1;
-- }
-- count = 2; // maximum number of trials to recover from underrun
-- //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
-- frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
-- do {
-- writtenFrames = snd_pcm_writei(info->handle, (const void*) data, (snd_pcm_uframes_t) frameSize);
--
-- if (writtenFrames < 0) {
-- ret = xrun_recovery(info, (int) writtenFrames);
-- if (ret <= 0) {
-- TRACE1("DAUDIO_Write: xrun recovery returned %d -> return.\n", ret);
-- return ret;
-- }
-- if (count-- <= 0) {
-- ERROR0("DAUDIO_Write: too many attempts to recover from xrun/suspend\n");
-- return -1;
-- }
-- } else {
-- break;
-- }
-- } while (TRUE);
-- //ret = snd_pcm_frames_to_bytes(info->handle, writtenFrames);
-- ret = (int) (writtenFrames * info->frameSize);
-- TRACE1("< DAUDIO_Write: returning %d bytes.\n", ret);
-- return ret;
--}
--
--// returns -1 on error
--int DAUDIO_Read(void* id, char* data, int byteSize) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-- int ret, count;
-- snd_pcm_sframes_t frameSize, readFrames;
--
-- TRACE1("> DAUDIO_Read %d bytes\n", byteSize);
-- /*TRACE3(" info=%p, data=%p, byteSize=%d\n",
-- (void*) info, (void*) data, (int) byteSize);
-- TRACE2(" info->frameSize=%d, info->handle=%p\n",
-- (int) info->frameSize, (void*) info->handle);
-- */
-- /* sanity */
-- if (byteSize <= 0 || info->frameSize <= 0) {
-- ERROR2(" DAUDIO_Read: byteSize=%d, frameSize=%d!\n",
-- (int) byteSize, (int) info->frameSize);
-- TRACE0("< DAUDIO_Read returning -1\n");
-- return -1;
-- }
-- count = 2; // maximum number of trials to recover from error
-- //frameSize = snd_pcm_bytes_to_frames(info->handle, byteSize);
-- frameSize = (snd_pcm_sframes_t) (byteSize / info->frameSize);
-- do {
-- readFrames = snd_pcm_readi(info->handle, (void*) data, (snd_pcm_uframes_t) frameSize);
-- if (readFrames < 0) {
-- ret = xrun_recovery(info, (int) readFrames);
-- if (ret <= 0) {
-- TRACE1("DAUDIO_Read: xrun recovery returned %d -> return.\n", ret);
-- return ret;
-- }
-- if (count-- <= 0) {
-- ERROR0("DAUDIO_Read: too many attempts to recover from xrun/suspend\n");
-- return -1;
-- }
-- } else {
-- break;
-- }
-- } while (TRUE);
-- //ret = snd_pcm_frames_to_bytes(info->handle, readFrames);
-- ret = (int) (readFrames * info->frameSize);
-- TRACE1("< DAUDIO_Read: returning %d bytes.\n", ret);
-- return ret;
--}
--
--
--int DAUDIO_GetBufferSize(void* id, int isSource) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
--
-- return info->bufferSizeInBytes;
--}
--
--int DAUDIO_StillDraining(void* id, int isSource) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-- snd_pcm_state_t state;
--
-- state = snd_pcm_state(info->handle);
-- //printState(state);
-- //TRACE1("Still draining: %s\n", (state != SND_PCM_STATE_XRUN)?"TRUE":"FALSE");
-- return (state == SND_PCM_STATE_RUNNING)?TRUE:FALSE;
--}
--
--
--int DAUDIO_Flush(void* id, int isSource) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-- int ret;
--
-- TRACE0("DAUDIO_Flush\n");
-- ret = snd_pcm_drop(info->handle);
-- if (ret != 0) {
-- ERROR1("ERROR in snd_pcm_drop: %s\n", snd_strerror(ret));
-- return FALSE;
-- }
-- ret = DAUDIO_Start(id, isSource);
-- return ret;
--}
--
--int DAUDIO_GetAvailable(void* id, int isSource) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-- snd_pcm_sframes_t availableInFrames;
-- snd_pcm_state_t state;
-- int ret;
--
-- state = snd_pcm_state(info->handle);
-- if (state == SND_PCM_STATE_XRUN) {
-- // if in xrun state then we have the entire buffer available,
-- // not 0 as alsa reports
-- ret = info->bufferSizeInBytes;
-- } else {
-- availableInFrames = snd_pcm_avail_update(info->handle);
-- if (availableInFrames < 0) {
-- ret = 0;
-- } else {
-- //ret = snd_pcm_frames_to_bytes(info->handle, availableInFrames);
-- ret = (int) (availableInFrames * info->frameSize);
-- }
-- }
-- TRACE1("DAUDIO_GetAvailable returns %d bytes\n", ret);
-- return ret;
--}
--
--INT64 estimatePositionFromAvail(AlsaPcmInfo* info, int isSource, INT64 javaBytePos, int availInBytes) {
-- // estimate the current position with the buffer size and
-- // the available bytes to read or write in the buffer.
-- // not an elegant solution - bytePos will stop on xruns,
-- // and in race conditions it may jump backwards
-- // Advantage is that it is indeed based on the samples that go through
-- // the system (rather than time-based methods)
-- if (isSource) {
-- // javaBytePos is the position that is reached when the current
-- // buffer is played completely
-- return (INT64) (javaBytePos - info->bufferSizeInBytes + availInBytes);
-- } else {
-- // javaBytePos is the position that was when the current buffer was empty
-- return (INT64) (javaBytePos + availInBytes);
-- }
--}
--
--INT64 DAUDIO_GetBytePosition(void* id, int isSource, INT64 javaBytePos) {
-- AlsaPcmInfo* info = (AlsaPcmInfo*) id;
-- int ret;
-- INT64 result = javaBytePos;
-- snd_pcm_state_t state;
-- state = snd_pcm_state(info->handle);
--
-- if (state != SND_PCM_STATE_XRUN) {
--#ifdef GET_POSITION_METHOD2
-- snd_timestamp_t* ts;
-- snd_pcm_uframes_t framesAvail;
--
-- // note: slight race condition if this is called simultaneously from 2 threads
-- ret = snd_pcm_status(info->handle, info->positionStatus);
-- if (ret != 0) {
-- ERROR1("ERROR in snd_pcm_status: %s\n", snd_strerror(ret));
-- result = javaBytePos;
-- } else {
-- // calculate from time value, or from available bytes
-- framesAvail = snd_pcm_status_get_avail(info->positionStatus);
-- result = estimatePositionFromAvail(info, isSource, javaBytePos, framesAvail * info->frameSize);
-- }
--#endif
--#ifdef GET_POSITION_METHOD3
-- snd_pcm_uframes_t framesAvail;
-- ret = snd_pcm_avail(info->handle, &framesAvail);
-- if (ret != 0) {
-- ERROR1("ERROR in snd_pcm_avail: %s\n", snd_strerror(ret));
-- result = javaBytePos;
-- } else {
-- result = estimatePositionFromAvail(info, isSource, javaBytePos, framesAvail * info->frameSize);
-- }
--#endif
--#ifdef GET_POSITION_METHOD1
-- result = estimatePositionFromAvail(info, isSource, javaBytePos, DAUDIO_GetAvailable(id, isSource));
--#endif
-- }
-- //printf("getbyteposition: javaBytePos=%d , return=%d\n", (int) javaBytePos, (int) result);
-- return result;
--}
--
--
--
--void DAUDIO_SetBytePosition(void* id, int isSource, INT64 javaBytePos) {
-- /* save to ignore, since GetBytePosition
-- * takes the javaBytePos param into account
-- */
--}
--
--int DAUDIO_RequiresServicing(void* id, int isSource) {
-- // never need servicing on Bsd
-- return FALSE;
--}
--
--void DAUDIO_Service(void* id, int isSource) {
-- // never need servicing on Bsd
--}
--
--
--#endif // USE_DAUDIO
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,291 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--//#define USE_ERROR
--//#define USE_TRACE
--
--#include "PLATFORM_API_BsdOS_ALSA_PCMUtils.h"
--#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
--
--
--
--// callback for iteration through devices
--// returns TRUE if iteration should continue
--// NOTE: cardinfo may be NULL (for "default" device)
--typedef int (*DeviceIteratorPtr)(UINT32 deviceID, snd_pcm_info_t* pcminfo,
-- snd_ctl_card_info_t* cardinfo, void *userData);
--
--// for each ALSA device, call iterator. userData is passed to the iterator
--// returns total number of iterations
--int iteratePCMDevices(DeviceIteratorPtr iterator, void* userData) {
-- int count = 0;
-- int subdeviceCount;
-- int card, dev, subDev;
-- char devname[16];
-- int err;
-- snd_ctl_t *handle;
-- snd_pcm_t *pcm;
-- snd_pcm_info_t* pcminfo;
-- snd_ctl_card_info_t *cardinfo, *defcardinfo = NULL;
-- UINT32 deviceID;
-- int doContinue = TRUE;
--
-- snd_pcm_info_malloc(&pcminfo);
-- snd_ctl_card_info_malloc(&cardinfo);
--
-- // 1st try "default" device
-- err = snd_pcm_open(&pcm, ALSA_DEFAULT_DEVICE_NAME,
-- SND_PCM_STREAM_PLAYBACK, SND_PCM_NONBLOCK);
-- if (err < 0) {
-- // try with the other direction
-- err = snd_pcm_open(&pcm, ALSA_DEFAULT_DEVICE_NAME,
-- SND_PCM_STREAM_CAPTURE, SND_PCM_NONBLOCK);
-- }
-- if (err < 0) {
-- ERROR1("ERROR: snd_pcm_open (\"default\"): %s\n", snd_strerror(err));
-- } else {
-- err = snd_pcm_info(pcm, pcminfo);
-- snd_pcm_close(pcm);
-- if (err < 0) {
-- ERROR1("ERROR: snd_pcm_info (\"default\"): %s\n",
-- snd_strerror(err));
-- } else {
-- // try to get card info
-- card = snd_pcm_info_get_card(pcminfo);
-- if (card >= 0) {
-- sprintf(devname, ALSA_HARDWARE_CARD, card);
-- if (snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK) >= 0) {
-- if (snd_ctl_card_info(handle, cardinfo) >= 0) {
-- defcardinfo = cardinfo;
-- }
-- snd_ctl_close(handle);
-- }
-- }
-- // call callback function for the device
-- if (iterator != NULL) {
-- doContinue = (*iterator)(ALSA_DEFAULT_DEVICE_ID, pcminfo,
-- defcardinfo, userData);
-- }
-- count++;
-- }
-- }
--
-- // iterate cards
-- card = -1;
-- while (doContinue) {
-- if (snd_card_next(&card) < 0) {
-- break;
-- }
-- if (card < 0) {
-- break;
-- }
-- sprintf(devname, ALSA_HARDWARE_CARD, card);
-- TRACE1("Opening alsa device \"%s\"...\n", devname);
-- err = snd_ctl_open(&handle, devname, SND_CTL_NONBLOCK);
-- if (err < 0) {
-- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n",
-- card, snd_strerror(err));
-- } else {
-- err = snd_ctl_card_info(handle, cardinfo);
-- if (err < 0) {
-- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n",
-- card, snd_strerror(err));
-- } else {
-- dev = -1;
-- while (doContinue) {
-- if (snd_ctl_pcm_next_device(handle, &dev) < 0) {
-- ERROR0("snd_ctl_pcm_next_device\n");
-- }
-- if (dev < 0) {
-- break;
-- }
-- snd_pcm_info_set_device(pcminfo, dev);
-- snd_pcm_info_set_subdevice(pcminfo, 0);
-- snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_PLAYBACK);
-- err = snd_ctl_pcm_info(handle, pcminfo);
-- if (err == -ENOENT) {
-- // try with the other direction
-- snd_pcm_info_set_stream(pcminfo, SND_PCM_STREAM_CAPTURE);
-- err = snd_ctl_pcm_info(handle, pcminfo);
-- }
-- if (err < 0) {
-- if (err != -ENOENT) {
-- ERROR2("ERROR: snd_ctl_pcm_info, card=%d: %s",
-- card, snd_strerror(err));
-- }
-- } else {
-- subdeviceCount = needEnumerateSubdevices(ALSA_PCM) ?
-- snd_pcm_info_get_subdevices_count(pcminfo) : 1;
-- if (iterator!=NULL) {
-- for (subDev = 0; subDev < subdeviceCount; subDev++) {
-- deviceID = encodeDeviceID(card, dev, subDev);
-- doContinue = (*iterator)(deviceID, pcminfo,
-- cardinfo, userData);
-- count++;
-- if (!doContinue) {
-- break;
-- }
-- }
-- } else {
-- count += subdeviceCount;
-- }
-- }
-- } // of while(doContinue)
-- }
-- snd_ctl_close(handle);
-- }
-- }
-- snd_ctl_card_info_free(cardinfo);
-- snd_pcm_info_free(pcminfo);
-- return count;
--}
--
--int getAudioDeviceCount() {
-- initAlsaSupport();
-- return iteratePCMDevices(NULL, NULL);
--}
--
--int deviceInfoIterator(UINT32 deviceID, snd_pcm_info_t* pcminfo,
-- snd_ctl_card_info_t* cardinfo, void* userData) {
-- char buffer[300];
-- ALSA_AudioDeviceDescription* desc = (ALSA_AudioDeviceDescription*)userData;
--#ifdef ALSA_PCM_USE_PLUGHW
-- int usePlugHw = 1;
--#else
-- int usePlugHw = 0;
--#endif
--
-- initAlsaSupport();
-- if (desc->index == 0) {
-- // we found the device with correct index
-- *(desc->maxSimultaneousLines) = needEnumerateSubdevices(ALSA_PCM) ?
-- 1 : snd_pcm_info_get_subdevices_count(pcminfo);
-- *desc->deviceID = deviceID;
-- buffer[0]=' '; buffer[1]='[';
-- getDeviceStringFromDeviceID(&buffer[2], deviceID, usePlugHw, ALSA_PCM);
-- strcat(buffer, "]");
-- strncpy(desc->name,
-- (cardinfo != NULL)
-- ? snd_ctl_card_info_get_id(cardinfo)
-- : snd_pcm_info_get_id(pcminfo),
-- desc->strLen - strlen(buffer));
-- strncat(desc->name, buffer, desc->strLen - strlen(desc->name));
-- strncpy(desc->vendor, "ALSA (http://www.alsa-project.org)", desc->strLen);
-- strncpy(desc->description,
-- (cardinfo != NULL)
-- ? snd_ctl_card_info_get_name(cardinfo)
-- : snd_pcm_info_get_name(pcminfo),
-- desc->strLen);
-- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
-- strncat(desc->description, snd_pcm_info_get_id(pcminfo), desc->strLen - strlen(desc->description));
-- strncat(desc->description, ", ", desc->strLen - strlen(desc->description));
-- strncat(desc->description, snd_pcm_info_get_name(pcminfo), desc->strLen - strlen(desc->description));
-- getALSAVersion(desc->version, desc->strLen);
-- TRACE4("Returning %s, %s, %s, %s\n", desc->name, desc->vendor, desc->description, desc->version);
-- return FALSE; // do not continue iteration
-- }
-- desc->index--;
-- return TRUE;
--}
--
--// returns 0 if successful
--int openPCMfromDeviceID(int deviceID, snd_pcm_t** handle, int isSource, int hardware) {
-- char buffer[200];
-- int ret;
--
-- initAlsaSupport();
-- getDeviceStringFromDeviceID(buffer, deviceID, !hardware, ALSA_PCM);
--
-- TRACE1("Opening ALSA device %s\n", buffer);
-- ret = snd_pcm_open(handle, buffer,
-- isSource?SND_PCM_STREAM_PLAYBACK:SND_PCM_STREAM_CAPTURE,
-- SND_PCM_NONBLOCK);
-- if (ret != 0) {
-- ERROR1("snd_pcm_open returned error code %d \n", ret);
-- *handle = NULL;
-- }
-- return ret;
--}
--
--
--int getAudioDeviceDescriptionByIndex(ALSA_AudioDeviceDescription* desc) {
-- initAlsaSupport();
-- TRACE1(" getAudioDeviceDescriptionByIndex(mixerIndex = %d\n", desc->index);
-- iteratePCMDevices(&deviceInfoIterator, desc);
-- return (desc->index == 0)?TRUE:FALSE;
--}
--
--// returns 1 if successful
--// enc: 0 for PCM, 1 for ULAW, 2 for ALAW (see DirectAudio.h)
--int getFormatFromAlsaFormat(snd_pcm_format_t alsaFormat,
-- int* sampleSizeInBytes, int* significantBits,
-- int* isSigned, int* isBigEndian, int* enc) {
--
-- *sampleSizeInBytes = (snd_pcm_format_physical_width(alsaFormat) + 7) / 8;
-- *significantBits = snd_pcm_format_width(alsaFormat);
--
-- // defaults
-- *enc = 0; // PCM
-- *isSigned = (snd_pcm_format_signed(alsaFormat) > 0);
-- *isBigEndian = (snd_pcm_format_big_endian(alsaFormat) > 0);
--
-- // non-PCM formats
-- if (alsaFormat == SND_PCM_FORMAT_MU_LAW) { // Mu-Law
-- *sampleSizeInBytes = 8; *enc = 1; *significantBits = *sampleSizeInBytes;
-- }
-- else if (alsaFormat == SND_PCM_FORMAT_A_LAW) { // A-Law
-- *sampleSizeInBytes = 8; *enc = 2; *significantBits = *sampleSizeInBytes;
-- }
-- else if (snd_pcm_format_linear(alsaFormat) < 1) {
-- return 0;
-- }
-- return (*sampleSizeInBytes > 0);
--}
--
--// returns 1 if successful
--int getAlsaFormatFromFormat(snd_pcm_format_t* alsaFormat,
-- int sampleSizeInBytes, int significantBits,
-- int isSigned, int isBigEndian, int enc) {
-- *alsaFormat = SND_PCM_FORMAT_UNKNOWN;
--
-- if (enc == 0) {
-- *alsaFormat = snd_pcm_build_linear_format(significantBits,
-- sampleSizeInBytes * 8,
-- isSigned?0:1,
-- isBigEndian?1:0);
-- }
-- else if ((sampleSizeInBytes == 1) && (significantBits == 8)) {
-- if (enc == 1) { // ULAW
-- *alsaFormat = SND_PCM_FORMAT_MU_LAW;
-- }
-- else if (enc == 2) { // ALAW
-- *alsaFormat = SND_PCM_FORMAT_A_LAW;
-- }
-- }
-- return (*alsaFormat == SND_PCM_FORMAT_UNKNOWN)?0:1;
--}
--
--
--/* end */
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCMUtils.h 1969-12-31 16:00:00.000000000 -0800
-@@ -1,72 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--// define this with a later version of ALSA than 0.9.0rc3
--#define ALSA_PCM_NEW_HW_PARAMS_API
--#include <alsa/asoundlib.h>
--#include "Utilities.h"
--
--#ifndef PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
--#define PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
--
--// if this is defined, use plughw: devices
--#define ALSA_PCM_USE_PLUGHW
--//#undef ALSA_PCM_USE_PLUGHW
--
--
--// maximum number of channels that is listed in the formats. If more, than
--// just -1 for channel count is used.
--#define MAXIMUM_LISTED_CHANNELS 32
--
--typedef struct tag_ALSA_AudioDeviceDescription {
-- int index; // in
-- int strLen; // in
-- INT32* deviceID; // out
-- int* maxSimultaneousLines; // out
-- char* name; // out
-- char* vendor; // out
-- char* description; // out
-- char* version; // out
--} ALSA_AudioDeviceDescription;
--
--
--
--int getAudioDeviceCount();
--int getAudioDeviceDescriptionByIndex(ALSA_AudioDeviceDescription* desc);
--
--// returns ALSA error code, or 0 if successful
--int openPCMfromDeviceID(int deviceID, snd_pcm_t** handle, int isSource, int hardware);
--
--// returns 1 if successful
--// enc: 0 for PCM, 1 for ULAW, 2 for ALAW (see DirectAudio.h)
--int getFormatFromAlsaFormat(snd_pcm_format_t alsaFormat,
-- int* sampleSizeInBytes, int* significantBits,
-- int* isSigned, int* isBigEndian, int* enc);
--
--int getAlsaFormatFromFormat(snd_pcm_format_t* alsaFormat,
-- int sampleSizeInBytes, int significantBits,
-- int isSigned, int isBigEndian, int enc);
--
--#endif // PLATFORM_API_BSDOS_ALSA_PCMUTILS_H_INCLUDED
---- ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_Ports.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,723 +0,0 @@
--/*
-- * Copyright (c) 2003, 2007, Oracle and/or its affiliates. All rights reserved.
-- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-- *
-- * This code is free software; you can redistribute it and/or modify it
-- * under the terms of the GNU General Public License version 2 only, as
-- * published by the Free Software Foundation. Oracle designates this
-- * particular file as subject to the "Classpath" exception as provided
-- * by Oracle in the LICENSE file that accompanied this code.
-- *
-- * This code is distributed in the hope that it will be useful, but WITHOUT
-- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-- * version 2 for more details (a copy is included in the LICENSE file that
-- * accompanied this code).
-- *
-- * You should have received a copy of the GNU General Public License version
-- * 2 along with this work; if not, write to the Free Software Foundation,
-- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-- *
-- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-- * or visit www.oracle.com if you need additional information or have any
-- * questions.
-- */
--
--#define USE_ERROR
--//#define USE_TRACE
--
--#include "Ports.h"
--#include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h"
--#include <alsa/asoundlib.h>
--
--#if USE_PORTS == TRUE
--
--#define MAX_ELEMS (300)
--#define MAX_CONTROLS (MAX_ELEMS * 4)
--
--#define CHANNELS_MONO (SND_MIXER_SCHN_LAST + 1)
--#define CHANNELS_STEREO (SND_MIXER_SCHN_LAST + 2)
--
--typedef struct {
-- snd_mixer_elem_t* elem;
-- INT32 portType; /* one of PORT_XXX_xx */
-- char* controlType; /* one of CONTROL_TYPE_xx */
-- /* Values: either SND_MIXER_SCHN_FRONT_xx, CHANNELS_MONO or CHANNELS_STEREO.
-- For SND_MIXER_SCHN_FRONT_xx, exactly this channel is set/retrieved directly.
-- For CHANNELS_MONO, ALSA channel SND_MIXER_SCHN_MONO is set/retrieved directly.
-- For CHANNELS_STEREO, ALSA channels SND_MIXER_SCHN_FRONT_LEFT and SND_MIXER_SCHN_FRONT_RIGHT
-- are set after a calculation that takes balance into account. Retrieved? Average of both
-- channels? (Using a cached value is not a good idea since the value in the HW may have been
-- altered.) */
-- INT32 channel;
--} PortControl;
--
--
--typedef struct tag_PortMixer {
-- snd_mixer_t* mixer_handle;
-- /* Number of array elements used in elems and types. */
-- int numElems;
-- snd_mixer_elem_t** elems;
-- /* Array of port types (PORT_SRC_UNKNOWN etc.). Indices are the same as in elems. */
-- INT32* types;
-- /* Number of array elements used in controls. */
-- int numControls;
-- PortControl* controls;
--} PortMixer;
--
--
--///// implemented functions of Ports.h
--
--INT32 PORT_GetPortMixerCount() {
-- INT32 mixerCount;
-- int card;
-- char devname[16];
-- int err;
-- snd_ctl_t *handle;
-- snd_ctl_card_info_t* info;
--
-- TRACE0("> PORT_GetPortMixerCount\n");
--
-- initAlsaSupport();
--
-- snd_ctl_card_info_malloc(&info);
-- card = -1;
-- mixerCount = 0;
-- if (snd_card_next(&card) >= 0) {
-- while (card >= 0) {
-- sprintf(devname, ALSA_HARDWARE_CARD, card);
-- TRACE1("PORT_GetPortMixerCount: Opening alsa device \"%s\"...\n", devname);
-- err = snd_ctl_open(&handle, devname, 0);
-- if (err < 0) {
-- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", card, snd_strerror(err));
-- } else {
-- mixerCount++;
-- snd_ctl_close(handle);
-- }
-- if (snd_card_next(&card) < 0) {
-- break;
-- }
-- }
-- }
-- snd_ctl_card_info_free(info);
-- TRACE0("< PORT_GetPortMixerCount\n");
-- return mixerCount;
--}
--
--
--INT32 PORT_GetPortMixerDescription(INT32 mixerIndex, PortMixerDescription* description) {
-- snd_ctl_t* handle;
-- snd_ctl_card_info_t* card_info;
-- char devname[16];
-- int err;
-- char buffer[100];
--
-- TRACE0("> PORT_GetPortMixerDescription\n");
-- snd_ctl_card_info_malloc(&card_info);
--
-- sprintf(devname, ALSA_HARDWARE_CARD, (int) mixerIndex);
-- TRACE1("Opening alsa device \"%s\"...\n", devname);
-- err = snd_ctl_open(&handle, devname, 0);
-- if (err < 0) {
-- ERROR2("ERROR: snd_ctl_open, card=%d: %s\n", (int) mixerIndex, snd_strerror(err));
-- return FALSE;
-- }
-- err = snd_ctl_card_info(handle, card_info);
-- if (err < 0) {
-- ERROR2("ERROR: snd_ctl_card_info, card=%d: %s\n", (int) mixerIndex, snd_strerror(err));
-- }
-- strncpy(description->name, snd_ctl_card_info_get_id(card_info), PORT_STRING_LENGTH - 1);
-- sprintf(buffer, " [%s]", devname);
-- strncat(description->name, buffer, PORT_STRING_LENGTH - 1 - strlen(description->name));
-- strncpy(description->vendor, "ALSA (http://www.alsa-project.org)", PORT_STRING_LENGTH - 1);
-- strncpy(description->description, snd_ctl_card_info_get_name(card_info), PORT_STRING_LENGTH - 1);
-- strncat(description->description, ", ", PORT_STRING_LENGTH - 1 - strlen(description->description));
-- strncat(description->description, snd_ctl_card_info_get_mixername(card_info), PORT_STRING_LENGTH - 1 - strlen(description->description));
-- getALSAVersion(description->version, PORT_STRING_LENGTH - 1);
--
-- snd_ctl_close(handle);
-- snd_ctl_card_info_free(card_info);
-- TRACE0("< PORT_GetPortMixerDescription\n");
-- return TRUE;
--}
--
--
--void* PORT_Open(INT32 mixerIndex) {
-- char devname[16];
-- snd_mixer_t* mixer_handle;
-- int err;
-- PortMixer* handle;
--
-- TRACE0("> PORT_Open\n");
-- sprintf(devname, ALSA_HARDWARE_CARD, (int) mixerIndex);
-- if ((err = snd_mixer_open(&mixer_handle, 0)) < 0) {
-- ERROR2("Mixer %s open error: %s", devname, snd_strerror(err));
-- return NULL;
-- }
-- if ((err = snd_mixer_attach(mixer_handle, devname)) < 0) {
-- ERROR2("Mixer attach %s error: %s", devname, snd_strerror(err));
-- snd_mixer_close(mixer_handle);
-- return NULL;
-- }
-- if ((err = snd_mixer_selem_register(mixer_handle, NULL, NULL)) < 0) {
-- ERROR1("Mixer register error: %s", snd_strerror(err));
-- snd_mixer_close(mixer_handle);
-- return NULL;
-- }
-- err = snd_mixer_load(mixer_handle);
-- if (err < 0) {
-- ERROR2("Mixer %s load error: %s", devname, snd_strerror(err));
-- snd_mixer_close(mixer_handle);
-- return NULL;
-- }
-- handle = (PortMixer*) calloc(1, sizeof(PortMixer));
-- if (handle == NULL) {
-- ERROR0("malloc() failed.");
-- snd_mixer_close(mixer_handle);
-- return NULL;
-- }
-- handle->numElems = 0;
-- handle->elems = (snd_mixer_elem_t**) calloc(MAX_ELEMS, sizeof(snd_mixer_elem_t*));
-- if (handle->elems == NULL) {
-- ERROR0("malloc() failed.");
-- snd_mixer_close(mixer_handle);
-- free(handle);
-- return NULL;
-- }
-- handle->types = (INT32*) calloc(MAX_ELEMS, sizeof(INT32));
-- if (handle->types == NULL) {
-- ERROR0("malloc() failed.");
-- snd_mixer_close(mixer_handle);
-- free(handle->elems);
-- free(handle);
-- return NULL;
-- }
-- handle->controls = (PortControl*) calloc(MAX_CONTROLS, sizeof(PortControl));
-- if (handle->controls == NULL) {
-- ERROR0("malloc() failed.");
-- snd_mixer_close(mixer_handle);
-- free(handle->elems);
-- free(handle->types);
-- free(handle);
-- return NULL;
-- }
-- handle->mixer_handle = mixer_handle;
-- // necessary to initialize data structures
-- PORT_GetPortCount(handle);
-- TRACE0("< PORT_Open\n");
-- return handle;
--}
--
--
--void PORT_Close(void* id) {
-- TRACE0("> PORT_Close\n");
-- if (id != NULL) {
-- PortMixer* handle = (PortMixer*) id;
-- if (handle->mixer_handle != NULL) {
-- snd_mixer_close(handle->mixer_handle);
-- }
-- if (handle->elems != NULL) {
-- free(handle->elems);
-- }
-- if (handle->types != NULL) {
-- free(handle->types);
-- }
-- if (handle->controls != NULL) {
-- free(handle->controls);
-- }
-- free(handle);
-- }
-- TRACE0("< PORT_Close\n");
--}
--
--
--
--INT32 PORT_GetPortCount(void* id) {
-- PortMixer* portMixer;
-- snd_mixer_elem_t *elem;
--
-- TRACE0("> PORT_GetPortCount\n");
-- if (id == NULL) {
-- // $$mp: Should become a descriptive error code (invalid handle).
-- return -1;
-- }
-- portMixer = (PortMixer*) id;
-- if (portMixer->numElems == 0) {
-- for (elem = snd_mixer_first_elem(portMixer->mixer_handle); elem; elem = snd_mixer_elem_next(elem)) {
-- if (!snd_mixer_selem_is_active(elem))
-- continue;
-- TRACE2("Simple mixer control '%s',%i\n",
-- snd_mixer_selem_get_name(elem),
-- snd_mixer_selem_get_index(elem));
-- if (snd_mixer_selem_has_playback_volume(elem)) {
-- portMixer->elems[portMixer->numElems] = elem;
-- portMixer->types[portMixer->numElems] = PORT_DST_UNKNOWN;
-- portMixer->numElems++;
-- }
-- // to prevent buffer overflow
-- if (portMixer->numElems >= MAX_ELEMS) {
-- break;
-- }
-- /* If an element has both playback an capture volume, it is put into the arrays
-- twice. */
-- if (snd_mixer_selem_has_capture_volume(elem)) {
-- portMixer->elems[portMixer->numElems] = elem;
-- portMixer->types[portMixer->numElems] = PORT_SRC_UNKNOWN;
-- portMixer->numElems++;
-- }
-- // to prevent buffer overflow
-- if (portMixer->numElems >= MAX_ELEMS) {
-- break;
-- }
-- }
-- }
-- TRACE0("< PORT_GetPortCount\n");
-- return portMixer->numElems;
--}
--
--
--INT32 PORT_GetPortType(void* id, INT32 portIndex) {
-- PortMixer* portMixer;
-- INT32 type;
-- TRACE0("> PORT_GetPortType\n");
-- if (id == NULL) {
-- // $$mp: Should become a descriptive error code (invalid handle).
-- return -1;
-- }
-- portMixer = (PortMixer*) id;
-- if (portIndex < 0 || portIndex >= portMixer->numElems) {
-- // $$mp: Should become a descriptive error code (index out of bounds).
-- return -1;
-- }
-- type = portMixer->types[portIndex];
-- TRACE0("< PORT_GetPortType\n");
-- return type;
--}
--
--
--INT32 PORT_GetPortName(void* id, INT32 portIndex, char* name, INT32 len) {
-- PortMixer* portMixer;
-- const char* nam;
--
-- TRACE0("> PORT_GetPortName\n");
-- if (id == NULL) {
-- // $$mp: Should become a descriptive error code (invalid handle).
-- return -1;
-- }
-- portMixer = (PortMixer*) id;
-- if (portIndex < 0 || portIndex >= portMixer->numElems) {
-- // $$mp: Should become a descriptive error code (index out of bounds).
-- return -1;
-- }
-- nam = snd_mixer_selem_get_name(portMixer->elems[portIndex]);
-- strncpy(name, nam, len - 1);
-- name[len - 1] = 0;
-- TRACE0("< PORT_GetPortName\n");
-- return TRUE;
--}
--
--
--static int isPlaybackFunction(INT32 portType) {
-- return (portType & PORT_DST_MASK);
--}
--
--
--/* Sets portControl to a pointer to the next free array element in the PortControl (pointer)
-- array of the passed portMixer. Returns TRUE if successful. May return FALSE if there is no
-- free slot. In this case, portControl is not altered */
--static int getControlSlot(PortMixer* portMixer, PortControl** portControl) {
-- if (portMixer->numControls >= MAX_CONTROLS) {
-- return FALSE;
-- } else {
-- *portControl = &(portMixer->controls[portMixer->numControls]);
-- portMixer->numControls++;
-- return TRUE;
-- }
--}
--
--
--/* Protect against illegal min-max values, preventing divisions by zero.
-- */
--inline static long getRange(long min, long max) {
-- if (max > min) {
-- return max - min;
-- } else {
-- return 1;
-- }
--}
--
--
--/* Idea: we may specify that if unit is an empty string, the values are linear and if unit is "dB",
-- the values are logarithmic.
--*/
--static void* createVolumeControl(PortControlCreator* creator,
-- PortControl* portControl,
-- snd_mixer_elem_t* elem, int isPlayback) {
-- void* control;
-- float precision;
-- long min, max;
--
-- if (isPlayback) {
-- snd_mixer_selem_get_playback_volume_range(elem, &min, &max);
-- } else {
-- snd_mixer_selem_get_capture_volume_range(elem, &min, &max);
-- }
-- /* $$mp: The volume values retrieved with the ALSA API are strongly supposed to be logarithmic.
-- So the following calculation is wrong. However, there is no correct calculation, since
-- for equal-distant logarithmic steps, the precision expressed in linear varies over the
-- scale. */
-- precision = 1.0F / getRange(min, max);
-- control = (creator->newFloatControl)(creator, portControl, CONTROL_TYPE_VOLUME, 0.0F, +1.0F, precision, "");
-- return control;
--}
--
--
--void PORT_GetControls(void* id, INT32 portIndex, PortControlCreator* creator) {
-- PortMixer* portMixer;
-- snd_mixer_elem_t* elem;
-- void* control;
-- PortControl* portControl;
-- void* controls[10];
-- int numControls;
-- char* portName;
-- int isPlayback;
-- int isMono;
-- int isStereo;
-- char* type;
-- snd_mixer_selem_channel_id_t channel;
--
-- TRACE0("> PORT_GetControls\n");
-- if (id == NULL) {
-- ERROR0("Invalid handle!");
-- // $$mp: an error code should be returned.
-- return;
-- }
-- portMixer = (PortMixer*) id;
-- if (portIndex < 0 || portIndex >= portMixer->numElems) {
-- ERROR0("Port index out of range!");
-- // $$mp: an error code should be returned.
-- return;
-- }
-- numControls = 0;
-- elem = portMixer->elems[portIndex];
-- if (snd_mixer_selem_has_playback_volume(elem) || snd_mixer_selem_has_capture_volume(elem)) {
-- /* Since we've splitted/duplicated elements with both playback and capture on the recovery
-- of elements, we now can assume that we handle only to deal with either playback or
-- capture. */
-- isPlayback = isPlaybackFunction(portMixer->types[portIndex]);
-- isMono = (isPlayback && snd_mixer_selem_is_playback_mono(elem)) ||
-- (!isPlayback && snd_mixer_selem_is_capture_mono(elem));
-- isStereo = (isPlayback &&
-- snd_mixer_selem_has_playback_channel(elem, SND_MIXER_SCHN_FRONT_LEFT) &&
-- snd_mixer_selem_has_playback_channel(elem, SND_MIXER_SCHN_FRONT_RIGHT)) ||
-- (!isPlayback &&
-- snd_mixer_selem_has_capture_channel(elem, SND_MIXER_SCHN_FRONT_LEFT) &&
-- snd_mixer_selem_has_capture_channel(elem, SND_MIXER_SCHN_FRONT_RIGHT));
-- // single volume control
-- if (isMono || isStereo) {
-- if (getControlSlot(portMixer, &portControl)) {
-- portControl->elem = elem;
-- portControl->portType = portMixer->types[portIndex];
-- portControl->controlType = CONTROL_TYPE_VOLUME;
-- if (isMono) {
-- portControl->channel = CHANNELS_MONO;
-- } else {
-- portControl->channel = CHANNELS_STEREO;
-- }
-- control = createVolumeControl(creator, portControl, elem, isPlayback);
-- if (control != NULL) {
-- controls[numControls++] = control;
-- }
-- }
-- } else { // more than two channels, each channels has its own control.
-- for (channel = SND_MIXER_SCHN_FRONT_LEFT; channel <= SND_MIXER_SCHN_LAST; channel++) {
-- if (isPlayback && snd_mixer_selem_has_playback_channel(elem, channel) ||
-- !isPlayback && snd_mixer_selem_has_capture_channel(elem, channel)) {
-- if (getControlSlot(portMixer, &portControl)) {
-- portControl->elem = elem;
-- portControl->portType = portMixer->types[portIndex];
-- portControl->controlType = CONTROL_TYPE_VOLUME;
-- portControl->channel = channel;
-- control = createVolumeControl(creator, portControl, elem, isPlayback);
-- // We wrap in a compound control to provide the channel name.
-- if (control != NULL) {
-- /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
-- declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
-- to take a const char* parameter. */
-- control = (creator->newCompoundControl)(creator, (char*) snd_mixer_selem_channel_name(channel), &control, 1);
-- }
-- if (control != NULL) {
-- controls[numControls++] = control;
-- }
-- }
-- }
-- }
-- }
-- // BALANCE control
-- if (isStereo) {
-- if (getControlSlot(portMixer, &portControl)) {
-- portControl->elem = elem;
-- portControl->portType = portMixer->types[portIndex];
-- portControl->controlType = CONTROL_TYPE_BALANCE;
-- portControl->channel = CHANNELS_STEREO;
-- /* $$mp: The value for precision is chosen more or less arbitrarily. */
-- control = (creator->newFloatControl)(creator, portControl, CONTROL_TYPE_BALANCE, -1.0F, 1.0F, 0.01F, "");
-- if (control != NULL) {
-- controls[numControls++] = control;
-- }
-- }
-- }
-- }
-- if (snd_mixer_selem_has_playback_switch(elem) || snd_mixer_selem_has_capture_switch(elem)) {
-- if (getControlSlot(portMixer, &portControl)) {
-- type = isPlayback ? CONTROL_TYPE_MUTE : CONTROL_TYPE_SELECT;
-- portControl->elem = elem;
-- portControl->portType = portMixer->types[portIndex];
-- portControl->controlType = type;
-- control = (creator->newBooleanControl)(creator, portControl, type);
-- if (control != NULL) {
-- controls[numControls++] = control;
-- }
-- }
-- }
-- /* $$mp 2003-09-14: The following cast shouln't be necessary. Instead, the
-- declaration of PORT_NewCompoundControlPtr in Ports.h should be changed
-- to take a const char* parameter. */
-- portName = (char*) snd_mixer_selem_get_name(elem);
-- control = (creator->newCompoundControl)(creator, portName, controls, numControls);
-- if (control != NULL) {
-- (creator->addControl)(creator, control);
-- }
-- TRACE0("< PORT_GetControls\n");
--}
--
--
--INT32 PORT_GetIntValue(void* controlIDV) {
-- PortControl* portControl = (PortControl*) controlIDV;
-- int value = 0;
-- snd_mixer_selem_channel_id_t channel;
--
-- if (portControl != NULL) {
-- switch (portControl->channel) {
-- case CHANNELS_MONO:
-- channel = SND_MIXER_SCHN_MONO;
-- break;
--
-- case CHANNELS_STEREO:
-- channel = SND_MIXER_SCHN_FRONT_LEFT;
-- break;
--
-- default:
-- channel = portControl->channel;
-- }
-- if (portControl->controlType == CONTROL_TYPE_MUTE ||
-- portControl->controlType == CONTROL_TYPE_SELECT) {
-- if (isPlaybackFunction(portControl->portType)) {
-- snd_mixer_selem_get_playback_switch(portControl->elem, channel, &value);
-- } else {
-- snd_mixer_selem_get_capture_switch(portControl->elem, channel, &value);
-- }
-- if (portControl->controlType == CONTROL_TYPE_MUTE) {
-- value = ! value;
-- }
-- } else {
-- ERROR1("PORT_GetIntValue(): inappropriate control type: %s\n",
-- portControl->controlType);
-- }
-- }
-- return (INT32) value;
--}
--
--
--void PORT_SetIntValue(void* controlIDV, INT32 value) {
-- PortControl* portControl = (PortControl*) controlIDV;
-- snd_mixer_selem_channel_id_t channel;
--
-- if (portControl != NULL) {
-- if (portControl->controlType == CONTROL_TYPE_MUTE) {
-- value = ! value;
-- }
-- if (portControl->controlType == CONTROL_TYPE_MUTE ||
-- portControl->controlType == CONTROL_TYPE_SELECT) {
-- if (isPlaybackFunction(portControl->portType)) {
-- snd_mixer_selem_set_playback_switch_all(portControl->elem, value);
-- } else {
-- snd_mixer_selem_set_capture_switch_all(portControl->elem, value);
-- }
-- } else {
-- ERROR1("PORT_SetIntValue(): inappropriate control type: %s\n",
-- portControl->controlType);
-- }
-- }
--}
--
--
--static float scaleVolumeValueToNormalized(long value, long min, long max) {
-- return (float) (value - min) / getRange(min, max);
--}
--
--
--static long scaleVolumeValueToHardware(float value, long min, long max) {
-- return (long)(value * getRange(min, max) + min);
--}
--
--
--float getRealVolume(PortControl* portControl,
-- snd_mixer_selem_channel_id_t channel) {
-- float fValue;
-- long lValue = 0;
-- long min = 0;
-- long max = 0;
--
-- if (isPlaybackFunction(portControl->portType)) {
-- snd_mixer_selem_get_playback_volume_range(portControl->elem,
-- &min, &max);
-- snd_mixer_selem_get_playback_volume(portControl->elem,
-- channel, &lValue);
-- } else {
-- snd_mixer_selem_get_capture_volume_range(portControl->elem,
-- &min, &max);
-- snd_mixer_selem_get_capture_volume(portControl->elem,
-- channel, &lValue);
-- }
-- fValue = scaleVolumeValueToNormalized(lValue, min, max);
-- return fValue;
--}
--
--
--void setRealVolume(PortControl* portControl,
-- snd_mixer_selem_channel_id_t channel, float value) {
-- long lValue = 0;
-- long min = 0;
-- long max = 0;
--
-- if (isPlaybackFunction(portControl->portType)) {
-- snd_mixer_selem_get_playback_volume_range(portControl->elem,
-- &min, &max);
-- lValue = scaleVolumeValueToHardware(value, min, max);
-- snd_mixer_selem_set_playback_volume(portControl->elem,
-- channel, lValue);
-- } else {
-- snd_mixer_selem_get_capture_volume_range(portControl->elem,
-- &min, &max);
-- lValue = scaleVolumeValueToHardware(value, min, max);
-- snd_mixer_selem_set_capture_volume(portControl->elem,
-- channel, lValue);
-- }
--}
--
--
--static float getFakeBalance(PortControl* portControl) {
-- float volL, volR;
--
-- // pan is the ratio of left and right
-- volL = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT);
-- volR = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT);
-- if (volL > volR) {
-- return -1.0f + (volR / volL);
-- }
-- else if (volR > volL) {
-- return 1.0f - (volL / volR);
-- }
-- return 0.0f;
--}
--
--
--static float getFakeVolume(PortControl* portControl) {
-- float valueL;
-- float valueR;
-- float value;
--
-- valueL = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT);
-- valueR = getRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT);
-- // volume is the greater value of both
-- value = valueL > valueR ? valueL : valueR ;
-- return value;
--}
--
--
--/*
-- * sets the unsigned values for left and right volume according to
-- * the given volume (0...1) and balance (-1..0..+1)
-- */
--static void setFakeVolume(PortControl* portControl, float vol, float bal) {
-- float volumeLeft;
-- float volumeRight;
--
-- if (bal < 0.0f) {
-- volumeLeft = vol;
-- volumeRight = vol * (bal + 1.0f);
-- } else {
-- volumeLeft = vol * (1.0f - bal);
-- volumeRight = vol;
-- }
-- setRealVolume(portControl, SND_MIXER_SCHN_FRONT_LEFT, volumeLeft);
-- setRealVolume(portControl, SND_MIXER_SCHN_FRONT_RIGHT, volumeRight);
--}
--
--
--float PORT_GetFloatValue(void* controlIDV) {
-- PortControl* portControl = (PortControl*) controlIDV;
-- float value = 0.0F;
--
-- if (portControl != NULL) {
-- if (portControl->controlType == CONTROL_TYPE_VOLUME) {
-- switch (portControl->channel) {
-- case CHANNELS_MONO:
-- value = getRealVolume(portControl, SND_MIXER_SCHN_MONO);
-- break;
--
-- case CHANNELS_STEREO:
-- value = getFakeVolume(portControl);
-- break;
--
-- default:
-- value = getRealVolume(portControl, portControl->channel);
-- }
-- } else if (portControl->controlType == CONTROL_TYPE_BALANCE) {
-- if (portControl->channel == CHANNELS_STEREO) {
-- value = getFakeBalance(portControl);
-- } else {
-- ERROR0("PORT_GetFloatValue(): Balance only allowed for stereo channels!\n");
-- }
-- } else {
-- ERROR1("PORT_GetFloatValue(): inappropriate control type: %s!\n",
-- portControl->controlType);
-- }
-- }
-- return value;
--}
--
--
--void PORT_SetFloatValue(void* controlIDV, float value) {
-- PortControl* portControl = (PortControl*) controlIDV;
--
-- if (portControl != NULL) {
-- if (portControl->controlType == CONTROL_TYPE_VOLUME) {
-- switch (portControl->channel) {
-- case CHANNELS_MONO:
-- setRealVolume(portControl, SND_MIXER_SCHN_MONO, value);
-- break;
--
-- case CHANNELS_STEREO:
-- setFakeVolume(portControl, value, getFakeBalance(portControl));
-- break;
--
-- default:
-- setRealVolume(portControl, portControl->channel, value);
-- }
-- } else if (portControl->controlType == CONTROL_TYPE_BALANCE) {
-- if (portControl->channel == CHANNELS_STEREO) {
-- setFakeVolume(portControl, getFakeVolume(portControl), value);
-- } else {
-- ERROR0("PORT_SetFloatValue(): Balance only allowed for stereo channels!\n");
-- }
-- } else {
-- ERROR1("PORT_SetFloatValue(): inappropriate control type: %s!\n",
-- portControl->controlType);
-- }
-- }
--}
--
--
--#endif // USE_PORTS
---- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2010-10-31 14:12:36.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2011-05-26 18:56:38.000000000 -0700
++++ ./jdk/src/solaris/native/java/io/UnixFileSystem_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -41,6 +41,12 @@
#include "java_io_FileSystem.h"
#include "java_io_UnixFileSystem.h"
@@ -25532,8 +26026,8 @@ $FreeBSD$
JNIEXPORT jboolean JNICALL
Java_java_io_UnixFileSystem_setPermission(JNIEnv *env, jobject this,
jobject file,
---- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/canonicalize_md.c 2011-05-26 18:56:38.000000000 -0700
++++ ./jdk/src/solaris/native/java/io/canonicalize_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,9 @@
#include <sys/stat.h>
#include <errno.h>
@@ -25544,8 +26038,8 @@ $FreeBSD$
/* Note: The comments in this file use the terminology
---- ./jdk/src/solaris/native/java/io/io_util_md.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/io/io_util_md.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/java/io/io_util_md.c 2011-05-26 18:56:38.000000000 -0700
++++ ./jdk/src/solaris/native/java/io/io_util_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -36,7 +36,7 @@
WITH_PLATFORM_STRING(env, path, ps) {
FD fd;
@@ -25555,8 +26049,8 @@ $FreeBSD$
/* Remove trailing slashes, since the kernel won't */
char *p = (char *)ps + strlen(ps) - 1;
while ((p > ps) && (*p == '/'))
---- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2010-06-15 22:07:34.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/lang/ProcessEnvironment_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,6 +28,11 @@
#include "jni.h"
#include "jni_util.h"
@@ -25597,8 +26091,8 @@ $FreeBSD$
jbyteArray var, val;
const char * valBeg = varEnd + 1;
jsize varLength = varEnd - environ[i];
---- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2010-06-15 22:07:34.000000000 -0700
+--- ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/lang/UNIXProcess_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -40,7 +40,11 @@
#include <stdlib.h>
#include <sys/types.h>
@@ -25701,8 +26195,8 @@ $FreeBSD$
if (envp == NULL || (char **) envp == environ) {
execvp(file, (char **) argv);
return;
---- ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2010-12-11 09:07:22.000000000 -0800
+--- ./jdk/src/solaris/native/java/lang/java_props_md.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/lang/java_props_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -23,7 +23,7 @@
* questions.
*/
@@ -25736,9 +26230,9 @@ $FreeBSD$
#endif
+#endif /* !_ALLBSD_SOURCE */
- /* Take an array of string pairs (map of key->value) and a string (key).
- * Examine each pair in the map to see if the first string (key) matches the
-@@ -397,6 +406,13 @@
+ #ifdef JAVASE_EMBEDDED
+ #include <dlfcn.h>
+@@ -437,6 +446,13 @@
sprops.display_variant = sprops.variant;
sprops.sun_jnu_encoding = sprops.encoding;
@@ -25752,7 +26246,7 @@ $FreeBSD$
#ifdef __linux__
#if __BYTE_ORDER == __LITTLE_ENDIAN
sprops.unicode_encoding = "UnicodeLittle";
-@@ -406,6 +422,7 @@
+@@ -446,6 +462,7 @@
#else
sprops.unicode_encoding = "UnicodeBig";
#endif
@@ -25760,7 +26254,7 @@ $FreeBSD$
/* user properties */
{
-@@ -442,12 +459,14 @@
+@@ -482,12 +499,14 @@
sprops.path_separator = ":";
sprops.line_separator = "\n";
@@ -25775,8 +26269,8 @@ $FreeBSD$
return &sprops;
}
---- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2010-11-13 12:00:17.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/Inet4AddressImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -36,12 +36,288 @@
#include <stdlib.h>
#include <ctype.h>
@@ -26066,32 +26560,32 @@ $FreeBSD$
/* the initial size of our hostent buffers */
#define HENT_BUF_SIZE 1024
#define BIG_HENT_BUF_SIZE 10240 /* a jumbo-sized one */
-@@ -81,13 +357,13 @@
- char buf2[HENT_BUF_SIZE];
- int h_error=0;
+@@ -86,13 +362,13 @@
+ // ensure null-terminated
+ hostname[MAXHOSTNAMELEN] = '\0';
-#ifdef __GLIBC__
+#ifdef HAS_GLIBC_GETHOSTBY_R
- gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
+ gethostbyname_r(hostname, &res, (char*)buf, sizeof(buf), &hp, &h_error);
#else
- hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
+ hp = gethostbyname_r(hostname, &res, (char*)buf, sizeof(buf), &h_error);
#endif
if (hp) {
-#ifdef __GLIBC__
+#ifdef HAS_GLIBC_GETHOSTBY_R
gethostbyaddr_r(hp->h_addr, hp->h_length, AF_INET,
- &res2, buf2, sizeof(buf2), &hp, &h_error);
+ &res2, (char*)buf2, sizeof(buf2), &hp, &h_error);
#else
-@@ -175,7 +451,7 @@
+@@ -182,7 +458,7 @@
#endif
/* Try once, with our static buffer. */
-#ifdef __GLIBC__
+#ifdef HAS_GLIBC_GETHOSTBY_R
- gethostbyname_r(hostname, &res, buf, sizeof(buf), &hp, &h_error);
+ gethostbyname_r(hostname, &res, (char*)buf, sizeof(buf), &hp, &h_error);
#else
- hp = gethostbyname_r(hostname, &res, buf, sizeof(buf), &h_error);
-@@ -188,7 +464,7 @@
+ hp = gethostbyname_r(hostname, &res, (char*)buf, sizeof(buf), &h_error);
+@@ -195,7 +471,7 @@
*/
if (hp == NULL && errno == ERANGE) {
if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
@@ -26100,16 +26594,16 @@ $FreeBSD$
gethostbyname_r(hostname, &res, tmp, BIG_HENT_BUF_SIZE,
&hp, &h_error);
#else
-@@ -271,7 +547,7 @@
+@@ -280,7 +556,7 @@
addr |= ((caddr[2] <<8) & 0xff00);
addr |= (caddr[3] & 0xff);
addr = htonl(addr);
-#ifdef __GLIBC__
+#ifdef HAS_GLIBC_GETHOSTBY_R
gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET, &hent,
- buf, sizeof(buf), &hp, &h_error);
+ (char*)buf, sizeof(buf), &hp, &h_error);
#else
-@@ -285,7 +561,7 @@
+@@ -294,7 +570,7 @@
*/
if (hp == NULL && errno == ERANGE) {
if ((tmp = (char*)malloc(BIG_HENT_BUF_SIZE))) {
@@ -26118,7 +26612,7 @@ $FreeBSD$
gethostbyaddr_r((char *)&addr, sizeof(addr), AF_INET,
&hent, tmp, BIG_HENT_BUF_SIZE, &hp, &h_error);
#else
-@@ -307,6 +583,8 @@
+@@ -316,6 +592,8 @@
return ret;
}
@@ -26127,8 +26621,8 @@ $FreeBSD$
#define SET_NONBLOCKING(fd) { \
int flags = fcntl(fd, F_GETFL); \
flags |= O_NONBLOCK; \
---- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2010-11-13 12:00:17.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/Inet6AddressImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,6 +33,9 @@
#include <strings.h>
#include <stdlib.h>
@@ -26139,10 +26633,10 @@ $FreeBSD$
#include "jvm.h"
#include "jni_util.h"
-@@ -68,10 +71,18 @@
- /* Something went wrong, maybe networking is not setup? */
- strcpy(hostname, "localhost");
+@@ -70,10 +73,18 @@
} else {
+ // ensure null-terminated
+ hostname[NI_MAXHOST] = '\0';
-#ifdef __linux__
- /* On Linux gethostname() says "host.domain.sun.com". On
+#if defined(__linux__) && defined(_ALLBSD_SOURCE)
@@ -26160,7 +26654,7 @@ $FreeBSD$
#else
/* Solaris doesn't want to give us a fully qualified domain name.
* We do a reverse lookup to try and get one. This works
-@@ -107,7 +118,7 @@
+@@ -109,7 +120,7 @@
}
}
#endif /* AF_INET6 */
@@ -26169,8 +26663,8 @@ $FreeBSD$
}
return (*env)->NewStringUTF(env, hostname);
}
---- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2010-10-31 13:48:56.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/NetworkInterface.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,6 +26,9 @@
#include <errno.h>
@@ -26181,7 +26675,7 @@ $FreeBSD$
#include <netinet/in.h>
#include <stdlib.h>
#include <string.h>
-@@ -54,6 +57,23 @@
+@@ -53,6 +56,23 @@
#define _PATH_PROCNET_IFINET6 "/proc/net/if_inet6"
#endif
@@ -26205,7 +26699,7 @@ $FreeBSD$
#include "jvm.h"
#include "jni_util.h"
#include "net_util.h"
-@@ -821,11 +841,11 @@
+@@ -820,11 +840,11 @@
netif *currif = ifs, *parent;
netaddr *addrP;
@@ -26220,7 +26714,7 @@ $FreeBSD$
char *name_colonP;
int mask;
-@@ -1649,3 +1669,307 @@
+@@ -1648,3 +1668,307 @@
#endif
@@ -26528,8 +27022,8 @@ $FreeBSD$
+}
+
+#endif
---- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/PlainDatagramSocketImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -23,12 +23,12 @@
* questions.
*/
@@ -26636,8 +27130,8 @@ $FreeBSD$
}
}
}
---- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/PlainSocketImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -483,9 +483,11 @@
if (connect_rv == JVM_IO_INTR) {
JNU_ThrowByName(env, JNU_JAVAIOPKG "InterruptedIOException",
@@ -26659,8 +27153,8 @@ $FreeBSD$
int port;
jobject iaObj;
jclass iaCntrClass;
---- ./jdk/src/solaris/native/java/net/bsd_close.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/bsd_close.c 2010-07-04 12:40:44.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/bsd_close.c 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/bsd_close.c 2011-04-22 23:08:39.000000000 -0700
@@ -57,7 +57,7 @@
/*
* Signal to unblock thread
@@ -26696,8 +27190,8 @@ $FreeBSD$
}
int NET_Connect(int s, struct sockaddr *addr, int addrlen) {
---- ./jdk/src/solaris/native/java/net/net_util_md.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.c 2010-12-11 09:46:10.000000000 -0800
+--- ./jdk/src/solaris/native/java/net/net_util_md.c 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,16 @@
#include <netdb.h>
#include <stdlib.h>
@@ -26908,8 +27402,8 @@ $FreeBSD$
len = sizeof(arg);
if (getsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (char *)&arg,
---- ./jdk/src/solaris/native/java/net/net_util_md.h 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/net/net_util_md.h 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/java/net/net_util_md.h 2011-05-26 18:56:39.000000000 -0700
++++ ./jdk/src/solaris/native/java/net/net_util_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -37,7 +37,7 @@
#endif
@@ -26919,8 +27413,8 @@ $FreeBSD$
extern int NET_Timeout(int s, long timeout);
extern int NET_Read(int s, void* buf, size_t len);
extern int NET_RecvFrom(int s, void *buf, int len, unsigned int flags,
---- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2010-06-15 22:07:35.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2011-05-26 18:56:40.000000000 -0700
++++ ./jdk/src/solaris/native/java/util/FileSystemPreferences.c 2011-04-22 23:08:39.000000000 -0700
@@ -47,8 +47,11 @@
return (jint) result;
}
@@ -26958,8 +27452,8 @@ $FreeBSD$
if (rc < 0) {
close(fd);
---- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2010-06-15 22:07:35.000000000 -0700
+--- ./jdk/src/solaris/native/java/util/TimeZone_md.c 2011-05-26 18:56:40.000000000 -0700
++++ ./jdk/src/solaris/native/java/util/TimeZone_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -31,7 +31,7 @@
#include <errno.h>
#include <stddef.h>
@@ -27096,8 +27590,8 @@ $FreeBSD$
sprintf(buf, (const char *)"GMT%c%02d:%02d",
sign, (int)(offset/3600), (int)((offset%3600)/60));
return strdup(buf);
---- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2010-06-15 22:07:35.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2011-05-26 18:56:40.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/CUPSfuncs.c 2011-04-22 23:08:39.000000000 -0700
@@ -25,6 +25,7 @@
#include <jni.h>
@@ -27120,8 +27614,8 @@ $FreeBSD$
if (handle == NULL) {
return JNI_FALSE;
}
---- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2010-06-15 22:07:35.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2011-05-26 18:56:40.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/VDrawingArea.c 2011-04-22 23:08:39.000000000 -0700
@@ -31,7 +31,11 @@
#endif /* !HEADLESS */
@@ -27134,8 +27628,8 @@ $FreeBSD$
#ifdef __linux__
/* XXX: Shouldn't be necessary. */
---- ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2010-06-15 22:07:35.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/X11Color.c 2011-05-26 18:56:40.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/X11Color.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,9 @@
#include <math.h>
#include <sys/time.h>
@@ -27146,8 +27640,8 @@ $FreeBSD$
#ifndef HEADLESS
#include <X11/Xlib.h>
#include <X11/Xatom.h>
---- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-12-16 14:15:16.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2010-06-15 22:07:35.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2011-05-26 18:56:40.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/XDrawingArea.c 2011-04-22 23:08:39.000000000 -0700
@@ -31,7 +31,11 @@
#include <Xm/XmP.h>
@@ -27160,8 +27654,8 @@ $FreeBSD$
#ifdef DEBUG
#include <jvm.h> /* To get jio_fprintf() */
---- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2010-06-15 22:07:35.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Font.c 2011-05-26 18:56:42.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_Font.c 2011-04-22 23:08:39.000000000 -0700
@@ -334,7 +334,7 @@
if (strcmp(style, "regular") == 0) {
altstyle = "roman";
@@ -27171,8 +27665,8 @@ $FreeBSD$
if (!strcmp(family, "lucidasans")) {
family = "lucida";
}
---- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2010-06-15 22:07:35.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-05-26 18:56:43.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_GraphicsEnv.c 2011-04-22 23:08:39.000000000 -0700
@@ -40,6 +40,7 @@
#include <jni.h>
#include <jni_util.h>
@@ -27300,8 +27794,8 @@ $FreeBSD$
if (pLibRandR == NULL) {
J2dRlsTraceLn(J2D_TRACE_ERROR,
"X11GD_InitXrandrFuncs: Could not open libXrandr.so.2");
---- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2010-10-31 14:18:11.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2011-05-26 18:56:43.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_InputMethod.c 2011-04-22 23:08:39.000000000 -0700
@@ -67,7 +67,7 @@
XIMPreeditDrawCallbackStruct *);
static void PreeditCaretCallback(XIC, XPointer,
@@ -27541,22 +28035,23 @@ $FreeBSD$
AWT_LOCK();
adjustStatusWindow(window);
AWT_UNLOCK();
---- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2010-06-15 22:07:36.000000000 -0700
-@@ -143,7 +143,11 @@
- (*env)->DeleteLocalRef(env, propname);
+--- ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2011-05-26 18:56:43.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_LoadLibrary.c 2011-05-07 22:00:01.000000000 -0700
+@@ -130,10 +130,10 @@
+
+ /* Calculate library name to load */
+ if (AWTIsHeadless()) {
+- strncpy(p, "/headless/libmawt.so", MAXPATHLEN-len-1);
++ strncpy(p, "/headless/libmawt" JNI_LIB_SUFFIX, MAXPATHLEN-len-1);
+ } else {
+ /* Default AWT Toolkit on Linux and Solaris is XAWT. */
+- strncpy(p, "/xawt/libmawt.so", MAXPATHLEN-len-1);
++ strncpy(p, "/xawt/libmawt" JNI_LIB_SUFFIX, MAXPATHLEN-len-1);
}
-+#ifdef __APPLE__
-+ strcat(p, ".dylib");
-+#else
- strcat(p, ".so");
-+#endif
-
- JNU_CallStaticMethodByName(env, NULL, "java/lang/System", "load",
- "(Ljava/lang/String;)V",
---- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2010-12-04 08:27:53.000000000 -0800
+ if (toolkit) {
+--- ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2011-05-26 18:56:43.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_MToolkit.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,8 +63,9 @@
extern JavaVM *jvm;
@@ -27577,8 +28072,8 @@ $FreeBSD$
statusWindowEventHandler(xev);
#endif
xembed_eventHandler(&xev);
---- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2010-06-15 22:07:36.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2011-05-26 18:56:44.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_Mlib.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,6 +32,7 @@
#include <dlfcn.h>
#include "jni.h"
@@ -27601,8 +28096,8 @@ $FreeBSD$
}
if (handle == NULL) {
---- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2011-05-26 18:56:44.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_Robot.c 2011-05-20 20:09:20.000000000 -0700
@@ -45,7 +45,7 @@
#include "wsutils.h"
#include "list.h"
@@ -27612,8 +28107,16 @@ $FreeBSD$
#include <sys/socket.h>
#endif
---- ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2010-06-15 22:07:36.000000000 -0700
+@@ -196,7 +196,6 @@
+ AWT_UNLOCK();
+ }
+
+-
+ JNIEXPORT void JNICALL
+ Java_sun_awt_X11_XRobotPeer_getRGBPixelsImpl( JNIEnv *env,
+ jclass cls,
+--- ./jdk/src/solaris/native/sun/awt/awt_util.h 2011-05-26 18:56:45.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_util.h 2011-04-22 23:08:39.000000000 -0700
@@ -187,15 +187,20 @@
#ifdef __solaris__
extern Widget awt_util_getXICStatusAreaWindow(Widget w);
@@ -27636,8 +28139,8 @@ $FreeBSD$
typedef struct _XmImRefRec {
Cardinal num_refs; /* Number of referencing widgets. */
Cardinal max_refs; /* Maximum length of refs array. */
---- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2010-06-15 22:07:36.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.c 2011-05-26 18:56:45.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.c 2011-04-22 23:08:39.000000000 -0700
@@ -121,12 +121,19 @@
static Atom XA_KWM_WIN_MAXIMIZED;
@@ -27735,8 +28238,8 @@ $FreeBSD$
awt_wmgr = OPENLOOK_WM;
}
else {
---- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2010-06-15 22:07:36.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/awt_wm.h 2011-05-26 18:56:45.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/awt_wm.h 2011-04-22 23:08:39.000000000 -0700
@@ -45,7 +45,10 @@
KDE2_WM,
SAWFISH_WM,
@@ -27749,8 +28252,8 @@ $FreeBSD$
};
extern void awt_wm_init(void);
---- ./jdk/src/solaris/native/sun/awt/extutil.h 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/extutil.h 2010-06-15 22:07:36.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/extutil.h 2011-05-26 18:56:45.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/extutil.h 2011-04-22 23:08:39.000000000 -0700
@@ -58,7 +58,7 @@
*/
/* $XFree86: xc/include/extensions/extutil.h,v 1.5 2001/01/17 17:53:20 dawes Exp $ */
@@ -27766,8 +28269,8 @@ $FreeBSD$
-#endif /* __linux__ */
+#endif /* __linux__ || _ALLBSD_SOURCE */
---- ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2010-12-04 08:27:53.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/fontpath.c 2011-05-26 18:56:46.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/fontpath.c 2011-05-12 20:55:07.000000000 -0700
@@ -23,7 +23,7 @@
* questions.
*/
@@ -27894,8 +28397,8 @@ $FreeBSD$
+ /* There's no headless build on linux ... */
if (!AWTIsHeadless()) { /* .. so need to call a function to check */
#endif
- AWT_LOCK();
-@@ -507,7 +541,7 @@
+ /* Using the X11 font path to locate font files is now a fallback
+@@ -514,7 +548,7 @@
x11dirs = getX11FontPath();
}
AWT_UNLOCK();
@@ -27904,7 +28407,7 @@ $FreeBSD$
}
#endif
#endif /* !HEADLESS */
-@@ -605,7 +639,7 @@
+@@ -547,7 +581,7 @@
}
#include <dlfcn.h>
@@ -27913,7 +28416,7 @@ $FreeBSD$
#include <link.h>
#endif
-@@ -651,9 +685,9 @@
+@@ -593,9 +627,9 @@
* certain symbols - and functionality - to be available.
* Also add explicit search for .so.1 in case .so symlink doesn't exist.
*/
@@ -27925,8 +28428,8 @@ $FreeBSD$
if (libfontconfig == NULL) {
return NULL;
}
---- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2010-12-11 09:07:22.000000000 -0800
+--- ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2011-05-26 18:56:46.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/gtk2_interface.c 2011-05-07 21:54:10.000000000 -0700
@@ -30,9 +30,12 @@
#include <string.h>
#include "gtk2_interface.h"
@@ -27957,7 +28460,7 @@ $FreeBSD$
}
fp_gtk_check_version = dlsym(lib, "gtk_check_version");
-@@ -468,11 +474,19 @@
+@@ -470,11 +476,19 @@
int (*io_handler)();
char *gtk_modules_env;
@@ -27981,8 +28484,8 @@ $FreeBSD$
if (setjmp(j) == 0)
{
---- ./jdk/src/solaris/native/sun/awt/list.c 2010-12-16 14:15:17.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/list.c 2010-06-15 22:07:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/list.c 2011-05-26 18:56:46.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/list.c 2011-04-22 23:08:39.000000000 -0700
@@ -66,7 +66,11 @@
----------------------------------------------------------------------- **/
@@ -27995,8 +28498,8 @@ $FreeBSD$
#include "list.h"
---- ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-12-16 14:15:21.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2010-06-15 22:07:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/awt/robot_common.c 2011-05-26 18:56:55.000000000 -0700
++++ ./jdk/src/solaris/native/sun/awt/robot_common.c 2011-04-22 23:08:39.000000000 -0700
@@ -27,6 +27,9 @@
#error This file should not be included in headless library
#endif
@@ -28007,8 +28510,8 @@ $FreeBSD$
#include "robot_common.h"
/*
---- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-12-16 14:15:21.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2010-06-15 22:07:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2011-05-26 18:56:56.000000000 -0700
++++ ./jdk/src/solaris/native/sun/font/X11FontScaler.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,7 +32,11 @@
* into X11FontScaler_md.c, which is compiled into another library.
*/
@@ -28021,8 +28524,8 @@ $FreeBSD$
#include <ctype.h>
#include <sys/utsname.h>
---- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-12-16 14:15:21.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2010-06-15 22:07:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2011-05-26 18:56:57.000000000 -0700
++++ ./jdk/src/solaris/native/sun/font/X11TextRenderer.c 2011-04-22 23:08:39.000000000 -0700
@@ -39,7 +39,11 @@
#include "GraphicsPrimitiveMgr.h"
#include "glyphblitting.h"
@@ -28035,8 +28538,8 @@ $FreeBSD$
JNIEXPORT void JNICALL AWTDrawGlyphList
---- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-12-16 14:15:22.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2010-06-15 22:07:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2011-05-26 18:56:57.000000000 -0700
++++ ./jdk/src/solaris/native/sun/java2d/j2d_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -28,11 +28,11 @@
#include <sys/types.h>
@@ -28052,8 +28555,8 @@ $FreeBSD$
typedef unsigned char jubyte;
typedef unsigned short jushort;
---- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-12-16 14:15:22.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2010-06-15 22:07:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2011-05-26 18:56:57.000000000 -0700
++++ ./jdk/src/solaris/native/sun/java2d/loops/mlib_ImageZoom_NN.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,6 +63,10 @@
* MLIB_EDGE_SRC_PADDED
*/
@@ -28159,9 +28662,9 @@ $FreeBSD$
LOGIC(da[0], dtmp, dtmp1, |);
}
else { /* aligned */
---- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-12-16 14:15:23.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2010-06-15 22:07:38.000000000 -0700
-@@ -794,7 +794,7 @@
+--- ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2011-05-26 18:56:59.000000000 -0700
++++ ./jdk/src/solaris/native/sun/java2d/loops/vis_FuncArray.c 2011-04-22 23:08:39.000000000 -0700
+@@ -804,7 +804,7 @@
static int initialized;
static int usevis = JNI_TRUE;
@@ -28170,8 +28673,8 @@ $FreeBSD$
# define ULTRA_CHIP "sparc64"
#else
# define ULTRA_CHIP "sun4u"
---- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-12-16 14:15:23.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2010-06-15 22:07:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2011-05-26 18:57:01.000000000 -0700
++++ ./jdk/src/solaris/native/sun/java2d/opengl/OGLFuncs_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -27,7 +27,10 @@
#define OGLFuncs_md_h_Included
@@ -28192,8 +28695,8 @@ $FreeBSD$
} \
OGL_LIB_HANDLE = dlopen(libGLPath, RTLD_LAZY | RTLD_LOCAL); \
} \
---- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-12-16 14:15:23.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2010-07-24 14:31:30.000000000 -0700
+--- ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2011-05-26 18:57:01.000000000 -0700
++++ ./jdk/src/solaris/native/sun/java2d/x11/X11SurfaceData.c 2011-04-22 23:08:39.000000000 -0700
@@ -32,6 +32,7 @@
#include "gdefs.h"
@@ -28211,8 +28714,8 @@ $FreeBSD$
}
if (lib != NULL) {
---- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-12-16 14:15:23.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2010-06-15 22:07:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/jdga/dgalock.c 2011-05-26 18:57:02.000000000 -0700
++++ ./jdk/src/solaris/native/sun/jdga/dgalock.c 2011-04-22 23:08:39.000000000 -0700
@@ -44,6 +44,7 @@
#include <X11/Xlib.h>
@@ -28235,21 +28738,21 @@ $FreeBSD$
void *sym = dlsym(handle, "IsXineramaOn");
IsXineramaOn = (IsXineramaOnFunc *)sym;
if (IsXineramaOn != 0 && (*IsXineramaOn)(display)) {
---- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-12-16 14:15:23.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2010-06-15 22:07:38.000000000 -0700
-@@ -26,6 +26,10 @@
- #include <sys/types.h>
- #include <sys/stat.h>
+--- ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2011-05-26 18:57:02.000000000 -0700
++++ ./jdk/src/solaris/native/sun/management/FileSystemImpl.c 2011-04-22 23:08:39.000000000 -0700
+@@ -30,6 +30,10 @@
+ #include "jni_util.h"
+ #include "sun_management_FileSystemImpl.h"
-+#if defined(_ALLBSD_SOURCE)
-+#include "largefile_bsd.h"
++#ifdef _ALLBSD_SOURCE
++#define stat64 stat
+#endif
+
- #include "jni.h"
- #include "jni_util.h"
- #include "sun_management_FileSystemImpl.h"
---- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2010-06-15 22:07:38.000000000 -0700
+ /*
+ * Class: sun_management_FileSystemImpl
+ * Method: isAccessUserOnly0
+--- ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2011-05-26 18:57:02.000000000 -0700
++++ ./jdk/src/solaris/native/sun/net/dns/ResolverConfigurationImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -33,7 +33,7 @@
#include <strings.h>
#endif
@@ -28259,8 +28762,8 @@ $FreeBSD$
#include <string.h>
#endif
---- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2011-05-26 18:57:03.000000000 -0700
++++ ./jdk/src/solaris/native/sun/net/spi/DefaultProxySelector.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,11 +26,12 @@
#include "jni.h"
#include "jni_util.h"
@@ -28287,8 +28790,8 @@ $FreeBSD$
gconf_ver = 2;
}
if (gconf_ver > 0) {
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2010-06-15 22:07:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2011-05-26 18:57:03.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/DatagramChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -35,7 +35,7 @@
#include <string.h>
#include <errno.h>
@@ -28338,8 +28841,8 @@ $FreeBSD$
}
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2010-06-15 22:07:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2011-05-26 18:57:03.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/DatagramDispatcher.c 2011-04-22 23:08:39.000000000 -0700
@@ -73,7 +73,7 @@
m.msg_accrightslen = 0;
#endif
@@ -28358,9 +28861,9 @@ $FreeBSD$
m.msg_control = NULL;
m.msg_controllen = 0;
#endif
---- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2010-06-15 22:07:38.000000000 -0700
-@@ -26,15 +26,21 @@
+--- ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2011-05-26 18:57:03.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/FileChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
+@@ -26,9 +26,11 @@
#include "jni.h"
#include "jni_util.h"
#include "jvm.h"
@@ -28372,85 +28875,34 @@ $FreeBSD$
#include "sun_nio_ch_FileChannelImpl.h"
#include "java_lang_Integer.h"
#include "nio.h"
- #include "nio_util.h"
- #include <dlfcn.h>
+@@ -37,6 +39,13 @@
-+#if defined(_ALLBSD_SOURCE)
-+#include "largefile_bsd.h"
-+#endif
-+
- static jfieldID chan_fd; /* jobject 'fd' in sun.io.FileChannelImpl */
-
- #ifdef __solaris__
-@@ -59,6 +65,24 @@
- typedef ssize_t sendfile64_func(int out_fd, int in_fd, off64_t *offset, size_t count);
-
- sendfile64_func* my_sendfile64_func = NULL;
+ #if defined(__linux__) || defined(__solaris__)
+ #include <sys/sendfile.h>
+#elif defined(_ALLBSD_SOURCE)
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/uio.h>
-+#include <errno.h>
-+#include <stdlib.h>
+
-+#ifdef __APPLE__
-+typedef int sendfile_func(int fd, int s, off_t offset, off_t *len,
-+ struct sf_hdtr *hdtr, int flags);
-+#elif defined(__FreeBSD__)
-+typedef int sendfile_func(int fd, int s, off_t offset, size_t nbytes,
-+ struct sf_hdtr *hdtr, off_t *sbytes, int flags);
-+#endif
-+
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-+sendfile_func* my_sendfile_func = NULL;
-+#endif
- #endif
-
- JNIEXPORT jlong JNICALL
-@@ -68,7 +92,8 @@
- chan_fd = (*env)->GetFieldID(env, clazz, "fd", "Ljava/io/FileDescriptor;");
-
- #ifdef __solaris__
-- if (dlopen("/usr/lib/libsendfile.so.1", RTLD_GLOBAL | RTLD_LAZY) != NULL) {
-+ if (dlopen("/usr/lib/" VERSIONED_JNI_LIB_NAME("sendfile", "1"),
-+ RTLD_GLOBAL | RTLD_LAZY) != NULL) {
- my_sendfile_func = (sendfile_func*) dlsym(RTLD_DEFAULT, "sendfilev64");
- }
- #endif
-@@ -77,6 +102,10 @@
- my_sendfile64_func = (sendfile64_func*) dlsym(RTLD_DEFAULT, "sendfile64");
++#define lseek64 lseek
++#define mmap64 mmap
#endif
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-+ my_sendfile_func = (sendfile_func*) dlsym(RTLD_DEFAULT, "sendfile");
-+#endif
-+
- return pageSize;
- }
-
-@@ -243,4 +272,46 @@
- return result;
+ static jfieldID chan_fd; /* jobject 'fd' in sun.io.FileChannelImpl */
+@@ -192,7 +201,36 @@
+ return IOS_THROWN;
}
- #endif
-+
-+#ifdef _ALLBSD_SOURCE
-+#if defined(__APPLE__) || defined(__FreeBSD__)
-+ if (my_sendfile_func == NULL)
-+ return IOS_UNSUPPORTED;
-+
+ return result;
++#elif defined(__APPLE__) || defined(__FreeBSD__)
+ off_t numBytes;
+ int result;
+
+ numBytes = count;
+
+#ifdef __APPLE__
-+ result = (*my_sendfile_func)(srcFD, dstFD, position,
-+ &numBytes, NULL, 0);
++ result = sendfile(srcFD, dstFD, position, &numBytes, NULL, 0);
+#elif defined(__FreeBSD__)
-+ result = (*my_sendfile_func)(srcFD, dstFD, position,
-+ count, NULL, &numBytes, 0);
-+#else
-+ Add an #elif for your BSD flavor
++ result = sendfile(srcFD, dstFD, position, count, NULL, &numBytes, 0);
+#endif
+
+ if (numBytes > 0)
@@ -28470,14 +28922,14 @@ $FreeBSD$
+ }
+
+ return result;
-+#else
+ #else
+- return IOS_UNSUPPORTED_CASE;
+ return IOS_UNSUPPORTED;
-+#endif
-+#endif
+ #endif
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2010-06-15 22:07:38.000000000 -0700
-@@ -33,9 +33,13 @@
+--- ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2011-05-26 18:57:04.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/FileDispatcherImpl.c 2011-04-22 23:08:39.000000000 -0700
+@@ -33,9 +33,24 @@
#include <sys/socket.h>
#include <fcntl.h>
#include <sys/uio.h>
@@ -28485,13 +28937,24 @@ $FreeBSD$
#include "nio.h"
#include "nio_util.h"
-+#if defined(_ALLBSD_SOURCE)
-+#include "largefile_bsd.h"
++#ifdef _ALLBSD_SOURCE
++#define stat64 stat
++#define flock64 flock
++#define off64_t off_t
++#define F_SETLKW64 F_SETLKW
++#define F_SETLK64 F_SETLK
++
++#define pread64 pread
++#define pwrite64 pwrite
++#define ftruncate64 ftruncate
++#define fstat64 fstat
++
++#define fdatasync fsync
+#endif
static int preCloseFD = -1; /* File descriptor to which we dup other fd's
before closing them for real */
-@@ -218,6 +222,23 @@
+@@ -218,6 +233,23 @@
fl.l_start = (off64_t)pos;
fl.l_type = F_UNLCK;
lockResult = fcntl(fd, cmd, &fl);
@@ -28515,21 +28978,23 @@ $FreeBSD$
if (lockResult < 0) {
JNU_ThrowIOExceptionWithLastError(env, "Release failed");
}
---- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2010-06-15 22:07:38.000000000 -0700
-@@ -30,6 +30,10 @@
+--- ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2011-05-26 18:57:04.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/FileKey.c 2011-04-22 23:08:39.000000000 -0700
+@@ -30,6 +30,12 @@
#include "nio_util.h"
#include "sun_nio_ch_FileKey.h"
-+#if defined(_ALLBSD_SOURCE)
-+#include "largefile_bsd.h"
++#ifdef _ALLBSD_SOURCE
++#define stat64 stat
++
++#define fstat64 fstat
+#endif
+
static jfieldID key_st_dev; /* id for FileKey.st_dev */
static jfieldID key_st_ino; /* id for FileKey.st_ino */
---- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Net.c 2011-05-26 18:57:04.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/Net.c 2011-04-22 23:08:39.000000000 -0700
@@ -116,6 +116,47 @@
#endif /* __linux__ */
@@ -28578,7 +29043,7 @@ $FreeBSD$
#define COPY_INET6_ADDRESS(env, source, target) \
(*env)->GetByteArrayRegion(env, source, 0, 16, target)
-@@ -271,8 +312,30 @@
+@@ -287,8 +328,30 @@
SOCKADDR sa;
socklen_t sa_len = SOCKADDR_LEN;
if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
@@ -28609,7 +29074,7 @@ $FreeBSD$
}
return NET_GetPortFromSockaddr((struct sockaddr *)&sa);
}
-@@ -284,8 +347,30 @@
+@@ -300,8 +363,30 @@
socklen_t sa_len = SOCKADDR_LEN;
int port;
if (getsockname(fdval(env, fdo), (struct sockaddr *)&sa, &sa_len) < 0) {
@@ -28640,7 +29105,7 @@ $FreeBSD$
}
return NET_SockaddrToInetAddress(env, (struct sockaddr *)&sa, &port);
}
-@@ -349,7 +434,8 @@
+@@ -365,7 +450,8 @@
struct linger linger;
u_char carg;
void *parg;
@@ -28650,7 +29115,7 @@ $FreeBSD$
/* Option value is an int except for a few specific cases */
-@@ -512,7 +598,7 @@
+@@ -528,7 +614,7 @@
Java_sun_nio_ch_Net_setInterface4(JNIEnv* env, jobject this, jobject fdo, jint interf)
{
struct in_addr in;
@@ -28659,7 +29124,7 @@ $FreeBSD$
int n;
in.s_addr = htonl(interf);
-@@ -543,7 +629,7 @@
+@@ -559,7 +645,7 @@
Java_sun_nio_ch_Net_setInterface6(JNIEnv* env, jobject this, jobject fdo, jint index)
{
int value = (jint)index;
@@ -28668,7 +29133,7 @@ $FreeBSD$
int n;
n = setsockopt(fdval(env, fdo), IPPROTO_IPV6, IPV6_MULTICAST_IF,
-@@ -586,9 +672,11 @@
+@@ -602,9 +688,11 @@
switch (errorValue) {
case EINPROGRESS: /* Non-blocking connect */
return 0;
@@ -28680,8 +29145,8 @@ $FreeBSD$
case ECONNREFUSED:
xn = JNU_JAVANETPKG "ConnectException";
break;
---- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2010-06-15 22:07:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2011-05-26 18:57:04.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/Sctp.h 2011-04-22 23:08:39.000000000 -0700
@@ -67,7 +67,7 @@
@@ -28730,8 +29195,8 @@ $FreeBSD$
jboolean loadSocketExtensionFuncs(JNIEnv* env);
#endif /* !SUN_NIO_CH_SCTP_H */
---- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-12-16 14:15:24.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2010-06-15 22:07:38.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2011-05-26 18:57:04.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpChannelImpl.c 2011-04-22 23:08:39.000000000 -0700
@@ -337,11 +337,11 @@
break;
case SCTP_ADDR_MADE_PRIM :
@@ -28746,8 +29211,8 @@ $FreeBSD$
}
addressObj = SockAddrToInetSocketAddress(env, (struct sockaddr*)&spc->spc_aaddr);
---- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-12-16 14:15:25.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2011-05-26 18:57:04.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/ch/SctpNet.c 2011-04-22 23:08:39.000000000 -0700
@@ -58,6 +58,7 @@
*/
jboolean loadSocketExtensionFuncs
@@ -28764,8 +29229,8 @@ $FreeBSD$
funcsLoaded = JNI_TRUE;
return JNI_TRUE;
---- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2010-07-04 12:49:46.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/fs/BsdNativeDispatcher.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,23 +28,35 @@
#include "jvm.h"
#include "jlong.h"
@@ -29046,9 +29511,9 @@ $FreeBSD$
+ free(iter);
+ }
}
---- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/src/solaris/native/sun/nio/fs/BsdWatchService.c 1969-12-31 16:00:00.000000000 -0800
-@@ -1,195 +0,0 @@
+@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2008, 2009, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -29084,33 +29549,10 @@ $FreeBSD$
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/poll.h>
+-#include <sys/inotify.h>
-
-#include "sun_nio_fs_BsdWatchService.h"
-
--/* inotify.h may not be available at build time */
--#ifdef __cplusplus
--extern "C" {
--#endif
--struct inotify_event
--{
-- int wd;
-- uint32_t mask;
-- uint32_t cookie;
-- uint32_t len;
-- char name __flexarr;
--};
--#ifdef __cplusplus
--}
--#endif
--
--typedef int inotify_init_func(void);
--typedef int inotify_add_watch_func(int fd, const char* path, uint32_t mask);
--typedef int inotify_rm_watch_func(int fd, uint32_t wd);
--
--inotify_init_func* my_inotify_init_func = NULL;
--inotify_add_watch_func* my_inotify_add_watch_func = NULL;
--inotify_rm_watch_func* my_inotify_rm_watch_func = NULL;
--
-static void throwUnixException(JNIEnv* env, int errnum) {
- jobject x = JNU_NewObjectByName(env, "sun/nio/fs/UnixException",
- "(I)V", errnum);
@@ -29119,22 +29561,6 @@ $FreeBSD$
- }
-}
-
--JNIEXPORT void JNICALL
--Java_sun_nio_fs_BsdWatchService_init(JNIEnv *env, jclass clazz)
--{
-- my_inotify_init_func = (inotify_init_func*)
-- dlsym(RTLD_DEFAULT, "inotify_init");
-- my_inotify_add_watch_func =
-- (inotify_add_watch_func*) dlsym(RTLD_DEFAULT, "inotify_add_watch");
-- my_inotify_rm_watch_func =
-- (inotify_rm_watch_func*) dlsym(RTLD_DEFAULT, "inotify_rm_watch");
--
-- if ((my_inotify_init_func == NULL) || (my_inotify_add_watch_func == NULL) ||
-- (my_inotify_rm_watch_func == NULL)) {
-- JNU_ThrowInternalError(env, "unable to get address of inotify functions");
-- }
--}
--
-JNIEXPORT jint JNICALL
-Java_sun_nio_fs_BsdWatchService_eventSize(JNIEnv *env, jclass clazz)
-{
@@ -29162,7 +29588,7 @@ $FreeBSD$
-Java_sun_nio_fs_BsdWatchService_inotifyInit
- (JNIEnv* env, jclass clazz)
-{
-- int ifd = (*my_inotify_init_func)();
+- int ifd = inotify_init();
- if (ifd == -1) {
- throwUnixException(env, errno);
- }
@@ -29176,7 +29602,7 @@ $FreeBSD$
- int wfd = -1;
- const char* path = (const char*)jlong_to_ptr(address);
-
-- wfd = (*my_inotify_add_watch_func)((int)fd, path, mask);
+- wfd = inotify_add_watch((int)fd, path, mask);
- if (wfd == -1) {
- throwUnixException(env, errno);
- }
@@ -29187,7 +29613,7 @@ $FreeBSD$
-Java_sun_nio_fs_BsdWatchService_inotifyRmWatch
- (JNIEnv* env, jclass clazz, jint fd, jint wd)
-{
-- int err = (*my_inotify_rm_watch_func)((int)fd, (int)wd);
+- int err = inotify_rm_watch((int)fd, (int)wd);
- if (err == -1)
- throwUnixException(env, errno);
-}
@@ -29217,7 +29643,6 @@ $FreeBSD$
- res[1] = (jint)sp[1];
- (*env)->SetIntArrayRegion(env, sv, 0, 2, &res[0]);
- }
--
-}
-
-JNIEXPORT jint JNICALL
@@ -29241,11 +29666,9 @@ $FreeBSD$
- }
- }
- return (jint)n;
--
--
-}
---- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-12-16 14:15:25.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2011-05-26 18:57:05.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/fs/GnomeFileTypeDetector.c 2011-04-22 23:08:39.000000000 -0700
@@ -30,7 +30,9 @@
#include <stdlib.h>
@@ -29256,21 +29679,38 @@ $FreeBSD$
#ifdef __solaris__
#include <strings.h>
---- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-12-16 14:15:25.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2010-06-15 22:07:39.000000000 -0700
-@@ -49,6 +49,11 @@
+--- ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2011-05-26 18:57:05.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/fs/UnixNativeDispatcher.c 2011-05-20 20:04:19.000000000 -0700
+@@ -49,6 +49,19 @@
#include <mntent.h>
#endif
+#ifdef _ALLBSD_SOURCE
+#include <string.h>
-+#include "largefile_bsd.h"
++
++#define stat64 stat
++#define statvfs64 statvfs
++
++#define open64 open
++#define fstat64 fstat
++#define lstat64 lstat
++#define dirent64 dirent
++#define readdir64_r readdir_r
+#endif
+
#include "jni.h"
#include "jni_util.h"
#include "jlong.h"
-@@ -213,6 +218,8 @@
+@@ -198,7 +211,7 @@
+
+ /* system calls that might not be available at run time */
+
+-#if defined(__solaris__) && defined(_LP64)
++#if (defined(__solaris__) && defined(_LP64)) || defined(_ALLBSD_SOURCE)
+ /* Solaris 64-bit does not have openat64/fstatat64 */
+ my_openat64_func = (openat64_func*)dlsym(RTLD_DEFAULT, "openat");
+ my_fstatat64_func = (fstatat64_func*)dlsym(RTLD_DEFAULT, "fstatat");
+@@ -224,6 +237,8 @@
flags |= sun_nio_fs_UnixNativeDispatcher_HAS_AT_SYSCALLS;
}
@@ -29279,7 +29719,7 @@ $FreeBSD$
return flags;
}
-@@ -1016,6 +1023,10 @@
+@@ -1068,6 +1083,10 @@
{
#ifdef __solaris__
struct extmnttab ent;
@@ -29290,7 +29730,7 @@ $FreeBSD$
#else
struct mntent ent;
char buf[1024];
-@@ -1044,6 +1055,25 @@
+@@ -1096,6 +1115,25 @@
throwUnixException(env, errno);
return -1;
}
@@ -29316,8 +29756,8 @@ $FreeBSD$
#else
m = getmntent_r(fp, &ent, (char*)&buf, buflen);
if (m == NULL)
---- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-12-16 14:15:25.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2011-05-26 18:57:05.000000000 -0700
++++ ./jdk/src/solaris/native/sun/nio/fs/genUnixConstants.c 2011-04-22 23:08:39.000000000 -0700
@@ -63,7 +63,12 @@
DEFX(O_EXCL);
DEFX(O_TRUNC);
@@ -29344,8 +29784,8 @@ $FreeBSD$
DEF(ERANGE);
// flags used with openat/unlinkat/etc.
---- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-12-16 14:15:25.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2011-05-26 18:57:05.000000000 -0700
++++ ./jdk/src/solaris/native/sun/security/jgss/wrapper/NativeFunc.c 2011-04-22 23:08:39.000000000 -0700
@@ -26,7 +26,9 @@
#include <stdio.h>
#include <stdlib.h>
@@ -29356,8 +29796,8 @@ $FreeBSD$
#include "NativeFunc.h"
/* standard GSS method names (ordering is from mapfile) */
---- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-12-16 14:15:25.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-05-26 18:57:06.000000000 -0700
++++ ./jdk/src/solaris/native/sun/security/pkcs11/j2secmod_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -28,12 +28,19 @@
#include <string.h>
@@ -29400,8 +29840,8 @@ $FreeBSD$
(*env)->ReleaseStringUTFChars(env, jLibName, libName);
dprintf2("-handle: %u (0X%X)\n", hModule, hModule);
---- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-12-16 14:15:26.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2011-05-26 18:57:06.000000000 -0700
++++ ./jdk/src/solaris/native/sun/security/pkcs11/wrapper/p11_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -64,7 +64,9 @@
#include <assert.h>
@@ -29412,8 +29852,8 @@ $FreeBSD$
#include <jni.h>
---- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-12-16 14:15:26.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2011-05-26 18:57:06.000000000 -0700
++++ ./jdk/src/solaris/native/sun/security/smartcardio/pcsc_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -29,7 +29,9 @@
#include <assert.h>
@@ -29424,8 +29864,8 @@ $FreeBSD$
#include <winscard.h>
---- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-12-18 00:00:04.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2010-10-31 13:48:56.000000000 -0700
+--- ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2011-05-29 11:28:25.000000000 -0700
++++ ./jdk/src/solaris/native/sun/tools/attach/BsdVirtualMachine.c 2011-04-22 23:08:39.000000000 -0700
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
@@ -29759,8 +30199,8 @@ $FreeBSD$
+ JNU_ReleaseStringPlatformChars(env, path, _path);
+ }
+}
---- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-12-16 14:15:26.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2010-12-04 08:27:53.000000000 -0800
+--- ./jdk/src/solaris/native/sun/xawt/XWindow.c 2011-05-26 18:57:07.000000000 -0700
++++ ./jdk/src/solaris/native/sun/xawt/XWindow.c 2011-04-22 23:08:39.000000000 -0700
@@ -228,10 +228,10 @@
{java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
@@ -29785,8 +30225,8 @@ $FreeBSD$
/* The following code on Linux will cause the keypad keys
* not to echo on JTextField when the NumLock is on. The
* keysyms will be 0, because the last parameter 2 is not defined.
---- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-12-16 14:15:26.000000000 -0800
-+++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2010-10-31 14:12:37.000000000 -0700
+--- ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2011-05-26 18:57:07.000000000 -0700
++++ ./jdk/src/solaris/native/sun/xawt/awt_Desktop.c 2011-04-22 23:08:39.000000000 -0700
@@ -24,6 +24,7 @@
*/
@@ -29814,7 +30254,7 @@ $FreeBSD$
}
dlerror(); /* Clear errors */
gnome_vfs_init = (GNOME_VFS_INIT_TYPE*)dlsym(vfs_handle, "gnome_vfs_init");
-@@ -57,12 +61,15 @@
+@@ -63,12 +67,15 @@
// call gonme_vfs_init()
(*gnome_vfs_init)();
@@ -29833,8 +30273,8 @@ $FreeBSD$
}
dlerror(); /* Clear errors */
gnome_url_show = (GNOME_URL_SHOW_TYPE*)dlsym(gnome_handle, "gnome_url_show");
---- ./jdk/src/solaris/npt/npt_md.h 2010-12-16 14:15:26.000000000 -0800
-+++ ./jdk/src/solaris/npt/npt_md.h 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/npt/npt_md.h 2011-05-26 18:57:07.000000000 -0700
++++ ./jdk/src/solaris/npt/npt_md.h 2011-04-22 23:08:39.000000000 -0700
@@ -32,9 +32,10 @@
#include <string.h>
#include <errno.h>
@@ -29857,8 +30297,8 @@ $FreeBSD$
if ( _handle == NULL ) NPT_ERROR("Cannot open library"); \
_sym = dlsym(_handle, "nptInitialize"); \
if ( _sym == NULL ) NPT_ERROR("Cannot find nptInitialize"); \
---- ./jdk/src/solaris/transport/socket/socket_md.c 2010-12-16 14:15:27.000000000 -0800
-+++ ./jdk/src/solaris/transport/socket/socket_md.c 2010-06-15 22:07:39.000000000 -0700
+--- ./jdk/src/solaris/transport/socket/socket_md.c 2011-05-26 18:57:10.000000000 -0700
++++ ./jdk/src/solaris/transport/socket/socket_md.c 2011-04-22 23:08:39.000000000 -0700
@@ -36,7 +36,7 @@
#ifdef __solaris__
#include <thread.h>
@@ -29877,8 +30317,8 @@ $FreeBSD$
int
dbgsysTlsAlloc() {
pthread_key_t key;
---- ./jdk/test/Makefile 2010-12-16 14:15:43.000000000 -0800
-+++ ./jdk/test/Makefile 2010-07-24 14:31:30.000000000 -0700
+--- ./jdk/test/Makefile 2011-05-26 18:57:59.000000000 -0700
++++ ./jdk/test/Makefile 2011-04-22 23:08:40.000000000 -0700
@@ -79,6 +79,16 @@
endif
OS_VERSION := $(shell $(UNAME) -r)
@@ -29896,8 +30336,8 @@ $FreeBSD$
ifeq ($(OS_NAME),)
OS_NAME = windows
# GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always
---- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-12-16 14:15:46.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2010-06-15 22:07:44.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2011-05-26 18:58:11.000000000 -0700
++++ ./jdk/test/com/sun/jdi/ImmutableResourceTest.sh 2011-04-22 23:08:41.000000000 -0700
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -29907,8 +30347,8 @@ $FreeBSD$
PATHSEP=":"
;;
---- ./jdk/test/com/sun/jdi/JITDebug.sh 2010-12-16 14:15:46.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/JITDebug.sh 2010-06-15 22:07:44.000000000 -0700
+--- ./jdk/test/com/sun/jdi/JITDebug.sh 2011-05-26 18:58:13.000000000 -0700
++++ ./jdk/test/com/sun/jdi/JITDebug.sh 2011-04-22 23:08:41.000000000 -0700
@@ -63,7 +63,7 @@
OS=`uname -s`
export TRANSPORT_METHOD
@@ -29918,9 +30358,9 @@ $FreeBSD$
PATHSEP=":"
TRANSPORT_METHOD=dt_socket
;;
---- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-12-16 14:15:47.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2010-06-15 22:07:45.000000000 -0700
-@@ -121,10 +121,14 @@
+--- ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2011-05-26 18:58:15.000000000 -0700
++++ ./jdk/test/com/sun/jdi/PrivateTransportTest.sh 2011-04-22 23:08:41.000000000 -0700
+@@ -123,10 +123,14 @@
esac
libloc=${jreloc}/lib/${libarch}
;;
@@ -29934,10 +30374,10 @@ $FreeBSD$
+ libloc=`dirname ${xx}`
+ ;;
Windows*)
+ is_windows=true
libloc=${jreloc}/bin
- sep=';'
---- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-12-16 14:15:47.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2010-08-14 11:45:21.000000000 -0700
+--- ./jdk/test/com/sun/jdi/ShellScaffold.sh 2011-05-26 18:58:17.000000000 -0700
++++ ./jdk/test/com/sun/jdi/ShellScaffold.sh 2011-04-22 23:08:41.000000000 -0700
@@ -292,7 +292,7 @@
psCmd=ps
jstack=jstack.exe
@@ -29947,8 +30387,8 @@ $FreeBSD$
transport=dt_socket
address=
devnull=/dev/null
---- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-12-16 14:15:47.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2010-06-15 22:07:45.000000000 -0700
+--- ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2011-05-26 18:58:17.000000000 -0700
++++ ./jdk/test/com/sun/jdi/Solaris32AndSolaris64Test.sh 2011-04-22 23:08:41.000000000 -0700
@@ -112,7 +112,7 @@
fi
;;
@@ -29958,8 +30398,8 @@ $FreeBSD$
pass "This test always passes on $OS"
;;
---- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-12-16 14:15:48.000000000 -0800
-+++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2010-06-15 22:07:45.000000000 -0700
+--- ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2011-05-26 18:58:20.000000000 -0700
++++ ./jdk/test/com/sun/jdi/connect/spi/JdiLoadedByCustomLoader.sh 2011-04-22 23:08:41.000000000 -0700
@@ -45,10 +45,7 @@
OS=`uname -s`
@@ -29972,8 +30412,8 @@ $FreeBSD$
PS=":"
;;
Windows* | CYGWIN*)
---- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-12-16 14:15:49.000000000 -0800
-+++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2010-06-15 22:07:46.000000000 -0700
+--- ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-05-26 18:58:24.000000000 -0700
++++ ./jdk/test/com/sun/management/OperatingSystemMXBean/TestTotalSwap.sh 2011-04-22 23:08:41.000000000 -0700
@@ -83,6 +83,10 @@
total_swap=`free -b | grep -i swap | awk '{print $2}'`
runOne GetTotalSwapSpaceSize $total_swap
@@ -29985,8 +30425,8 @@ $FreeBSD$
* )
runOne GetTotalSwapSpaceSize "sanity-only"
;;
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-12-16 14:15:49.000000000 -0800
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2010-06-15 22:07:46.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2011-05-26 18:58:24.000000000 -0700
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetMaxFileDescriptorCount.sh 2011-04-22 23:08:41.000000000 -0700
@@ -48,7 +48,7 @@
# Test GetMaxFileDescriptorCount if we are running on Unix
@@ -29996,8 +30436,8 @@ $FreeBSD$
runOne GetMaxFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-12-16 14:15:49.000000000 -0800
-+++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2010-06-15 22:07:46.000000000 -0700
+--- ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2011-05-26 18:58:25.000000000 -0700
++++ ./jdk/test/com/sun/management/UnixOperatingSystemMXBean/GetOpenFileDescriptorCount.sh 2011-04-22 23:08:41.000000000 -0700
@@ -48,7 +48,7 @@
# Test GetOpenFileDescriptorCount if we are running on Unix
@@ -30007,8 +30447,8 @@ $FreeBSD$
runOne GetOpenFileDescriptorCount
;;
* )
---- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-12-16 14:15:52.000000000 -0800
-+++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2010-06-15 22:07:47.000000000 -0700
+--- ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2011-05-26 18:58:40.000000000 -0700
++++ ./jdk/test/com/sun/tools/attach/CommonSetup.sh 2011-04-22 23:08:41.000000000 -0700
@@ -36,11 +36,7 @@
OS=`uname -s`
@@ -30022,8 +30462,8 @@ $FreeBSD$
PS=":"
FS="/"
;;
---- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-12-16 14:15:59.000000000 -0800
-+++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2010-01-30 09:28:46.000000000 -0800
+--- ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2011-05-26 18:59:08.000000000 -0700
++++ ./jdk/test/java/awt/PrintJob/Text/stringwidth.sh 2011-04-22 23:08:42.000000000 -0700
@@ -25,10 +25,11 @@
fi
@@ -30040,8 +30480,8 @@ $FreeBSD$
# Windows
if [ -z "${TESTJAVA}" ] ; then
---- ./jdk/test/java/io/File/GetXSpace.sh 2010-12-16 14:16:13.000000000 -0800
-+++ ./jdk/test/java/io/File/GetXSpace.sh 2010-06-15 22:07:52.000000000 -0700
+--- ./jdk/test/java/io/File/GetXSpace.sh 2011-05-26 18:59:59.000000000 -0700
++++ ./jdk/test/java/io/File/GetXSpace.sh 2011-04-22 23:08:43.000000000 -0700
@@ -26,7 +26,7 @@
# set platform-dependent variable
OS=`uname -s`
@@ -30051,8 +30491,8 @@ $FreeBSD$
Windows_98 ) return ;;
Windows* ) SID=`sid`; TMP="c:/temp" ;;
* )
---- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-12-16 14:16:17.000000000 -0800
-+++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2010-06-15 22:07:53.000000000 -0700
+--- ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2011-05-26 19:00:25.000000000 -0700
++++ ./jdk/test/java/io/Serializable/evolution/RenamePackage/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -41,7 +41,7 @@
# Need to determine the classpath separator and filepath separator based on the
# operating system.
@@ -30062,8 +30502,8 @@ $FreeBSD$
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-12-16 14:16:19.000000000 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2010-06-15 22:07:54.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2011-05-26 19:00:34.000000000 -0700
++++ ./jdk/test/java/io/Serializable/serialver/classpath/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30073,8 +30513,8 @@ $FreeBSD$
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-12-16 14:16:19.000000000 -0800
-+++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2010-06-15 22:07:54.000000000 -0700
+--- ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2011-05-26 19:00:34.000000000 -0700
++++ ./jdk/test/java/io/Serializable/serialver/nested/run.sh 2011-04-22 23:08:44.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30084,8 +30524,8 @@ $FreeBSD$
PS=":" ;;
Windows* | CYGWIN* )
PS=";" ;;
---- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-12-16 14:16:23.000000000 -0800
-+++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2010-06-15 22:07:55.000000000 -0700
+--- ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2011-05-26 19:00:52.000000000 -0700
++++ ./jdk/test/java/lang/ClassLoader/deadlock/TestOneWayDelegate.sh 2011-04-22 23:08:44.000000000 -0700
@@ -49,10 +49,7 @@
# set platform-specific variables
OS=`uname -s`
@@ -30098,8 +30538,8 @@ $FreeBSD$
FS="/"
;;
Windows* | CYGWIN* )
---- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-12-16 14:16:25.000000000 -0800
-+++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2010-06-15 22:07:55.000000000 -0700
+--- ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2011-05-26 19:01:03.000000000 -0700
++++ ./jdk/test/java/lang/StringCoding/CheckEncodings.sh 2011-04-22 23:08:45.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30109,8 +30549,8 @@ $FreeBSD$
Windows* | CYGWIN* )
echo "Passed"; exit 0 ;;
* ) echo "Unrecognized system!" ; exit 1 ;;
---- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-12-16 14:16:26.000000000 -0800
-+++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2010-06-15 22:07:56.000000000 -0700
+--- ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2011-05-26 19:01:09.000000000 -0700
++++ ./jdk/test/java/lang/annotation/loaderLeak/LoaderLeak.sh 2011-04-22 23:08:45.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30120,8 +30560,8 @@ $FreeBSD$
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-12-16 14:16:27.000000000 -0800
-+++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2010-06-15 22:07:56.000000000 -0700
+--- ./jdk/test/java/lang/instrument/MakeJAR2.sh 2011-05-26 19:01:13.000000000 -0700
++++ ./jdk/test/java/lang/instrument/MakeJAR2.sh 2011-04-22 23:08:45.000000000 -0700
@@ -49,7 +49,7 @@
OS=`uname -s`
@@ -30131,8 +30571,8 @@ $FreeBSD$
PATHSEP=":"
;;
---- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-12-16 14:16:29.000000000 -0800
-+++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2010-06-15 22:07:56.000000000 -0700
+--- ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2011-05-26 19:01:20.000000000 -0700
++++ ./jdk/test/java/lang/instrument/appendToClassLoaderSearch/CommonSetup.sh 2011-04-22 23:08:45.000000000 -0700
@@ -35,11 +35,7 @@
OS=`uname -s`
@@ -30146,8 +30586,8 @@ $FreeBSD$
PS=":"
FS="/"
;;
---- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-12-16 14:16:30.000000000 -0800
-+++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2010-06-15 22:07:57.000000000 -0700
+--- ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2011-05-26 19:01:28.000000000 -0700
++++ ./jdk/test/java/lang/management/OperatingSystemMXBean/TestSystemLoadAvg.sh 2011-04-22 23:08:45.000000000 -0700
@@ -61,10 +61,7 @@
while true; do
echo "Run $i: TestSystemLoadAvg"
@@ -30160,8 +30600,8 @@ $FreeBSD$
runOne GetSystemLoadAverage
;;
* )
---- ./jdk/test/java/net/Authenticator/B4933582.sh 2010-12-16 14:16:32.000000000 -0800
-+++ ./jdk/test/java/net/Authenticator/B4933582.sh 2010-06-15 22:07:58.000000000 -0700
+--- ./jdk/test/java/net/Authenticator/B4933582.sh 2011-05-26 19:01:39.000000000 -0700
++++ ./jdk/test/java/net/Authenticator/B4933582.sh 2011-04-22 23:08:45.000000000 -0700
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -30171,8 +30611,8 @@ $FreeBSD$
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-12-16 14:16:33.000000000 -0800
-+++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2010-06-15 22:07:58.000000000 -0700
+--- ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2011-05-26 19:01:43.000000000 -0700
++++ ./jdk/test/java/net/DatagramSocket/SetDatagramSocketImplFactory/ADatagramSocket.sh 2011-04-22 23:08:45.000000000 -0700
@@ -27,11 +27,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30186,8 +30626,8 @@ $FreeBSD$
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-12-16 14:16:35.000000000 -0800
-+++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2010-06-15 22:07:59.000000000 -0700
+--- ./jdk/test/java/net/Socket/OldSocketImpl.sh 2011-05-26 19:01:53.000000000 -0700
++++ ./jdk/test/java/net/Socket/OldSocketImpl.sh 2011-04-22 23:08:45.000000000 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -30197,8 +30637,8 @@ $FreeBSD$
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URL/B5086147.sh 2010-12-16 14:16:36.000000000 -0800
-+++ ./jdk/test/java/net/URL/B5086147.sh 2010-06-15 22:07:59.000000000 -0700
+--- ./jdk/test/java/net/URL/B5086147.sh 2011-05-26 19:01:57.000000000 -0700
++++ ./jdk/test/java/net/URL/B5086147.sh 2011-04-22 23:08:46.000000000 -0700
@@ -26,7 +26,7 @@
OS=`uname -s`
@@ -30208,8 +30648,8 @@ $FreeBSD$
exit 0
;;
CYGWIN* )
---- ./jdk/test/java/net/URL/runconstructor.sh 2010-12-16 14:16:37.000000000 -0800
-+++ ./jdk/test/java/net/URL/runconstructor.sh 2010-06-15 22:07:59.000000000 -0700
+--- ./jdk/test/java/net/URL/runconstructor.sh 2011-05-26 19:02:00.000000000 -0700
++++ ./jdk/test/java/net/URL/runconstructor.sh 2011-04-22 23:08:46.000000000 -0700
@@ -27,7 +27,7 @@
#
OS=`uname -s`
@@ -30219,8 +30659,8 @@ $FreeBSD$
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-12-16 14:16:37.000000000 -0800
-+++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2010-06-15 22:07:59.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/B5077773.sh 2011-05-26 19:02:00.000000000 -0700
++++ ./jdk/test/java/net/URLClassLoader/B5077773.sh 2011-04-22 23:08:46.000000000 -0700
@@ -34,11 +34,7 @@
OS=`uname -s`
@@ -30234,8 +30674,8 @@ $FreeBSD$
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-12-16 14:16:37.000000000 -0800
-+++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2010-06-15 22:07:59.000000000 -0700
+--- ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2011-05-26 19:02:03.000000000 -0700
++++ ./jdk/test/java/net/URLClassLoader/sealing/checksealed.sh 2011-04-22 23:08:46.000000000 -0700
@@ -27,11 +27,7 @@
OS=`uname -s`
@@ -30249,8 +30689,8 @@ $FreeBSD$
PS=":"
FS="/"
;;
---- ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-12-16 14:16:37.000000000 -0800
-+++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2010-06-15 22:07:59.000000000 -0700
+--- ./jdk/test/java/net/URLConnection/6212146/test.sh 2011-05-26 19:02:03.000000000 -0700
++++ ./jdk/test/java/net/URLConnection/6212146/test.sh 2011-04-22 23:08:46.000000000 -0700
@@ -33,11 +33,7 @@
OS=`uname -s`
@@ -30264,8 +30704,8 @@ $FreeBSD$
PS=":"
FS="/"
;;
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-12-16 14:16:43.000000000 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2010-01-30 09:28:55.000000000 -0800
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2011-05-26 19:02:27.000000000 -0700
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/Makefile 2011-04-22 23:08:46.000000000 -0700
@@ -71,6 +71,48 @@
EXTRA_LIBS = -lc
endif
@@ -30315,9 +30755,9 @@ $FreeBSD$
LIBDIR=lib/$(PLATFORM)-$(ARCH)
LAUNCHERLIB=$(LIBDIR)/libLauncher.so
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
---- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-12-16 14:16:43.000000000 -0800
-+++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2010-06-15 22:08:01.000000000 -0700
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/lib/bsd-i586/libLauncher.so differ
+--- ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2011-05-26 19:02:29.000000000 -0700
++++ ./jdk/test/java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh 2011-04-22 23:08:46.000000000 -0700
@@ -33,11 +33,14 @@
# @run shell run_tests.sh
@@ -30386,8 +30826,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
LIBDIR=lib/${PLATFORM}-${ARCH}
LAUNCHERLIB=${LIBDIR}/libLauncher.so
---- ./jdk/test/java/nio/charset/Charset/default.sh 2010-12-16 14:16:43.000000000 -0800
-+++ ./jdk/test/java/nio/charset/Charset/default.sh 2010-06-15 22:08:01.000000000 -0700
+--- ./jdk/test/java/nio/charset/Charset/default.sh 2011-05-26 19:02:30.000000000 -0700
++++ ./jdk/test/java/nio/charset/Charset/default.sh 2011-04-22 23:08:46.000000000 -0700
@@ -41,10 +41,14 @@
fi
@@ -30407,8 +30847,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=$TESTJAVA/bin/java
---- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-12-16 14:16:43.000000000 -0800
-+++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2010-06-15 22:08:01.000000000 -0700
+--- ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2011-05-26 19:02:31.000000000 -0700
++++ ./jdk/test/java/nio/charset/coders/CheckSJISMappingProp.sh 2011-04-22 23:08:46.000000000 -0700
@@ -34,7 +34,7 @@
OS=`uname -s`
@@ -30418,8 +30858,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
# Skip locale test for Windows
Windows* )
echo "Passed"; exit 0 ;;
---- ./jdk/test/java/nio/charset/spi/basic.sh 2010-12-16 14:16:43.000000000 -0800
-+++ ./jdk/test/java/nio/charset/spi/basic.sh 2010-06-15 22:08:01.000000000 -0700
+--- ./jdk/test/java/nio/charset/spi/basic.sh 2011-05-26 19:02:32.000000000 -0700
++++ ./jdk/test/java/nio/charset/spi/basic.sh 2011-04-22 23:08:46.000000000 -0700
@@ -70,10 +70,14 @@
L="$1"
shift
@@ -30448,20 +30888,20 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
Windows* ) CPS=';' ;;
*) echo "Unknown platform: `uname`"; exit 1 ;;
esac
---- ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-12-16 14:16:44.000000000 -0800
-+++ ./jdk/test/java/nio/file/Path/CopyAndMove.java 2010-06-15 22:08:01.000000000 -0700
-@@ -147,7 +147,8 @@
+--- ./jdk/test/java/nio/file/Files/CopyAndMove.java 2011-05-26 19:02:33.000000000 -0700
++++ ./jdk/test/java/nio/file/Files/CopyAndMove.java 2011-04-22 23:08:46.000000000 -0700
+@@ -153,7 +153,8 @@
// get file attributes of source file
String os = System.getProperty("os.name");
- if (os.equals("SunOS") || os.equals("Linux")) {
+ if (os.equals("SunOS") || os.equals("Linux") ||
+ os.endsWith("BSD") || os.equals("Darwin")) {
- posixAttributes = Attributes.readPosixFileAttributes(source, NOFOLLOW_LINKS);
+ posixAttributes = readAttributes(source, PosixFileAttributes.class, NOFOLLOW_LINKS);
basicAttributes = posixAttributes;
}
---- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-12-16 14:16:53.000000000 -0800
-+++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2010-06-15 22:08:03.000000000 -0700
+--- ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2011-05-26 19:03:04.000000000 -0700
++++ ./jdk/test/java/rmi/reliability/launch_reliability.ksh 2011-04-22 23:08:47.000000000 -0700
@@ -84,14 +84,12 @@
@@ -30481,8 +30921,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
export PATH_SEP
mainpid=$$
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-12-16 14:16:58.000000000 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2010-12-11 09:07:22.000000000 -0800
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2011-05-26 19:03:34.000000000 -0700
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/ClassLoaderDeadlock.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30496,8 +30936,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-12-16 14:16:58.000000000 -0800
-+++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2010-06-15 22:08:05.000000000 -0700
+--- ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2011-05-26 19:03:34.000000000 -0700
++++ ./jdk/test/java/security/Security/ClassLoaderDeadlock/Deadlock.sh 2011-04-22 23:08:48.000000000 -0700
@@ -34,11 +34,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30511,8 +30951,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-12-16 14:16:59.000000000 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2010-06-15 22:08:05.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2011-05-26 19:03:35.000000000 -0700
++++ ./jdk/test/java/security/Security/signedfirst/Dyn.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30526,8 +30966,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-12-16 14:16:59.000000000 -0800
-+++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2010-06-15 22:08:05.000000000 -0700
+--- ./jdk/test/java/security/Security/signedfirst/Static.sh 2011-05-26 19:03:36.000000000 -0700
++++ ./jdk/test/java/security/Security/signedfirst/Static.sh 2011-04-22 23:08:48.000000000 -0700
@@ -46,11 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30541,8 +30981,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-12-16 14:17:02.000000000 -0800
-+++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2010-01-30 09:40:02.000000000 -0800
+--- ./jdk/test/java/util/Currency/PropertiesTest.sh 2011-05-26 19:03:53.000000000 -0700
++++ ./jdk/test/java/util/Currency/PropertiesTest.sh 2011-04-22 23:08:48.000000000 -0700
@@ -30,7 +30,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30552,8 +30992,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-12-16 14:17:05.000000000 -0800
-+++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2010-06-15 22:08:06.000000000 -0700
+--- ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2011-05-26 19:04:07.000000000 -0700
++++ ./jdk/test/java/util/PluggableLocale/ExecTest.sh 2011-04-22 23:08:48.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30563,8 +31003,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-12-16 14:17:06.000000000 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2010-06-15 22:08:07.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2011-05-26 19:04:13.000000000 -0700
++++ ./jdk/test/java/util/ResourceBundle/Bug6299235Test.sh 2011-04-22 23:08:49.000000000 -0700
@@ -31,7 +31,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30574,8 +31014,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-12-16 14:17:06.000000000 -0800
-+++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2010-06-15 22:08:07.000000000 -0700
+--- ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2011-05-26 19:04:14.000000000 -0700
++++ ./jdk/test/java/util/ResourceBundle/Control/ExpirationTest.sh 2011-04-22 23:08:49.000000000 -0700
@@ -75,7 +75,7 @@
SunOS)
DEL=":"
@@ -30585,8 +31025,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
DEL=":"
HAS_S=YES
;;
---- ./jdk/test/java/util/ServiceLoader/basic.sh 2010-12-16 14:17:07.000000000 -0800
-+++ ./jdk/test/java/util/ServiceLoader/basic.sh 2010-06-15 22:08:07.000000000 -0700
+--- ./jdk/test/java/util/ServiceLoader/basic.sh 2011-05-26 19:04:19.000000000 -0700
++++ ./jdk/test/java/util/ServiceLoader/basic.sh 2011-04-22 23:08:49.000000000 -0700
@@ -42,9 +42,7 @@
OS=`uname -s`
@@ -30598,8 +31038,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
SEP=':' ;;
* )
SEP='\;' ;;
---- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-12-16 14:17:12.000000000 -0800
-+++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2010-06-15 22:08:09.000000000 -0700
+--- ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2011-05-26 19:04:44.000000000 -0700
++++ ./jdk/test/javax/crypto/SecretKeyFactory/FailOverTest.sh 2011-04-22 23:08:49.000000000 -0700
@@ -51,7 +51,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30609,8 +31049,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/javax/script/CommonSetup.sh 2010-12-16 14:17:23.000000000 -0800
-+++ ./jdk/test/javax/script/CommonSetup.sh 2010-06-15 22:08:11.000000000 -0700
+--- ./jdk/test/javax/script/CommonSetup.sh 2011-05-26 19:05:20.000000000 -0700
++++ ./jdk/test/javax/script/CommonSetup.sh 2011-04-22 23:08:50.000000000 -0700
@@ -36,11 +36,7 @@
OS=`uname -s`
@@ -30624,8 +31064,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
;;
---- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-12-16 14:17:24.000000000 -0800
-+++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2010-06-15 22:08:11.000000000 -0700
+--- ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2011-05-26 19:05:24.000000000 -0700
++++ ./jdk/test/javax/security/auth/Subject/doAs/Test.sh 2011-04-22 23:08:50.000000000 -0700
@@ -33,12 +33,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30640,8 +31080,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PS=":"
FS="/"
RM="/bin/rm -f"
---- ./jdk/test/jprt.config 2010-12-16 14:17:36.000000000 -0800
-+++ ./jdk/test/jprt.config 2010-06-15 22:08:14.000000000 -0700
+--- ./jdk/test/jprt.config 2011-05-26 19:06:21.000000000 -0700
++++ ./jdk/test/jprt.config 2011-04-22 23:08:51.000000000 -0700
@@ -71,8 +71,8 @@
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -30709,8 +31149,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
# Export PATH setting
PATH="${path4sdk}"
---- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-12-16 14:17:36.000000000 -0800
-+++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2010-06-15 22:08:14.000000000 -0700
+--- ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2011-05-26 19:06:22.000000000 -0700
++++ ./jdk/test/lib/security/java.policy/Ext_AllPolicy.sh 2011-04-22 23:08:51.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -30720,8 +31160,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-12-16 14:17:38.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2010-06-15 22:08:15.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2011-05-26 19:06:34.000000000 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/CustomLauncherTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -45,37 +45,50 @@
# has to locate libjvm.so. Also $! is not reliable on some releases of MKS.
#{
@@ -30798,8 +31238,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
#
---- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-12-16 14:17:38.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2010-06-15 22:08:15.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2011-05-26 19:06:34.000000000 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/GeneratePropertyPassword.sh 2011-04-22 23:08:51.000000000 -0700
@@ -35,7 +35,7 @@
UMASK=`umask`
@@ -30809,8 +31249,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
PATHSEP=":"
FILESEP="/"
DFILESEP=$FILESEP
---- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-12-16 14:17:38.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2010-06-15 22:08:15.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2011-05-26 19:06:34.000000000 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/LocalManagementTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -86,10 +86,12 @@
# on Windows 98.
@@ -30828,8 +31268,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
JAVA=${TESTJAVA}/bin/java
CLASSPATH=${TESTCLASSES}
---- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-12-16 14:17:38.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2010-06-15 22:08:15.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2011-05-26 19:06:34.000000000 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/PasswordFilePermissionTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -70,10 +70,12 @@
# security the password file.
@@ -30847,8 +31287,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
# Create configuration file and dummy password file
---- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-12-16 14:17:38.000000000 -0800
-+++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2010-06-15 22:08:15.000000000 -0700
+--- ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2011-05-26 19:06:35.000000000 -0700
++++ ./jdk/test/sun/management/jmxremote/bootstrap/SSLConfigFilePermissionTest.sh 2011-04-22 23:08:51.000000000 -0700
@@ -69,10 +69,12 @@
# security the password file.
@@ -30866,9 +31306,9 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/java/nio/channels/spi/Select
# Create management and SSL configuration files
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
---- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-12-16 14:17:40.000000000 -0800
-+++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2010-06-15 22:08:15.000000000 -0700
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/management/jmxremote/bootstrap/bsd-i586/launcher differ
+--- ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2011-05-26 19:06:42.000000000 -0700
++++ ./jdk/test/sun/misc/URLClassPath/ClassnameCharTest.sh 2011-04-22 23:08:52.000000000 -0700
@@ -36,11 +36,7 @@
OS=`uname -s`
@@ -30882,8 +31322,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/MarkResetTest.sh 2010-12-16 14:17:41.000000000 -0800
-+++ ./jdk/test/sun/net/www/MarkResetTest.sh 2010-06-15 22:08:15.000000000 -0700
+--- ./jdk/test/sun/net/www/MarkResetTest.sh 2011-05-26 19:06:47.000000000 -0700
++++ ./jdk/test/sun/net/www/MarkResetTest.sh 2011-04-22 23:08:52.000000000 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -30893,8 +31333,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-12-16 14:17:41.000000000 -0800
-+++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2010-06-15 22:08:15.000000000 -0700
+--- ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2011-05-26 19:06:50.000000000 -0700
++++ ./jdk/test/sun/net/www/http/HttpClient/RetryPost.sh 2011-04-22 23:08:52.000000000 -0700
@@ -28,7 +28,7 @@
OS=`uname -s`
@@ -30904,8 +31344,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-12-16 14:17:43.000000000 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2010-06-15 22:08:16.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2011-05-26 19:06:56.000000000 -0700
++++ ./jdk/test/sun/net/www/protocol/jar/B5105410.sh 2011-04-22 23:08:52.000000000 -0700
@@ -31,11 +31,7 @@
OS=`uname -s`
@@ -30919,8 +31359,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-12-16 14:17:43.000000000 -0800
-+++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2010-06-15 22:08:16.000000000 -0700
+--- ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2011-05-26 19:06:57.000000000 -0700
++++ ./jdk/test/sun/net/www/protocol/jar/jarbug/run.sh 2011-04-22 23:08:52.000000000 -0700
@@ -31,11 +31,7 @@
OS=`uname -s`
@@ -30934,7 +31374,7 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
PS=":"
FS="/"
;;
---- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsd0212.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/test/sun/nio/cs/EucJpBsd0212.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,79 +0,0 @@
-/*
@@ -31016,7 +31456,7 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
- System.out.printf("%nPassed = %d, failed = %d%n%n", passed, failed);
- if (failed > 0) throw new AssertionError("Some tests failed");}
-}
---- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2010-12-18 00:00:04.000000000 -0800
+--- ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 2011-05-29 11:28:25.000000000 -0700
+++ ./jdk/test/sun/nio/cs/EucJpBsdDecoderRecoveryTest.java 1969-12-31 16:00:00.000000000 -0800
@@ -1,70 +0,0 @@
-/*
@@ -31089,8 +31529,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
- }
- }
-}
---- ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-12-16 14:17:52.000000000 -0800
-+++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2010-06-15 22:08:18.000000000 -0700
+--- ./jdk/test/sun/security/krb5/runNameEquals.sh 2011-05-26 19:07:30.000000000 -0700
++++ ./jdk/test/sun/security/krb5/runNameEquals.sh 2011-04-22 23:08:53.000000000 -0700
@@ -58,6 +58,11 @@
FILESEP="/"
NATIVE=true
@@ -31103,8 +31543,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
CYGWIN* )
PATHSEP=";"
FILESEP="/"
---- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-12-16 14:17:53.000000000 -0800
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2010-06-15 22:08:18.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2011-05-26 19:07:34.000000000 -0700
++++ ./jdk/test/sun/security/pkcs11/KeyStore/Basic.sh 2011-04-22 23:08:53.000000000 -0700
@@ -131,6 +131,27 @@
;;
esac
@@ -31133,8 +31573,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-12-16 14:17:53.000000000 -0800
-+++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2010-06-15 22:08:19.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2011-05-26 19:07:37.000000000 -0700
++++ ./jdk/test/sun/security/pkcs11/KeyStore/ClientAuth.sh 2011-04-22 23:08:53.000000000 -0700
@@ -92,6 +92,27 @@
;;
esac
@@ -31163,8 +31603,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
Windows* )
FS="\\"
PS=";"
---- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-12-16 14:17:54.000000000 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2010-06-15 22:08:19.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2011-05-26 19:07:39.000000000 -0700
++++ ./jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.sh 2011-04-22 23:08:53.000000000 -0700
@@ -50,13 +50,7 @@
OS=`uname -s`
@@ -31180,8 +31620,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
---- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-12-16 14:17:54.000000000 -0800
-+++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2010-06-15 22:08:19.000000000 -0700
+--- ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2011-05-26 19:07:40.000000000 -0700
++++ ./jdk/test/sun/security/pkcs11/Provider/Login.sh 2011-04-22 23:08:53.000000000 -0700
@@ -51,13 +51,7 @@
OS=`uname -s`
@@ -31197,23 +31637,23 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/management/jmxremote/boo
FS="/"
PS=":"
CP="${FS}bin${FS}cp"
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
-Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/merge/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
---- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-12-16 14:17:58.000000000 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2010-06-15 22:08:19.000000000 -0700
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.chk differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libfreebl3.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnspr4.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnss3.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplc4.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libplds4.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.chk differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-amd64/libsoftokn3.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnspr4.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnss3.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libnssckbi.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplc4.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libplds4.so differ
+Files /tmp/openjdk_srcdir.gcBO8Zny/openjdk/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so and /home/glewis/projects/java/jdk17/openjdk7/tmp/bsd-port/jdk/test/sun/security/pkcs11/nss/lib/bsd-i586/libsoftokn3.so differ
+--- ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2011-05-26 19:07:59.000000000 -0700
++++ ./jdk/test/sun/security/provider/PolicyFile/GrantAllPermToExtWhenNoPolicy.sh 2011-04-22 23:08:53.000000000 -0700
@@ -44,11 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31227,8 +31667,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-12-16 14:17:58.000000000 -0800
-+++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2010-06-15 22:08:19.000000000 -0700
+--- ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2011-05-26 19:08:00.000000000 -0700
++++ ./jdk/test/sun/security/provider/PolicyFile/getinstance/getinstance.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,11 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31242,8 +31682,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-12-16 14:18:05.000000000 -0800
-+++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2010-06-15 22:08:20.000000000 -0700
+--- ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2011-05-26 19:08:08.000000000 -0700
++++ ./jdk/test/sun/security/ssl/com/sun/net/ssl/internal/ssl/SSLSocketImpl/NotifyHandshakeTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -42,7 +42,7 @@
OS=`uname -s`
@@ -31253,8 +31693,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FILESEP="/"
PATHSEP=":"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-12-16 14:18:08.000000000 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2011-05-26 19:08:16.000000000 -0700
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -31264,8 +31704,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-12-16 14:18:08.000000000 -0800
-+++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2011-05-26 19:08:16.000000000 -0700
++++ ./jdk/test/sun/security/ssl/sun/net/www/protocol/https/HttpsURLConnection/PostThruProxyWithAuth.sh 2011-04-22 23:08:54.000000000 -0700
@@ -32,7 +32,7 @@
HOSTNAME=`uname -n`
OS=`uname -s`
@@ -31275,8 +31715,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-12-16 14:18:09.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2011-05-26 19:08:17.000000000 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/AlgOptions.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31286,8 +31726,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-12-16 14:18:09.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2011-05-26 19:08:18.000000000 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/PercentSign.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31297,8 +31737,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-12-16 14:18:09.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2010-07-04 12:51:51.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2011-05-26 19:08:18.000000000 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/diffend.sh 2011-04-22 23:08:54.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31308,8 +31748,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-12-16 14:18:10.000000000 -0800
-+++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2011-05-26 19:08:18.000000000 -0700
++++ ./jdk/test/sun/security/tools/jarsigner/oldsig.sh 2011-04-22 23:08:54.000000000 -0700
@@ -42,7 +42,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31319,8 +31759,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-12-16 14:18:10.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2011-05-26 19:08:19.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/AltProviderPath.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31330,8 +31770,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-12-16 14:18:10.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2011-05-26 19:08:19.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/CloneKeyAskPassword.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,11 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31345,8 +31785,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
FILESEP="/"
;;
---- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-12-16 14:18:10.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2011-05-26 19:08:20.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/SecretKeyKS.sh 2011-04-22 23:08:54.000000000 -0700
@@ -45,7 +45,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31356,8 +31796,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-12-16 14:18:10.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2011-05-26 19:08:20.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/StandardAlgName.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31367,8 +31807,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-12-16 14:18:10.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/autotest.sh 2011-05-26 19:08:20.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/autotest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -72,6 +72,27 @@
;;
esac
@@ -31397,8 +31837,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
* )
echo "Will not run test on: ${OS}"
exit 0;
---- ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2010-06-15 22:08:21.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/i18n.sh 2011-05-26 19:08:21.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/i18n.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31408,8 +31848,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/printssl.sh 2011-05-26 19:08:21.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/printssl.sh 2011-04-22 23:08:54.000000000 -0700
@@ -37,7 +37,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31419,8 +31859,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./jdk/test/sun/security/tools/keytool/resource.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/resource.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/resource.sh 2011-05-26 19:08:21.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/resource.sh 2011-04-22 23:08:54.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31430,8 +31870,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
FS="/"
TMP=/tmp
---- ./jdk/test/sun/security/tools/keytool/standard.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/keytool/standard.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/keytool/standard.sh 2011-05-26 19:08:21.000000000 -0700
++++ ./jdk/test/sun/security/tools/keytool/standard.sh 2011-04-22 23:08:54.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31441,8 +31881,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_* )
---- ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/Alias.sh 2011-05-26 19:08:22.000000000 -0700
++++ ./jdk/test/sun/security/tools/policytool/Alias.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31452,8 +31892,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2011-05-26 19:08:22.000000000 -0700
++++ ./jdk/test/sun/security/tools/policytool/ChangeUI.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31463,8 +31903,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2011-05-26 19:08:22.000000000 -0700
++++ ./jdk/test/sun/security/tools/policytool/OpenPolicy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31474,8 +31914,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2011-05-26 19:08:23.000000000 -0700
++++ ./jdk/test/sun/security/tools/policytool/SaveAs.sh 2011-04-22 23:08:54.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31485,8 +31925,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2011-05-26 19:08:23.000000000 -0700
++++ ./jdk/test/sun/security/tools/policytool/UpdatePermissions.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31496,8 +31936,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2011-05-26 19:08:23.000000000 -0700
++++ ./jdk/test/sun/security/tools/policytool/UsePolicy.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31507,8 +31947,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-12-16 14:18:11.000000000 -0800
-+++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/security/tools/policytool/i18n.sh 2011-05-26 19:08:23.000000000 -0700
++++ ./jdk/test/sun/security/tools/policytool/i18n.sh 2011-04-22 23:08:54.000000000 -0700
@@ -46,7 +46,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31518,8 +31958,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-12-16 14:18:13.000000000 -0800
-+++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2011-05-26 19:08:30.000000000 -0700
++++ ./jdk/test/sun/tools/jconsole/ImmutableResourceTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -53,7 +53,7 @@
OS=`uname -s`
@@ -31529,8 +31969,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-12-16 14:18:13.000000000 -0800
-+++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2010-06-15 22:08:22.000000000 -0700
+--- ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2011-05-26 19:08:31.000000000 -0700
++++ ./jdk/test/sun/tools/jconsole/ResourceCheckTest.sh 2011-04-22 23:08:54.000000000 -0700
@@ -54,7 +54,7 @@
OS=`uname -s`
@@ -31540,8 +31980,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-12-16 14:18:15.000000000 -0800
-+++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2010-06-15 22:08:23.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2011-05-26 19:08:42.000000000 -0700
++++ ./jdk/test/sun/tools/native2ascii/Native2AsciiTests.sh 2011-04-22 23:08:55.000000000 -0700
@@ -33,7 +33,7 @@
case `uname -s` in
@@ -31551,8 +31991,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
esac
N2A=$TESTJAVA/bin/native2ascii
---- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-12-16 14:18:15.000000000 -0800
-+++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2010-06-15 22:08:23.000000000 -0700
+--- ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2011-05-26 19:08:42.000000000 -0700
++++ ./jdk/test/sun/tools/native2ascii/resources/ImmutableResourceTest.sh 2011-04-22 23:08:55.000000000 -0700
@@ -56,7 +56,7 @@
OS=`uname -s`
@@ -31562,19 +32002,39 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PATHSEP=":"
;;
---- ./langtools/.hgtags 2010-12-16 14:20:09.000000000 -0800
-+++ ./langtools/.hgtags 2010-12-17 23:33:13.000000000 -0800
-@@ -96,3 +96,4 @@
- 814561077c448292f78de461b6de5d78d57c2089 jdk7-b119
- 1dd813a529cfa06d850ee7dc42da42efb8f6af0e jdk7-b120
- 1bf969e9792f977a8593496681539840a54fe644 jdk7-b121
-+11e7b4c0476e4d6085d8d28c4aa2833d46714a2a jdk7-b122
---- ./langtools/.jcheck/conf 2010-12-16 14:20:09.000000000 -0800
+--- ./langtools/.hgtags 2011-05-26 19:15:40.000000000 -0700
++++ ./langtools/.hgtags 2011-05-27 00:01:06.000000000 -0700
+@@ -118,3 +118,4 @@
+ 90adb5d6adc7d99d27c8b142a31ac8921070274f jdk7-b141
+ 7476b164194c1814704153e74d5ff7e965c6fdbf jdk7-b142
+ 5faa9eedc44e201f2b13ad837e9077668b823d28 jdk7-b143
++8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144
+--- ./langtools/.jcheck/conf 2011-05-26 19:15:40.000000000 -0700
+++ ./langtools/.jcheck/conf 1969-12-31 16:00:00.000000000 -0800
@@ -1 +0,0 @@
-project=jdk7
---- ./langtools/test/Makefile 2010-12-16 14:20:23.000000000 -0800
-+++ ./langtools/test/Makefile 2010-06-15 22:08:59.000000000 -0700
+--- ./langtools/make/build.xml 2011-05-26 19:15:41.000000000 -0700
++++ ./langtools/make/build.xml 2011-05-07 21:54:16.000000000 -0700
+@@ -186,9 +186,14 @@
+ </condition>
+
+ <condition property="boot.java.provides.latest.jdk">
+- <available
+- ignoresystemclasses="true"
+- classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
++ <and>
++ <available
++ ignoresystemclasses="true"
++ classpath="${boot.java.home}/jre/lib/rt.jar" classname="java.nio.file.Path"/>
++ <hasmethod
++ classpath="${boot.java.home}/jre/lib/rt.jar"
++ classname="java.nio.file.Path" method="getFileName"/>
++ </and>
+ </condition>
+
+ <condition property="bootstrap.exclude.files" value="" else="${require.latest.jdk.files}">
+--- ./langtools/test/Makefile 2011-05-26 19:16:47.000000000 -0700
++++ ./langtools/test/Makefile 2011-04-22 23:11:42.000000000 -0700
@@ -34,6 +34,22 @@
ARCH=i586
endif
@@ -31618,8 +32078,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Root of all test results
TEST_OUTPUT_DIR = $(TEST_ROOT)/../build/$(PLATFORM)-$(ARCH)/test/langtools
---- ./langtools/test/jprt.config 2010-12-16 14:20:32.000000000 -0800
-+++ ./langtools/test/jprt.config 2010-06-15 22:09:02.000000000 -0700
+--- ./langtools/test/jprt.config 2011-05-26 19:17:31.000000000 -0700
++++ ./langtools/test/jprt.config 2011-04-22 23:11:43.000000000 -0700
@@ -71,8 +71,8 @@
# Uses 'uname -s', but only expect SunOS or Linux, assume Windows otherwise.
@@ -31687,8 +32147,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
# Export PATH setting
PATH="${path4sdk}"
---- ./langtools/test/tools/javac/4846262/Test.sh 2010-12-16 14:20:34.000000000 -0800
-+++ ./langtools/test/tools/javac/4846262/Test.sh 2010-06-15 22:09:03.000000000 -0700
+--- ./langtools/test/tools/javac/4846262/Test.sh 2011-05-26 19:17:42.000000000 -0700
++++ ./langtools/test/tools/javac/4846262/Test.sh 2011-04-22 23:11:44.000000000 -0700
@@ -44,7 +44,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31698,8 +32158,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/6302184/T6302184.sh 2010-12-16 14:20:35.000000000 -0800
-+++ ./langtools/test/tools/javac/6302184/T6302184.sh 2010-06-15 22:09:03.000000000 -0700
+--- ./langtools/test/tools/javac/6302184/T6302184.sh 2011-05-26 19:17:44.000000000 -0700
++++ ./langtools/test/tools/javac/6302184/T6302184.sh 2011-04-22 23:11:44.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31709,8 +32169,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-12-16 14:20:39.000000000 -0800
-+++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2010-06-15 22:09:04.000000000 -0700
+--- ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2011-05-26 19:18:02.000000000 -0700
++++ ./langtools/test/tools/javac/ClassPathTest/ClassPathTest.sh 2011-04-22 23:11:44.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31720,8 +32180,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-12-16 14:20:42.000000000 -0800
-+++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2010-06-15 22:09:04.000000000 -0700
+--- ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2011-05-26 19:18:15.000000000 -0700
++++ ./langtools/test/tools/javac/ExtDirs/ExtDirs.sh 2011-04-22 23:11:44.000000000 -0700
@@ -54,7 +54,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31731,8 +32191,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/MissingInclude.sh 2010-12-16 14:20:44.000000000 -0800
-+++ ./langtools/test/tools/javac/MissingInclude.sh 2010-06-15 22:09:05.000000000 -0700
+--- ./langtools/test/tools/javac/MissingInclude.sh 2011-05-26 19:18:23.000000000 -0700
++++ ./langtools/test/tools/javac/MissingInclude.sh 2011-04-22 23:11:45.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31742,8 +32202,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-12-16 14:20:45.000000000 -0800
-+++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2010-06-15 22:09:05.000000000 -0700
+--- ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2011-05-26 19:18:31.000000000 -0700
++++ ./langtools/test/tools/javac/ProtectedInnerClass/ProtectedInnerClass.sh 2011-04-22 23:11:45.000000000 -0700
@@ -52,7 +52,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31753,8 +32213,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/T5090006/compiler.sh 2010-12-16 14:20:47.000000000 -0800
-+++ ./langtools/test/tools/javac/T5090006/compiler.sh 2010-06-15 22:09:05.000000000 -0700
+--- ./langtools/test/tools/javac/T5090006/compiler.sh 2011-05-26 19:18:37.000000000 -0700
++++ ./langtools/test/tools/javac/T5090006/compiler.sh 2011-04-22 23:11:45.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31764,8 +32224,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/apt.sh 2010-12-16 14:20:54.000000000 -0800
-+++ ./langtools/test/tools/javac/apt.sh 2010-06-15 22:09:06.000000000 -0700
+--- ./langtools/test/tools/javac/apt.sh 2011-05-26 19:19:04.000000000 -0700
++++ ./langtools/test/tools/javac/apt.sh 2011-04-22 23:11:45.000000000 -0700
@@ -38,7 +38,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31775,8 +32235,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-12-16 14:20:55.000000000 -0800
-+++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2010-06-15 22:09:07.000000000 -0700
+--- ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2011-05-26 19:19:13.000000000 -0700
++++ ./langtools/test/tools/javac/constDebug/ConstDebug.sh 2011-04-22 23:11:46.000000000 -0700
@@ -47,7 +47,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31786,8 +32246,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-12-16 14:21:06.000000000 -0800
-+++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2010-06-15 22:09:07.000000000 -0700
+--- ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2011-05-26 19:19:59.000000000 -0700
++++ ./langtools/test/tools/javac/fatalErrors/NoJavaLang.sh 2011-04-22 23:11:46.000000000 -0700
@@ -48,7 +48,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31797,8 +32257,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
CYGWIN* )
---- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-12-16 14:21:21.000000000 -0800
-+++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2010-06-15 22:09:09.000000000 -0700
+--- ./langtools/test/tools/javac/innerClassFile/Driver.sh 2011-05-26 19:20:48.000000000 -0700
++++ ./langtools/test/tools/javac/innerClassFile/Driver.sh 2011-04-22 23:11:47.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31808,8 +32268,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/javazip/Test.sh 2010-12-16 14:21:21.000000000 -0800
-+++ ./langtools/test/tools/javac/javazip/Test.sh 2010-06-15 22:09:10.000000000 -0700
+--- ./langtools/test/tools/javac/javazip/Test.sh 2011-05-26 19:20:49.000000000 -0700
++++ ./langtools/test/tools/javac/javazip/Test.sh 2011-04-22 23:11:47.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31819,8 +32279,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
SCR=`pwd`
;;
---- ./langtools/test/tools/javac/links/links.sh 2010-12-16 14:21:21.000000000 -0800
-+++ ./langtools/test/tools/javac/links/links.sh 2010-06-15 22:09:10.000000000 -0700
+--- ./langtools/test/tools/javac/links/links.sh 2011-05-26 19:20:52.000000000 -0700
++++ ./langtools/test/tools/javac/links/links.sh 2011-04-22 23:11:47.000000000 -0700
@@ -53,7 +53,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31830,8 +32290,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
NULL=/dev/null
PS=":"
FS="/"
---- ./langtools/test/tools/javac/newlines/Newlines.sh 2010-12-16 14:21:24.000000000 -0800
-+++ ./langtools/test/tools/javac/newlines/Newlines.sh 2010-06-15 22:09:10.000000000 -0700
+--- ./langtools/test/tools/javac/newlines/Newlines.sh 2011-05-26 19:21:00.000000000 -0700
++++ ./langtools/test/tools/javac/newlines/Newlines.sh 2011-04-22 23:11:48.000000000 -0700
@@ -50,7 +50,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31841,8 +32301,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
---- ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-12-16 14:21:28.000000000 -0800
-+++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2010-06-15 22:09:11.000000000 -0700
+--- ./langtools/test/tools/javac/stackmap/T4955930.sh 2011-05-26 19:21:13.000000000 -0700
++++ ./langtools/test/tools/javac/stackmap/T4955930.sh 2011-04-22 23:11:48.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31852,8 +32312,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows_95 | Windows_98 | Windows_NT )
---- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-12-16 14:21:29.000000000 -0800
-+++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2010-06-15 22:09:11.000000000 -0700
+--- ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2011-05-26 19:21:16.000000000 -0700
++++ ./langtools/test/tools/javac/unicode/SupplementaryJavaID6.sh 2011-04-22 23:11:48.000000000 -0700
@@ -66,6 +66,17 @@
exit 0;
fi
@@ -31872,8 +32332,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
Windows_98 | Windows_ME )
echo "As Windows 98/Me do not provide Unicode-aware file system, the compilation of the test case is expected to fail on these platforms. Ignoring this test."
exit 0;
---- ./langtools/test/tools/javah/6257087/foo.sh 2010-12-16 14:21:33.000000000 -0800
-+++ ./langtools/test/tools/javah/6257087/foo.sh 2010-06-15 22:09:12.000000000 -0700
+--- ./langtools/test/tools/javah/6257087/foo.sh 2011-05-26 19:21:30.000000000 -0700
++++ ./langtools/test/tools/javah/6257087/foo.sh 2011-04-22 23:11:49.000000000 -0700
@@ -41,7 +41,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31883,8 +32343,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ConstMacroTest.sh 2010-12-16 14:21:33.000000000 -0800
-+++ ./langtools/test/tools/javah/ConstMacroTest.sh 2010-06-15 22:09:12.000000000 -0700
+--- ./langtools/test/tools/javah/ConstMacroTest.sh 2011-05-26 19:21:31.000000000 -0700
++++ ./langtools/test/tools/javah/ConstMacroTest.sh 2011-04-22 23:11:49.000000000 -0700
@@ -56,7 +56,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31894,8 +32354,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-12-16 14:21:33.000000000 -0800
-+++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2010-06-15 22:09:12.000000000 -0700
+--- ./langtools/test/tools/javah/MissingParamClassTest.sh 2011-05-26 19:21:31.000000000 -0700
++++ ./langtools/test/tools/javah/MissingParamClassTest.sh 2011-04-22 23:11:49.000000000 -0700
@@ -58,7 +58,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31905,8 +32365,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javah/ReadOldClass.sh 2010-12-16 14:21:33.000000000 -0800
-+++ ./langtools/test/tools/javah/ReadOldClass.sh 2010-06-15 22:09:12.000000000 -0700
+--- ./langtools/test/tools/javah/ReadOldClass.sh 2011-05-26 19:21:31.000000000 -0700
++++ ./langtools/test/tools/javah/ReadOldClass.sh 2011-04-22 23:11:49.000000000 -0700
@@ -43,7 +43,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31916,8 +32376,8 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
PS=":"
FS="/"
;;
---- ./langtools/test/tools/javap/pathsep.sh 2010-12-16 14:21:34.000000000 -0800
-+++ ./langtools/test/tools/javap/pathsep.sh 2010-06-15 22:09:12.000000000 -0700
+--- ./langtools/test/tools/javap/pathsep.sh 2011-05-26 19:21:34.000000000 -0700
++++ ./langtools/test/tools/javap/pathsep.sh 2011-04-22 23:11:49.000000000 -0700
@@ -40,7 +40,7 @@
# set platform-dependent variables
OS=`uname -s`
@@ -31927,3 +32387,14 @@ Files /tmp/openjdk_srcdir.FX0fSVdL/openjdk/jdk/test/sun/security/pkcs11/nss/lib/
FS="/"
;;
Windows* )
+--- ./make/Defs-internal.gmk 2011-05-26 17:05:29.000000000 -0700
++++ ./make/Defs-internal.gmk 2011-04-22 22:19:24.000000000 -0700
+@@ -79,7 +79,7 @@
+ # Find all build_time_* files and print their contents in a list sorted
+ # on the name of the sub repository.
+ define ReportBuildTimes
+-$(PRINTF) "-- Build times ----------\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n-------------------------\n" \
++$(PRINTF) "## Build times ##########\nTarget %s\nStart %s\nEnd %s\n%s\n%s\n#########################\n" \
+ $1 \
+ "`$(CAT) $(BUILDTIMESDIR)/build_time_start_TOTAL_human_readable`" \
+ "`$(CAT) $(BUILDTIMESDIR)/build_time_end_TOTAL_human_readable`" \
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-15 03:21:22 +0000