From owner-svn-ports-head@FreeBSD.ORG  Wed Oct  9 22:24:18 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 239072FD;
 Wed,  9 Oct 2013 22:24:18 +0000 (UTC)
 (envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 105242B26;
 Wed,  9 Oct 2013 22:24:18 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r99MOHLl069511;
 Wed, 9 Oct 2013 22:24:17 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r99MOHpa069510;
 Wed, 9 Oct 2013 22:24:17 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201310092224.r99MOHpa069510@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 9 Oct 2013 22:24:17 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r329933 - head/java/openjdk6/files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Oct 2013 22:24:18 -0000

Author: jkim
Date: Wed Oct  9 22:24:17 2013
New Revision: 329933
URL: http://svnweb.freebsd.org/changeset/ports/329933

Log:
  Add couple of compiler warning fixes.  No functional change.

Modified:
  head/java/openjdk6/files/patch-set

Modified: head/java/openjdk6/files/patch-set
==============================================================================
--- head/java/openjdk6/files/patch-set	Wed Oct  9 22:15:48 2013	(r329932)
+++ head/java/openjdk6/files/patch-set	Wed Oct  9 22:24:17 2013	(r329933)
@@ -590,6 +590,17 @@
   HOSTCXX = $(CXX)
   HOSTCC  = $(CC)
  endif
+--- hotspot/src/os/bsd/vm/osThread_bsd.cpp
++++ hotspot/src/os/bsd/vm/osThread_bsd.cpp
+@@ -49,7 +49,7 @@
+ 
+ void OSThread::pd_initialize() {
+   assert(this != NULL, "check");
+-#ifdef __APPLE__
++#if defined(__APPLE__) || defined(__FreeBSD__)
+   _thread_id        = 0;
+ #else
+   _thread_id        = NULL;
 --- hotspot/src/os/bsd/vm/osThread_bsd.hpp
 +++ hotspot/src/os/bsd/vm/osThread_bsd.hpp
 @@ -39,7 +39,7 @@
@@ -848,7 +859,7 @@
 +  cpuset_t mask;
 +  if (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, -1, sizeof(mask),
 +      &mask) == 0)
-+    for (int i = 0; i < sizeof(mask) / sizeof(long); i++)
++    for (u_int i = 0; i < sizeof(mask) / sizeof(long); i++)
 +      online_cpus += __builtin_popcountl(((long *)&mask)[i]);
 +#else
 +  online_cpus = ::sysconf(_SC_NPROCESSORS_ONLN);