svn commit: r304470 - in head/java/openjdk6: . files

[Jung-uk Kim]

Author: jkim
Date: Tue Sep 18 22:30:19 2012
New Revision: 304470
URL: http://svn.freebsd.org/changeset/ports/304470

Log:
  - Override GCC used by HotSpot SA. [1]
  - Fix build with GCC 4.5+ on i386. [2]
  - Convert to the new header format.
  
  Submitted by:	Claude Buisson (clbuisson at orange dot fr) [1]
  Obtained from:	OpenJDK7 [2]
  	http://hg.openjdk.java.net/jdk7/hotspot/hotspot/rev/da880ba4edf9

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

Modified: head/java/openjdk6/Makefile
==============================================================================
--- head/java/openjdk6/Makefile	Tue Sep 18 21:32:15 2012	(r304469)
+++ head/java/openjdk6/Makefile	Tue Sep 18 22:30:19 2012	(r304470)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    openjdk6
-# Date created:         2009/2/21
-# Whom:                 Brian Gardner <brian at experts-exchange.com>
-#
+# Created by:	Brian Gardner <brian at experts-exchange.com>
 # $FreeBSD$
-#
 
 PORTNAME=	openjdk6
 PORTVERSION=	b25
@@ -137,8 +133,8 @@ MAKE_ENV=	LANG=C LC_ALL=C \
 		MILESTONE=fcs \
 		JDK_UPDATE_VERSION=${UPDATE_VERSION}
 
-# HotSpot wants CCC instead of CXX.
-MAKE_ENV+=	CCC="${CXX}"
+# HotSpot wants CCC instead of CXX.  Also, HotSpot SA wants GCC.
+MAKE_ENV+=	CCC="${CXX}" GCC="${CC}"
 
 # XXX Turn off -Werror from HotSpot.
 MAKE_ENV+=	WARNINGS_ARE_ERRORS="${WARNINGS_ARE_ERRORS}"

Modified: head/java/openjdk6/files/patch-set
==============================================================================
--- head/java/openjdk6/files/patch-set	Tue Sep 18 21:32:15 2012	(r304469)
+++ head/java/openjdk6/files/patch-set	Tue Sep 18 22:30:19 2012	(r304470)
@@ -609,17 +609,19 @@
  
  #endif /* amd64 */
  
---- hotspot/agent/src/os/bsd/Makefile	2012-01-12 17:22:08.000000000 -0500
-+++ hotspot/agent/src/os/bsd/Makefile	2012-01-12 16:53:06.000000000 -0500
-@@ -22,7 +22,7 @@
+--- hotspot/agent/src/os/bsd/Makefile	2012-05-01 17:15:02.000000000 -0400
++++ hotspot/agent/src/os/bsd/Makefile	2012-09-18 17:50:06.000000000 -0400
+@@ -22,8 +22,8 @@
  #  
  #
  
 -ARCH := $(shell if ([ `uname -m` = "ia64" ])  ; then echo ia64 ; elif ([ `uname -m` = "x86_64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
+-GCC      = gcc
 +ARCH := $(shell if ([ `uname -m` = "ia64" ])  ; then echo ia64 ; elif ([ `uname -m` = "amd64" ]) ; then echo amd64; elif ([ `uname -m` = "sparc64" ]) ; then echo sparc; else echo i386 ; fi )
- GCC      = gcc
++GCC      ?= gcc
  
  JAVAH    = ${JAVA_HOME}/bin/javah
+ 
 @@ -32,25 +32,24 @@
  	libproc_impl.c  \
  	ps_proc.c       \
@@ -6490,6 +6492,26 @@
  // Only used on 64 bit Windows platforms
  define_pd_global(bool, UseVectoredExceptions,    false);
  
+--- hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp	2012-05-01 17:15:08.000000000 -0400
++++ hotspot/src/os_cpu/bsd_x86/vm/orderAccess_bsd_x86.inline.hpp	2012-09-18 18:21:03.000000000 -0400
+@@ -93,7 +93,7 @@
+ 
+ inline void     OrderAccess::store_fence(jbyte*  p, jbyte  v) {
+   __asm__ volatile (  "xchgb (%2),%0"
+-                    : "=r" (v)
++                    : "=q" (v)
+                     : "0" (v), "r" (p)
+                     : "memory");
+ }
+@@ -155,7 +155,7 @@
+ // Must duplicate definitions instead of calling store_fence because we don't want to cast away volatile.
+ inline void     OrderAccess::release_store_fence(volatile jbyte*  p, jbyte  v) {
+   __asm__ volatile (  "xchgb (%2),%0"
+-                    : "=r" (v)
++                    : "=q" (v)
+                     : "0" (v), "r" (p)
+                     : "memory");
+ }
 --- hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2012-05-01 17:15:08.000000000 -0400
 +++ hotspot/src/os_cpu/bsd_x86/vm/os_bsd_x86.cpp	2012-09-18 14:48:04.000000000 -0400
 @@ -78,25 +78,209 @@